More debug info when aborting

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

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index f3bd89f061b6b94fc20b9cd0211c062e090f9c58..256737228ce3340d9ccf766e8b591a4f6fc30ea6 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -1,7 +1,9 @@
 #
 #  Bacula Director Makefile
 #
-#  
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 @MCOMMON@
 
 srcdir =       .
@@ -11,9 +13,9 @@ VPATH =       .
 dir_group=@dir_group@
 
 # one up
-basedir = ..
+basedir = @BUILD_DIR@/src
 # top dir
-topdir = ../..
+topdir = @BUILD_DIR@
 # this dir relative to top dir
 thisdir = src/dird
 
@@ -21,10 +23,6 @@ DEBUG=@DEBUG@
 
 GETTEXT_LIBS = @LIBINTL@
 CAP_LIBS = @CAP_LIBS@
-
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_INC = @PYTHON_INCDIR@
-
 DB_LIBS=@DB_LIBS@
 
 first_rule: all
@@ -35,16 +33,15 @@ SVRSRCS = dird.c admin.c authenticate.c \
          autoprune.c backup.c bsr.c \
          catreq.c dir_plugins.c dird_conf.c expand.c \
          fd_cmds.c getmsg.c inc_conf.c job.c \
-         jobq.c migrate.c \
+         jobq.c mac.c mac_sql.c \
          mountreq.c msgchan.c next_vol.c newvol.c \
-         pythondir.c \
          recycle.c restore.c run_conf.c \
          scheduler.c \
          ua_acl.c ua_cmds.c ua_dotcmds.c \
          ua_query.c \
          ua_input.c ua_label.c ua_output.c ua_prune.c \
          ua_purge.c ua_restore.c ua_run.c \
-         ua_select.c ua_server.c \
+         ua_select.c ua_server.c snapshot.c \
          ua_status.c ua_tree.c ua_update.c vbackup.c verify.c
 SVROBJS = $(SVRSRCS:.c=.o)
 
@@ -58,25 +55,25 @@ EXTRAOBJS = @OBJLIST@
 # inference rules
 .c.o:
        @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 all: Makefile bacula-dir @STATIC_DIR@
        @echo "==== Make of dird is good ===="
        @echo " "
 
 bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
-           ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
+           ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
            ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-             -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+             -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(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) \
+                  ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
                   ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-             -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+             -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
              $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
        strip $@
 
@@ -119,7 +116,7 @@ install: all
        @if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
           echo "  ==> Saving existing query.sql to query.sql.old"; \
           $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
-       fi 
+       fi
        ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
        @if test -f static-bacula-dir; then \
           $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
@@ -127,7 +124,6 @@ install: all
 
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir)
        (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
        (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
 
@@ -142,7 +138,7 @@ 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) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \