X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2FMakefile.in;h=de69c1cdcc5ecb168e0aef455d80d86450599e43;hb=b9265a6898ae36e450755721acfbf4a52342bc2f;hp=245fcddf7c044835aaa177ead1d74e0c6afb3035;hpb=84907e655c6902b2bbfd155208e20ed15e889aab;p=bacula%2Fbacula

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 245fcddf7c..de69c1cdcc 100644
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -20,44 +20,46 @@ dummy:
 # bacula-sd
 SVRSRCS = stored.c autochanger.c acquire.c append.c \
 	  askdir.c authenticate.c \
-	  block.c dev.c \
+	  block.c butil.c dev.c \
 	  device.c dircmd.c fd_cmds.c job.c \
-	  label.c match_bsr.c parse_bsr.c \
-	  read.c record.c stored_conf.c mount.c
+	  label.c match_bsr.c mount.c parse_bsr.c \
+	  read.c read_record.c record.c \
+	  spool.c status.c stored_conf.c
 SVROBJS = stored.o autochanger.o acquire.o append.o \
 	  askdir.o authenticate.o \
-	  block.o dev.o \
+	  block.o butil.o dev.o \
 	  device.o dircmd.o fd_cmds.o job.o \
 	  label.o match_bsr.o mount.o parse_bsr.o \
-	  read.o record.o stored_conf.o
+	  read.o read_record.o record.o \
+	  spool.o status.o stored_conf.o
 
 # btape
 TAPESRCS = btape.c block.c butil.c dev.c device.c label.c \
 	   acquire.c mount.c record.c read_record.c \
-	   stored_conf.c match_bsr.c parse_bsr.o
+	   stored_conf.c match_bsr.c parse_bsr.c spool.c
 TAPEOBJS = btape.o block.o butil.o dev.o device.o label.o \
 	   autochanger.o acquire.o mount.o record.o read_record.o \
-	   stored_conf.o match_bsr.o parse_bsr.o
+	   stored_conf.o match_bsr.o parse_bsr.o spool.o
 
 # bls
 BLSOBJS = bls.o block.o butil.o device.o dev.o label.o match_bsr.o \
 	  autochanger.o acquire.o mount.o parse_bsr.o record.o	\
-	  read_record.o stored_conf.o
+	  read_record.o stored_conf.o spool.o
 
 # bextract
 BEXTOBJS = bextract.o block.o device.o dev.o label.o record.o \
 	   autochanger.o acquire.o mount.o match_bsr.o parse_bsr.o butil.o \
-	   read_record.o stored_conf.o
+	   read_record.o stored_conf.o spool.o
 
 # bscan
 SCNOBJS = bscan.o block.o device.o dev.o label.o \
 	  autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
-	  butil.o read_record.o stored_conf.o
+	  butil.o read_record.o stored_conf.o spool.o
 
 # bcopy
 COPYOBJS = bcopy.o block.o device.o dev.o label.o \
 	   autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
-	   butil.o read_record.o stored_conf.o
+	   butil.o read_record.o stored_conf.o spool.o
 
 
 
@@ -81,41 +83,41 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
 	@echo " "
 
 bacula-sd: $(SVROBJS) ../lib/libbac.a
-	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(DLIB) $(LIBS) 
 
 static-bacula-sd: $(SVROBJS) ../lib/libbac.a
-	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(DLIB) $(LIBS) 
 	strip $@
 
 btape.o: btape.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 btape:	$(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
-	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm
+	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) -lsql $(DLIB) -lbac -lm $(LIBS) 
 
 bls.o:	bls.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 bls:	../findlib/libfind.a $(BLSOBJS) ../lib/libbac.a
-	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(LIBS) $(DLIB) -lfind -lbac -lm
+	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) -lfind -lbac -lm $(LIBS) 
 
 bextract.o: bextract.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 bextract: ../findlib/libfind.a $(BEXTOBJS) ../lib/libbac.a
-	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(LIBS) $(DLIB) $(FDLIBS) -lfind -lbac -lm
+	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) -lfind -lbac -lm $(LIBS) 
 
 bscan.o: bscan.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 bscan:	../findlib/libfind.a $(SCNOBJS) ../cats/libsql.a
-	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) -lsql $(LIBS) $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm
+	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) -lsql $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) 
 
 bcopy.o: bcopy.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 bcopy:	$(COPYOBJS) ../findlib/libfind.a ../lib/libbac.a
-	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS)  $(LIBS) $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm
+	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS)  $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) 
 
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -126,7 +128,7 @@ install: all
 	$(INSTALL_PROGRAM) bacula-sd $(DESTDIR)$(sbindir)/bacula-sd
 	$(INSTALL_PROGRAM) bls $(DESTDIR)$(sbindir)/bls
 	$(INSTALL_PROGRAM) bextract $(DESTDIR)$(sbindir)/bextract
-#	$(INSTALL_PROGRAM) bcopy $(DESTDIR)$(sbindir)/bcopy
+	$(INSTALL_PROGRAM) bcopy $(DESTDIR)$(sbindir)/bcopy
 	$(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
 	$(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
 	@srcconf=bacula-sd.conf; \
@@ -138,6 +140,9 @@ install: all
 	fi; \
 	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	@if test -f static-bacula-sd; then \
+	   $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
+	fi
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-sd)
@@ -160,6 +165,9 @@ 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)
 
 # Semi-automatic generation of dependencies:
 # Use cc -M because X11 `makedepend' doesn't work on all systems