Attachment #222879 for bug #302162

View | Details | Raw Unified | Return to bug 302162
Collapse All | Expand All

Lines 126-132 Link Here

(-)src/lib/Makefile.in.orig (-1 / +1 lines)
126		126
127	libbac.la: Makefile $(LIBBAC_LOBJS)	127	libbac.la: Makefile $(LIBBAC_LOBJS)
128	@echo "Making $@ ..."	128	@echo "Making $@ ..."
129	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)	129	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) $(OPENSSL_LIBS) $(LIBS)
130		130
131	libbaccfg.a: $(LIBBACCFG_OBJS)	131	libbaccfg.a: $(LIBBACCFG_OBJS)
132	@echo "Making $@ ..."	132	@echo "Making $@ ..."

Lines 135-141 Link Here

(-)src/lib/Makefile.in.orig (-1 / +1 lines)
135		135
136	libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)	136	libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)
137	@echo "Making $@ ..."	137	@echo "Making $@ ..."
138	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)	138	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) $(OPENSSL_LIBS)
139		139
140	libbacpy.a: $(LIBBACPY_OBJS)	140	libbacpy.a: $(LIBBACPY_OBJS)
141	@echo "Making $@ ..."	141	@echo "Making $@ ..."





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) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) -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) \
	      $(DLIB) $(CONS_LIBS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) -lm $(LIBS) $(GETTEXT_LIBS) \
	      $(OPENSSL_LIBS)
	strip $@


Lines 59-65 Link Here

(-)src/findlib/Makefile.in.orig (-1 / +1 lines)
59		59
60	libbacfind.la: Makefile $(LIBBACFIND_LOBJS)	60	libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
61	@echo "Making $@ ..."	61	@echo "Making $@ ..."
62	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)	62	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
63		63
64	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status	64	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
65	cd $(topdir) \	65	cd $(topdir) \

Return to bug 302162

Lines 48-59 Link Here

(-)src/console/Makefile.in.orig (-2 / +2 lines)
48		48
49	bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)	49	bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
50	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \	50	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
51	$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \	51	$(DLIB) $(CONS_LIBS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) -lm $(LIBS) $(GETTEXT_LIBS) \
52	$(OPENSSL_LIBS)	52	$(OPENSSL_LIBS)
53		53
54	static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)	54	static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
55	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \	55	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
56	$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \	56	$(DLIB) $(CONS_LIBS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) -lm $(LIBS) $(GETTEXT_LIBS) \
57	$(OPENSSL_LIBS)	57	$(OPENSSL_LIBS)
58	strip $@	58	strip $@
59		59