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 672f171f90af111c95cf3b72023dfd12b11f8718..2b9e2141ea25c03bb9698f8b4a997fe0407d009f 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -14,6 +14,8 @@ thisdir = src/stored
 
 DEBUG=@DEBUG@
 
+GETTEXT_LIBS = @LIBINTL@
+
 OPENSSL_LIBS = @OPENSSL_LIBS@
 OPENSSL_INC = @OPENSSL_INC@
 
@@ -21,58 +23,49 @@ 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 \
-         python.c \
-         read.c read_record.c record.c \
-         spool.c status.c stored_conf.c wait.c
 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 match_bsr.o mount.o parse_bsr.o \
-         python.o \
-         read.o read_record.o record.o \
+         pythonsd.o read.o read_record.o record.o \
+         reserve.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 \
+          reserve.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  \
+          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 \
-          python.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 \
+         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 \
+          reserve.o \
           butil.o read_record.o stored_conf.o spool.o wait.o
 
 
@@ -98,11 +91,13 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
 
 bacula-sd: $(SVROBJS) ../lib/libbac.a
        $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
-         -lbac -lm $(PYTHON_LIBS) $(OPENSSL_LIBS) $(DLIB) $(LIBS) 
+         -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) \
- -lbac -lm $(PYTHON_LIBS) $(OPENSSL_LIBS) $(DLIB) $(LIBS) 
+        -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+        $(GETTEXT_LIBS) $(OPENSSL_LIBS)
        strip $@
 
 btape.o: btape.c
@@ -111,15 +106,15 @@ btape.o: btape.c
 
 btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
        $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) \
- -lsql $(OPENSSL_LIBS) $(DLIB) -lbac -lm $(LIBS) 
+ -lsql $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bls.o: bls.c
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
  -I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
 
 bls:   ../findlib/libfind.a $(BLSOBJS) ../lib/libbac.a
-       $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(OPENSSL_LIBS) $(DLIB) -lfind \
- -lbac -lm $(OPENSSL_LIBS) $(LIBS) 
+       $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) -lfind \
+ -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bextract.o: bextract.c
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
@@ -127,7 +122,7 @@ bextract.o: bextract.c
 
 bextract: ../findlib/libfind.a $(BEXTOBJS) ../lib/libbac.a
        $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
- -lfind -lbac -lm $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) 
+ -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bscan.o: bscan.c
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
@@ -135,7 +130,7 @@ bscan.o: bscan.c
 
 bscan: ../findlib/libfind.a $(SCNOBJS) ../cats/libsql.a
        $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- -lsql $(OPENSSL_LIBS) $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) 
+ -lsql $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bcopy.o: bcopy.c
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
@@ -143,7 +138,7 @@ bcopy.o: bcopy.c
 
 bcopy: $(COPYOBJS) ../findlib/libfind.a ../lib/libbac.a
        $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
- $(OPENSSL_LIBS) $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) 
+ $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -189,7 +184,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