You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
3.6 KiB
64 lines
3.6 KiB
7 years ago
|
--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200
|
||
|
+++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200
|
||
|
@@ -24,6 +24,7 @@
|
||
|
CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
|
||
|
CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
|
||
|
JSONOBJS = bbconsjson.o console_conf.o
|
||
|
+ZLIBS=@ZLIBS@
|
||
|
|
||
|
# these are the objects that are changed by the .configure process
|
||
|
EXTRAOBJS = @OBJLIST@
|
||
|
@@ -50,18 +51,18 @@
|
||
|
|
||
|
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
|
||
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
||
|
- $(OPENSSL_LIBS)
|
||
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
|
||
|
+ $(OPENSSL_LIBS) $(LIBS)
|
||
|
|
||
|
bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
|
||
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
||
|
- $(OPENSSL_LIBS)
|
||
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
|
||
|
+ $(OPENSSL_LIBS) $(LIBS)
|
||
|
|
||
|
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
|
||
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
||
|
- $(OPENSSL_LIBS)
|
||
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
|
||
|
+ $(OPENSSL_LIBS) $(LIBS)
|
||
|
strip $@
|
||
|
|
||
|
|
||
|
--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200
|
||
|
+++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200
|
||
|
@@ -69,19 +69,19 @@
|
||
|
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
@echo "Linking $@ ..."
|
||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
|
||
|
- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
|
||
|
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
||
|
+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
|
||
|
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
||
|
|
||
|
bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
|
||
|
@echo "Linking $@ ..."
|
||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
|
||
|
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
|
||
|
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
||
|
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
|
||
|
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
||
|
|
||
|
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
|
||
|
- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
|
||
|
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
||
|
+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
|
||
|
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
||
|
strip $@
|
||
|
|
||
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|