Keep the same keywords as in previous version

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

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 0baca1b1e4b6f76837457c373e4470c986d40c03..0abab0e2a2bedcb4d91d279a080e62e6f9540e36 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -19,6 +19,7 @@ thisdir = src/dird
 DEBUG=@DEBUG@
 
 GETTEXT_LIBS = @LIBINTL@
+CAP_LIBS = @CAP_LIBS@
 
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
@@ -42,21 +43,7 @@ SVRSRCS = dird.c admin.c authenticate.c \
          ua_purge.c ua_restore.c ua_run.c \
          ua_select.c ua_server.c \
          ua_status.c ua_tree.c ua_update.c vbackup.c verify.c
-SVROBJS = dird.o admin.o authenticate.o \
-         autoprune.o backup.o bsr.o \
-         catreq.o dir_plugins.o dird_conf.o expand.o \
-         fd_cmds.o getmsg.o inc_conf.o job.o \
-         jobq.o migrate.o \
-         mountreq.o msgchan.o next_vol.o newvol.o \
-         pythondir.o \
-         recycle.o restore.o run_conf.o \
-         scheduler.o \
-         ua_acl.o ua_cmds.o ua_dotcmds.o \
-         ua_query.o \
-         ua_input.o ua_label.o ua_output.o ua_prune.o \
-         ua_purge.o ua_restore.o ua_run.o \
-         ua_select.o ua_server.o \
-         ua_status.o ua_tree.o ua_update.o vbackup.o verify.o
+SVROBJS = $(SVRSRCS:.c=.o)
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -74,25 +61,26 @@ all: Makefile bacula-dir @STATIC_DIR@
        @echo "==== Make of dird is good ===="
        @echo " "
 
-bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
+bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
        @echo "Linking $@ ..."
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-             -lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
-             $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-
-
-static-bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-             -lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
-             $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+             -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+             $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+
+static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+             -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+             $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
        strip $@
 
-
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-clean:
+libtool-clean:
+       @$(RMF) -r .libs _libs
+
+clean: libtool-clean
        @$(RMF) dird bacula-dir core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bacula-dir
 
@@ -108,7 +96,7 @@ devclean: realclean
        (cd $(srcdir); $(RMF) Makefile)
 
 install: all
-       $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        @srcconf=bacula-dir.conf; \
           if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
              destconf=$$srcconf.new; \
@@ -124,7 +112,7 @@ install: all
        fi 
        ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
        @if test -f static-bacula-dir; then \
-          $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
+          $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
        fi