Fix bug 2523 -- spurious extra linking

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index a8f49bf9e78b1326ff94affddcfe6dd97c02e12a..85f178657c10b9478de64076697f574fa52028c7 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -85,6 +85,9 @@ LIBBACSD_OBJS = $(LIBBACSD_SRCS:.c=.o)
 LIBBACSD_LOBJS = $(LIBBACSD_SRCS:.c=.lo)
 LIBBACSD_LT_RELEASE = @LIBBAC_LT_RELEASE@
 
+# Loadable drivers
+DRIVERS = bacula-sd-cloud-driver.la bacula-sd-aligned-driver.la
+
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -113,7 +116,7 @@ SD_LIBS = -lbacsd -lbaccfg -lbac
 
 #-------------------------------------------------------------------------
 
-all: Makefile libbacsd.la drivers bacula-sd @STATIC_SD@ \
+all: Makefile libbacsd.la $(DRIVERS) bacula-sd @STATIC_SD@ \
           bls bextract bscan bcopy \
           bsdjson btape
        @echo "===== Make of stored is good ===="
@@ -141,8 +144,6 @@ libbacsd.la: Makefile $(LIBBACSD_LOBJS)
 #
 # Loadable driver
 #
-drivers: bacula-sd-cloud-driver.la bacula-sd-aligned-driver.la
-
 bacula-sd-cloud-driver.la: Makefile $(CLOUD_LOBJS)
         $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared $(CLOUD_LOBJS) -o $@ $(S3_LIBS) -rpath $(libdir) -module -export-dynamic -release $(LIBBACSD_LT_RELEASE)
 
@@ -168,7 +169,7 @@ btape.o: btape.c
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
           -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
-btape: Makefile  $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+btape: Makefile  $(TAPEOBJS) libbacsd.la $(DRIVERS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
          $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
@@ -178,7 +179,7 @@ cloud_test.o: cloud_test.c
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
           -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
-cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS)  libbacsd.la drivers
+cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS)  libbacsd.la $(DRIVERS)
        $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
           $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
@@ -187,8 +188,8 @@ bls.o:      bls.c
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
           -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
-bls:   Makefile $(BLSOBJS) libbacsd.la drivers  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-       @echo "Compiling $<"
+bls:   Makefile $(BLSOBJS) libbacsd.la $(DRIVERS)  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+       @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
           $(SD_LIBS) -lbacfind -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
@@ -197,8 +198,8 @@ bextract.o: bextract.c
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
           -I$(basedir) $(DINCLUDE) $(CFLAGS) $(LZO_INC) $<
 
-bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-       @echo "Compiling $<"
+bextract: Makefile $(BEXTOBJS) libbacsd.la $(DRIVERS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+       @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
           $(SD_LIBS) -lbacfind -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
@@ -207,7 +208,7 @@ bscan.o: bscan.c
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
           -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
-bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+bscan: Makefile $(SCNOBJS) libbacsd.la $(DRIVERS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
        ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
           $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
@@ -217,7 +218,7 @@ bcopy.o: bcopy.c
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
           -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
-bcopy: Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+bcopy: Makefile $(COPYOBJS) libbacsd.la $(DRIVERS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
           $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)