| 1 |
tomjbe |
1.1 |
--- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400
|
| 2 |
|
|
+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400
|
| 3 |
|
|
@@ -29,10 +29,11 @@
|
| 4 |
|
|
GETTEXT_LIBS = @LIBINTL@
|
| 5 |
|
|
|
| 6 |
|
|
CONS_INC=@CONS_INC@
|
| 7 |
|
|
CONS_LIBS=@CONS_LIBS@
|
| 8 |
|
|
CONS_LDFLAGS=@CONS_LDFLAGS@
|
| 9 |
|
|
+ZLIBS=@ZLIBS@
|
| 10 |
|
|
|
| 11 |
|
|
.SUFFIXES: .c .o
|
| 12 |
|
|
.PHONY:
|
| 13 |
|
|
.DONTCARE:
|
| 14 |
|
|
|
| 15 |
|
|
@@ -46,17 +47,17 @@
|
| 16 |
|
|
@echo " "
|
| 17 |
|
|
|
| 18 |
|
|
|
| 19 |
|
|
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
| 20 |
|
|
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
|
| 21 |
|
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
| 22 |
|
|
- $(OPENSSL_LIBS)
|
| 23 |
|
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
|
| 24 |
|
|
+ $(OPENSSL_LIBS) $(LIBS)
|
| 25 |
|
|
|
| 26 |
|
|
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
| 27 |
|
|
$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
| 28 |
|
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
| 29 |
|
|
- $(OPENSSL_LIBS)
|
| 30 |
|
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
|
| 31 |
|
|
+ $(OPENSSL_LIBS) $(LIBS)
|
| 32 |
|
|
strip $@
|
| 33 |
|
|
|
| 34 |
|
|
|
| 35 |
|
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
| 36 |
|
|
cd $(topdir) \
|
| 37 |
|
|
--- src/filed/Makefile.in.orig 2012-06-28 16:52:03.000000000 +0200
|
| 38 |
|
|
+++ src/filed/Makefile.in 2012-08-16 11:08:09.000000000 +0200
|
| 39 |
|
|
@@ -96,13 +96,13 @@
|
| 40 |
|
|
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
|
| 41 |
|
|
@echo "Linking $@ ..."
|
| 42 |
|
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
|
| 43 |
|
|
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
|
| 44 |
|
|
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
|
| 45 |
|
|
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
|
| 46 |
|
|
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
|
| 47 |
|
|
|
| 48 |
|
|
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
|
| 49 |
|
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
|
| 50 |
|
|
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
|
| 51 |
|
|
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
|
| 52 |
|
|
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
|
| 53 |
|
|
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
|
| 54 |
|
|
strip $@
|
| 55 |
|
|
|
| 56 |
|
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
Parent Directory
| 
Revision Log