- Fix the block listing bug pointed out by Arno.

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

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 3b5c43d58fdfcfb3e84b5af04d84090a20f59102..ba70f04ef69b53cf94d6230722d101981afe085d 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -23,59 +23,48 @@ first_rule: all
 dummy:
 
 # bacula-sd
-SVRSRCS = stored.c ansi_label.c \
-         autochanger.c acquire.c append.c \
-         askdir.c authenticate.c \
-         block.c butil.c dev.c \
-         device.c dircmd.c dvd.c ebcdic.c fd_cmds.c job.c \
-         label.c match_bsr.c mount.c parse_bsr.c \
-         pythonsd.c read.c read_record.c record.c \
-         reserve.c \
-         spool.c status.c stored_conf.c wait.c
-SVROBJS = stored.o ansi_label.o \
+SDOBJS =  stored.o ansi_label.o \
          autochanger.o acquire.o append.o \
          askdir.o authenticate.o \
          block.o butil.o dev.o \
          device.o dircmd.o dvd.o ebcdic.c fd_cmds.o job.o \
-         label.o match_bsr.o mount.o parse_bsr.o \
+         label.o mac.o match_bsr.o mount.o parse_bsr.o \
          pythonsd.o read.o read_record.o record.o \
-         reserve.o \
+         reserve.o scan.o \
          spool.o status.o stored_conf.o wait.o
 
 # btape
-TAPESRCS = btape.c block.c butil.c dev.c device.c label.c \
-          ansi_label.c dvd.c ebcdic.c \
-          acquire.c mount.c record.c read_record.c \
-          stored_conf.c match_bsr.c parse_bsr.c spool.c
 TAPEOBJS = btape.o block.o butil.o dev.o device.o label.o \
           ansi_label.o dvd.o ebcdic.o \
           autochanger.o acquire.o mount.o record.o read_record.o \
-          stored_conf.o match_bsr.o parse_bsr.o spool.o wait.o
+          reserve.o \
+          stored_conf.o match_bsr.o parse_bsr.o scan.o spool.o wait.o
 
 # bls
 BLSOBJS = bls.o block.o butil.o device.o dev.o label.o match_bsr.o \
          ansi_label.o dvd.o ebcdic.o \
          autochanger.o acquire.o mount.o parse_bsr.o record.o  \
-         read_record.o stored_conf.o spool.o wait.o
+         read_record.o reserve.o scan.o stored_conf.o spool.o wait.o
 
 # bextract
 BEXTOBJS = bextract.o block.o device.o dev.o label.o record.o \
           ansi_label.o dvd.o ebcdic.o \
           autochanger.o acquire.o mount.o match_bsr.o parse_bsr.o butil.o \
-          pythonsd.o \
-          read_record.o stored_conf.o spool.o wait.o
+          pythonsd.o read_record.o reserve.o \
+          scan.o stored_conf.o spool.o wait.o
 
 # bscan
 SCNOBJS = bscan.o block.o device.o dev.o label.o \
          ansi_label.o dvd.o ebcdic.o \
          autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
-         butil.o read_record.o stored_conf.o spool.o wait.o
+         butil.o read_record.o scan.o reserve.o stored_conf.o spool.o wait.o
 
 # bcopy
 COPYOBJS = bcopy.o block.o device.o dev.o label.o \
           ansi_label.o dvd.o ebcdic.o \
           autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
-          butil.o read_record.o stored_conf.o spool.o wait.o
+          butil.o read_record.o reserve.o \
+          scan.o stored_conf.o spool.o wait.o
 
 
 
@@ -98,13 +87,13 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
        @echo "===== Make of stored is good ===="
        @echo " "
 
-bacula-sd: $(SVROBJS) ../lib/libbac.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
+bacula-sd: $(SDOBJS) ../lib/libbac.a
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
          -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
          $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
-static-bacula-sd: $(SVROBJS) ../lib/libbac.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
+static-bacula-sd: $(SDOBJS) ../lib/libbac.a
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
         -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
         $(GETTEXT_LIBS) $(OPENSSL_LIBS)
        strip $@
@@ -193,7 +182,7 @@ realclean: clean
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+       (cd $(srcdir); $(RMF) Makefile)
 
 devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi