Add heap stats to Dir and SD -- eliminate #ifdefs

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

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 299cf2c663b4423d7e34561068893eb45443ba9a..b12a0a51cf7efe630168426e9c650f500bdf5cd4 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -29,8 +29,8 @@ SVRSRCS = dird.c admin.c authenticate.c \
          jobq.c mountreq.c msgchan.c next_vol.c newvol.c \
          recycle.c restore.c run_conf.c \
          scheduler.c sql_cmds.c \
-         ua_cmds.c ua_dotcmds.c \
-         ua_query.c ua_retention.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 \
@@ -42,8 +42,8 @@ SVROBJS = dird.o admin.o authenticate.o \
          jobq.o mountreq.o msgchan.o next_vol.o newvol.o \
          recycle.o restore.o run_conf.o \
          scheduler.o sql_cmds.o \
-         ua_cmds.o ua_dotcmds.o \
-         ua_query.o ua_retention.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 \
@@ -66,11 +66,11 @@ all: Makefile bacula-dir @STATIC_DIR@
 
 bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
        $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-             -lsql -lbac -lfind -lm $(LIBS) $(DLIB) $(DB_LIBS)
+             -lsql -lbac -lfind -lm $(DLIB) $(DB_LIBS) $(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 $(LIBS) $(DLIB) $(DB_LIBS)
+             -lsql -lbac -lfind -lm $(DLIB) $(DB_LIBS) $(LIBS) 
        strip $@
 
 
@@ -89,6 +89,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 install: all
        $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        @srcconf=bacula-dir.conf; \