Imported Upstream version 3.3.2

[debian/amanda] / device-src / Makefile.am

diff --git a/device-src/Makefile.am b/device-src/Makefile.am
index 69fb328ce04dc34c5b48494c0edae27479b5583e..73cf6585fe7b807296f21f6899e23a45207a6959 100644 (file)
--- a/device-src/Makefile.am
+++ b/device-src/Makefile.am
@@ -15,7 +15,7 @@ if GCC_COMPILER
 # ndmp-device.c includes files with old-skool prototypes, so:
 AM_CFLAGS += -Wno-strict-prototypes
 endif
-AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 
 sbin_PROGRAMS =
 
@@ -27,7 +27,7 @@ sbin_SCRIPTS = $(SCRIPTS_PERL)
 ## libamdevice.la
 
 amlib_LTLIBRARIES =    libamdevice.la
-libamdevice_la_LDFLAGS = -release $(VERSION) 
+libamdevice_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS)
 libamdevice_la_SOURCES = \
        property.c \
        device.c \
@@ -72,6 +72,8 @@ noinst_PROGRAMS = $(TESTS)
 
 if WANT_S3_DEVICE
 sbin_PROGRAMS += activate-devpay
+activate_devpay_LDADD = \
+       ../gnulib/libgnu.la
 activate_devpay_SOURCES = activate-devpay.c
 endif