[svn-commits] tzafrir: tools/trunk r6185 - /tools/trunk/Makefile

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Mar 17 04:10:12 2009
New Revision: 6185

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6185
Log:
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)



Modified:
    tools/trunk/Makefile

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/svn-view/dahdi/tools/trunk/Makefile?view=diff&rev=6185&r1=6184&r2=6185
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Tue Mar 17 04:10:12 2009
@@ -157,12 +157,12 @@
 	$(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 @@
 	$(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) = *"([^"]*)/); \