From 87ccfb5016ae7271c5e6f6abf0e2a21472830f1f Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 17 Mar 2009 09:10:12 +0000 Subject: Use LIBS instead of LDFLAGS directly in tools Makefile The Makefile of dahdi-tools set the variable LDFLAGS directly, rather than adding to LIBS. This does not allow placing LIBS after all the linked objects. (closes issue #14638) Reported by: Chainsaw Patches: dahdi-tools-2.1.0.2-asneeded.patch uploaded by Chainsaw (license 723) git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@6185 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 06b65c1..ba4f5d2 100644 --- a/Makefile +++ b/Makefile @@ -157,12 +157,12 @@ $(UTILS): version.o $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< %: %.o - $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ prereq: config.status dahdi_tool: CFLAGS+=$(NEWT_INCLUDE) -dahdi_tool: LDFLAGS+=$(NEWT_LIB) +dahdi_tool: LIBS+=$(NEWT_LIB) dahdi_speed: CFLAGS+=-O0 @@ -174,11 +174,11 @@ $(LTZ_SO): $(LTZ_SO_OBJS) $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm dahdi_cfg: $(LTZ_A) -dahdi_cfg: LDFLAGS+=-lm +dahdi_cfg: LIBS+=-lm fxstest: $(LTZ_SO) -fxstest: LDFLAGS+=-lm -fxotune: LDFLAGS+=-lm +fxstest: LIBS+=-lm +fxotune: LIBS+=-lm tonezones.txt: zonedata.c perl -ne 'next unless (/\.(country|description) = *"([^"]*)/); \ -- cgit v1.2.3