Integrate Phil's Makefile patch

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

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 9d4a53a02c2e4d0c8aac111a097aeb04c7b76f51..a3192c7f239d70a1503bc38d0fad5e2a7b618340 100644 (file)
--- 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 \
-         device.c dircmd.c fd_cmds.c fdmsg.c job.c \
-         label.c match_bsr.c parse_bsr.c \
-         read.c record.c stored_conf.c mount.c
+         block.c butil.c dev.c \
+         device.c dircmd.c fd_cmds.c job.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 \
-         device.o dircmd.o fd_cmds.o fdmsg.o job.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
 
 
 
@@ -91,7 +93,7 @@ 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_LDFLSGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm
+       $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm
 
 bls.o: bls.c
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
@@ -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