This commit was manufactured by cvs2svn to create tag

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

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index ba70f04ef69b53cf94d6230722d101981afe085d..2b9e2141ea25c03bb9698f8b4a997fe0407d009f 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -23,14 +23,14 @@ first_rule: all
 dummy:
 
 # bacula-sd
-SDOBJS =  stored.o ansi_label.o \
+SVROBJS = 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 mac.o match_bsr.o mount.o parse_bsr.o \
+         label.o match_bsr.o mount.o parse_bsr.o \
          pythonsd.o read.o read_record.o record.o \
-         reserve.o scan.o \
+         reserve.o \
          spool.o status.o stored_conf.o wait.o
 
 # btape
@@ -38,33 +38,35 @@ 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 \
           reserve.o \
-          stored_conf.o match_bsr.o parse_bsr.o scan.o spool.o wait.o
+          stored_conf.o match_bsr.o parse_bsr.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 reserve.o scan.o stored_conf.o spool.o wait.o
+          reserve.o \
+         read_record.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 reserve.o \
-          scan.o stored_conf.o spool.o wait.o
+          pythonsd.o reserve.o \
+          read_record.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 scan.o reserve.o stored_conf.o spool.o wait.o
+         reserve.o \
+         butil.o read_record.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 reserve.o \
-          scan.o stored_conf.o spool.o wait.o
+          reserve.o \
+          butil.o read_record.o stored_conf.o spool.o wait.o
 
 
 
@@ -87,13 +89,13 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
        @echo "===== Make of stored is good ===="
        @echo " "
 
-bacula-sd: $(SDOBJS) ../lib/libbac.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
+bacula-sd: $(SVROBJS) ../lib/libbac.a
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
          -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
          $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
-static-bacula-sd: $(SDOBJS) ../lib/libbac.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
+static-bacula-sd: $(SVROBJS) ../lib/libbac.a
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
         -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
         $(GETTEXT_LIBS) $(OPENSSL_LIBS)
        strip $@