Merge branch 'master' into bat_slot

[bacula/bacula] / bacula / src / findlib / Makefile.in

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index a0efd7ba537b383f8ee48e2d7064b09318762cf8..62363b6d55416c127e36226451dc7b956bd78156 100644 (file)
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -56,7 +56,7 @@ libbacfind.a: $(LIBOBJS)
        $(AR) rc  $@ $(LIBOBJS)
        $(RANLIB) $@
 
-libbacfind.la: $(LIBOBJS) 
+libbacfind.la: Makefile $(LIBOBJS) 
        @echo "Making $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE)
 
@@ -64,38 +64,38 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-libtool-install: all
-       $(MKDIR) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL_FINISH) $(INSTALL_PROGRAM) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
-
-libtool-include: all
+install-includes:
        $(MKDIR) $(DESTDIR)/$(includedir)/bacula/findlib
-       for I in ${INCLUDE_FILES}; do \
+       for I in $(INCLUDE_FILES); do \
           $(INSTALL_DATA) $$I $(DESTDIR)$(includedir)/bacula/findlib/`basename $$I`; \
        done
 
-libtool-uninstall:
-       $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacfind.la
-
-uninstall-libtool-include: all
-       for I in ${INCLUDE_FILES}; do \
+uninstall-includes:
+       for I in $(INCLUDE_FILES); do \
           $(RMF) $(DESTDIR)$(includedir)/bacula/findlib/`basename $$I`; \
        done
 
-install: @LIBTOOL_INSTALL_TARGET@
+libtool-install: all
+       $(MKDIR) $(DESTDIR)$(libdir)
+       $(LIBTOOL_INSTALL_FINISH) $(INSTALL_PROGRAM) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
 
-uninstall: @LIBTOOL_UNINSTALL_TARGET@
+libtool-uninstall:
+       $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacfind.la
+
+install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
+
+uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
 
 libtool-clean:
-       find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
-       $(RMF) *.la
-       $(RMF) -r .libs _libs
+       @find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+       @$(RMF) *.la
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
-       $(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+clean: libtool-clean
+       @$(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
 
 realclean: clean
-       $(RMF) tags
+       @$(RMF) tags
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
@@ -114,7 +114,9 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @for src in $(LIBSRCS); do \
+           $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) $$src >> Makefile; \
+       done
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \