X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2FMakefile.in;h=a306b014844b07298b477963e5dd0dc908bdad31;hb=b9ac1b6c82fd69ecf139edce98585a889906db8b;hp=26d8308eb9ec0dcbf38d02f8ca77dad7691a9259;hpb=7c8fa01635f8fa71b330b7075c1af94888d15887;p=bacula%2Fbacula

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 26d8308eb9..a306b01484 100644
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -22,32 +22,32 @@ first_rule: all
 dummy:
 
 #
-SVRSRCS = dird.c authenticate.c autoprune.c \
-	  backup.c \
-	  catreq.c dird_conf.c \
-	  fd_cmds.c getmsg.c job.c \
-	  mountreq.c msgchan.c newvol.c \
+SVRSRCS = dird.c admin.c authenticate.c \
+	  autoprune.c backup.c bsr.c \
+	  catreq.c dird_conf.c expand.c \
+	  fd_cmds.c getmsg.c inc_conf.c job.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_db_query.c ua_retention.c \
-	  ua_input.c ua_output.c ua_prune.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_status.c verify.c
-SVROBJS = dird.o authenticate.o autoprune.o \
-	  backup.o \
-	  catreq.o dird_conf.o \
-	  fd_cmds.o getmsg.o job.o \
-	  mountreq.o msgchan.o newvol.o \
+	  ua_status.c ua_tree.c verify.c
+SVROBJS = dird.o admin.o authenticate.o \
+	  autoprune.o backup.o bsr.o \
+	  catreq.o dird_conf.o expand.o \
+	  fd_cmds.o getmsg.o inc_conf.o job.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_db_query.o ua_retention.o \
-	  ua_input.o ua_output.o ua_prune.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 verify.o
+	  ua_status.o ua_tree.o verify.o
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -58,15 +58,21 @@ EXTRAOBJS = @OBJLIST@
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+	$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile bacula-dir
+all: Makefile bacula-dir @STATIC_DIR@
 	@echo "==== Make of dird is good ===="
 	@echo " "
 
-bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a
-	$(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(SVROBJS) \
-	      -lsql -lbac -lm $(LIBS) $(DLIB)
+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)
+
+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)
+	strip $@
+
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
@@ -74,13 +80,14 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 
 clean:
 	@$(RMF) dird bacula-dir core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+	@$(RMF) static-bacula-dir
 
 realclean: clean
 	@$(RMF) tags bacula-dir.conf
 
 distclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
-	(cd $(srcdir); $(RMF) Makefile)
+	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
 install: all
 	$(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
@@ -91,22 +98,21 @@ install: all
 	else \
 	   destconf=$$srcconf; \
 	fi; \
-	echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-	${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-	@srcconf=query.sql; \
-	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-	   destconf=$$srcconf.new; \
-	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
-	else \
-	   destconf=$$srcconf; \
-	fi; \
-	echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-	${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
+	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.save; \
+	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; \
+	fi
 
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
+	(cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)