d8e5efd339
Ports have been modified to conflict with bacula- and PKGNAMESUFFIX changed accordingly. PR: 191311 Submitted by: maintainer
28 lines
1.8 KiB
Text
28 lines
1.8 KiB
Text
--- src/dird/Makefile.in 2011-11-26 09:08:12.000000000 -0500
|
|
+++ src/dird/Makefile.in 2011-12-02 13:15:46.000000000 -0500
|
|
@@ -68,14 +68,14 @@
|
|
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
|
|
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
|
@echo "Linking $@ ..."
|
|
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
|
|
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
|
|
-lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(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) \
|
|
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
|
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
|
|
+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
|
|
-lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
|
|
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
|
|
strip $@
|
|
@@ -141,7 +141,7 @@
|
|
depend:
|
|
@$(MV) Makefile Makefile.bak
|
|
@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
|
|
- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
|
|
+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
|
|
@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
|
|
@if test -f Makefile ; then \
|
|
$(RMF) Makefile.bak; \
|