166 lines
10 KiB
Diff
166 lines
10 KiB
Diff
|
--- bacula-5.0.3/bacula-5.0.3/src/qt-console/bat.pro.in~ 2010-08-10 11:27:17.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/qt-console/bat.pro.in 2010-08-10 12:32:00.312182153 -0500
|
||
|
@@ -20,7 +20,7 @@
|
||
|
TARGET = bat
|
||
|
DEPENDPATH += .
|
||
|
INCLUDEPATH += .. . ./console ./restore ./select
|
||
|
-LIBS += -L../lib -lbaccfg -lbac -ldl @OPENSSL_LIBS@
|
||
|
+LIBS += -L../lib -lbaccfg -lbac -ldl -lz @OPENSSL_LIBS@
|
||
|
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
|
||
|
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
|
||
|
QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in 2010-08-11 12:54:02.028450916 -0500
|
||
|
@@ -57,7 +57,7 @@
|
||
|
@echo " "
|
||
|
|
||
|
bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm -lz $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~ 2010-08-11 12:57:29.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in 2010-08-11 14:10:52.998447849 -0500
|
||
|
@@ -64,7 +64,7 @@
|
||
|
|
||
|
dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
|
||
|
- -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbacsql -lbaccfg -lbac -lm -lz $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~ 2010-08-11 14:13:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in 2010-08-11 15:11:00.309447155 -0500
|
||
|
@@ -97,7 +97,7 @@
|
||
|
|
||
|
bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
|
||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
|
||
|
- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bbatch.o
|
||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~ 2010-08-12 06:57:25.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in 2010-08-12 07:58:13.545781384 -0500
|
||
|
@@ -93,7 +93,7 @@
|
||
|
|
||
|
bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
|
||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
|
||
|
- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
|
||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in 2010-08-12 08:56:11.053777811 -0500
|
||
|
@@ -91,7 +91,7 @@
|
||
|
bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
@echo "Linking $@ ..."
|
||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
|
||
|
- -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
|
||
|
+ -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
|
||
|
$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
|
||
|
|
||
|
static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 08:59:17.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in 2010-08-12 10:24:42.478529732 -0500
|
||
|
@@ -117,7 +117,7 @@
|
||
|
bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
@echo "Compiling $<"
|
||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
|
||
|
- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bextract.o: bextract.c
|
||
|
@echo "Compiling $<"
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 10:27:36.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in 2010-08-12 11:45:39.904529074 -0500
|
||
|
@@ -127,7 +127,7 @@
|
||
|
bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
@echo "Compiling $<"
|
||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
|
||
|
- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bscan.o: bscan.c
|
||
|
@echo "Compiling $<"
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 11:48:22.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in 2010-08-12 13:21:02.246528324 -0500
|
||
|
@@ -136,7 +136,7 @@
|
||
|
|
||
|
bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
|
||
|
- -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bcopy.o: bcopy.c
|
||
|
@echo "Compiling $<"
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 13:23:58.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in 2010-08-12 14:31:11.204777284 -0500
|
||
|
@@ -107,7 +107,7 @@
|
||
|
|
||
|
btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -o $@ $(TAPEOBJS) \
|
||
|
- -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbacsql -lbaccfg -lbac $(DLIB) -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
bls.o: bls.c
|
||
|
@echo "Compiling $<"
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~ 2010-08-13 07:02:47.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in 2010-08-13 08:25:50.830920608 -0500
|
||
|
@@ -145,7 +145,7 @@
|
||
|
|
||
|
bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
|
||
|
- -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||
|
cd $(topdir) \
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/dird/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/dird/Makefile.in 2010-08-13 09:25:38.855168511 -0500
|
||
|
@@ -64,7 +64,7 @@
|
||
|
bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
||
|
@echo "Linking $@ ..."
|
||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
|
||
|
- -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
|
||
|
+ -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
|
||
|
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
|
||
|
|
||
|
static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/console/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/console/Makefile.in 2010-08-13 10:26:18.001169569 -0500
|
||
|
@@ -48,7 +48,7 @@
|
||
|
|
||
|
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
||
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
||
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) \
|
||
|
$(OPENSSL_LIBS)
|
||
|
|
||
|
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/wx-console/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/wx-console/Makefile.in 2010-08-13 11:28:43.829917394 -0500
|
||
|
@@ -83,7 +83,7 @@
|
||
|
|
||
|
bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ -L../lib $(CONS_LDFLAGS) \
|
||
|
- -lbaccfg -lbac $(LIBS) $(OPENSSL_LIBS)
|
||
|
+ -lbaccfg -lbac -lz $(LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
win32: bwx-console_private.res
|
||
|
|
||
|
--- bacula-5.0.3/bacula-5.0.3/src/tray-monitor/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500
|
||
|
+++ bacula-5.0.3/bacula-5.0.3/src/tray-monitor/Makefile.in 2010-08-13 12:34:18.573918720 -0500
|
||
|
@@ -45,7 +45,7 @@
|
||
|
|
||
|
bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \
|
||
|
- $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS)
|
||
|
+ $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm -lz $(LIBS) $(OPENSSL_LIBS)
|
||
|
|
||
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||
|
cd $(topdir) \
|