26 lines
1.3 KiB
Text
26 lines
1.3 KiB
Text
--- src/console/Makefile.in.orig 2015-08-13 13:52:24 UTC
|
|
+++ src/console/Makefile.in
|
|
@@ -48,12 +48,12 @@ all: Makefile bconsole @STATIC_CONS@
|
|
|
|
|
|
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) \
|
|
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
|
|
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
|
$(OPENSSL_LIBS)
|
|
|
|
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
|
- $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
|
+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
|
|
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
|
$(OPENSSL_LIBS)
|
|
strip $@
|
|
@@ -121,7 +121,7 @@ uninstall:
|
|
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) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
|
|
@if test -f Makefile ; then \
|
|
$(RMF) Makefile.bak; \
|