Imported Upstream version 3.3.0

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

diff --git a/device-src/Makefile.in b/device-src/Makefile.in
index d555a06863c879040e98d9058edc2c0f16e39841..a2e54359f46060da55da2cacd7a3003863a1ca19 100644 (file)
--- a/device-src/Makefile.in
+++ b/device-src/Makefile.in
@@ -163,6 +163,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/macro-archive/docbook-xslt.m4 \
        $(top_srcdir)/config/macro-archive/xsltproc.m4 \
        $(top_srcdir)/config/amanda/amplot.m4 \
+       $(top_srcdir)/config/amanda/as_needed.m4 \
        $(top_srcdir)/config/amanda/bsd-security.m4 \
        $(top_srcdir)/config/amanda/bsdtcp-security.m4 \
        $(top_srcdir)/config/amanda/bsdudp-security.m4 \
@@ -361,7 +362,8 @@ am__activate_devpay_SOURCES_DIST = activate-devpay.c
 @WANT_S3_DEVICE_TRUE@am_activate_devpay_OBJECTS =  \
 @WANT_S3_DEVICE_TRUE@  activate-devpay.$(OBJEXT)
 activate_devpay_OBJECTS = $(am_activate_devpay_OBJECTS)
-activate_devpay_LDADD = $(LDADD)
+@WANT_S3_DEVICE_TRUE@activate_devpay_DEPENDENCIES =  \
+@WANT_S3_DEVICE_TRUE@  ../gnulib/libgnu.la
 SCRIPTS = $(sbin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -408,6 +410,7 @@ APPLICATION_DIR = @APPLICATION_DIR@
 AR = @AR@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
 ASSERTIONS = @ASSERTIONS@
+AS_NEEDED_FLAGS = @AS_NEEDED_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -438,7 +441,6 @@ CONFIG_CLOBBER_MY_CONFIG = @CONFIG_CLOBBER_MY_CONFIG@
 CONFIG_DIR = @CONFIG_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURL_CONFIG = @CURL_CONFIG@
 CYGPATH_W = @CYGPATH_W@
 DD = @DD@
 DEFAULT_AMANDATES_FILE = @DEFAULT_AMANDATES_FILE@
@@ -882,6 +884,7 @@ LTLIBTHREAD = @LTLIBTHREAD@
 MAILER = @MAILER@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -1079,6 +1082,7 @@ STDBOOL_H = @STDBOOL_H@
 STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
+SUNTAR = @SUNTAR@
 SVN = @SVN@
 SWIG = @SWIG@
 SWIG_LIB = @SWIG_LIB@
@@ -1086,6 +1090,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TCPPORTRANGE = @TCPPORTRANGE@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UDPPORTRANGE = @UDPPORTRANGE@
+UMOUNT = @UMOUNT@
 UNCOMPRESS_OPT = @UNCOMPRESS_OPT@
 UNCOMPRESS_PATH = @UNCOMPRESS_PATH@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
@@ -1196,14 +1201,14 @@ INCLUDES = -I$(top_builddir)/common-src \
                -I$(top_srcdir)/gnulib
 
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) $(am__append_1)
-AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 SCRIPTS_PERL = \
        amdevcheck \
        amtapetype
 
 sbin_SCRIPTS = $(SCRIPTS_PERL)
 amlib_LTLIBRARIES = libamdevice.la
-libamdevice_la_LDFLAGS = -release $(VERSION) 
+libamdevice_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS)
 libamdevice_la_SOURCES = property.c device.c directtcp-connection.c \
        null-device.c rait-device.c vfs-device.c xfer-source-device.c \
        xfer-dest-device.c xfer-dest-taper.c xfer-dest-taper-cacher.c \
@@ -1212,6 +1217,9 @@ libamdevice_la_SOURCES = property.c device.c directtcp-connection.c \
        $(am__append_4) $(am__append_5)
 libamdevice_la_LIBADD = ../common-src/libamanda.la \
        ../xfer-src/libamxfer.la $(am__append_6)
+@WANT_S3_DEVICE_TRUE@activate_devpay_LDADD = \
+@WANT_S3_DEVICE_TRUE@  ../gnulib/libgnu.la
+
 @WANT_S3_DEVICE_TRUE@activate_devpay_SOURCES = activate-devpay.c
 noinst_HEADERS = \
        device.h \