[svn-commits] tzafrir: tools/trunk r8263 - in /tools/trunk: ./ xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sun Mar  7 01:45:12 2010
New Revision: 8263

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8263
Log:
Use LDFLAGS in the xpp Makefile

Use a more standard link command in the xpp Makefile.

(closes issue #16597)
Reported by: pprindeville
Patches:
      dahdi-tools-bugid16597#3.patch uploaded by pprindeville (license 347)
Tested by: pprindeville, tzafrir


Modified:
    tools/trunk/configure.ac
    tools/trunk/makeopts.in
    tools/trunk/xpp/Makefile

Modified: tools/trunk/configure.ac
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/configure.ac?view=diff&rev=8263&r1=8262&r2=8263
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Sun Mar  7 01:45:12 2010
@@ -33,6 +33,8 @@
 AC_GNU_SOURCE
 
 AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
+
+AC_CHECK_TOOL([LD], [ld])
 
 # Checks for programs.
 AC_PROG_CC

Modified: tools/trunk/makeopts.in
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/makeopts.in?view=diff&rev=8263&r1=8262&r2=8263
==============================================================================
--- tools/trunk/makeopts.in (original)
+++ tools/trunk/makeopts.in Sun Mar  7 01:45:12 2010
@@ -1,4 +1,5 @@
 CC=@CC@
+LD=@LD@
 HOSTCC=@HOSTCC@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@

Modified: tools/trunk/xpp/Makefile
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/xpp/Makefile?view=diff&rev=8263&r1=8262&r2=8263
==============================================================================
--- tools/trunk/xpp/Makefile (original)
+++ tools/trunk/xpp/Makefile Sun Mar  7 01:45:12 2010
@@ -104,25 +104,27 @@
 endif
 
 fpga_load: fpga_load.o hexfile.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
+fpga_load: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
 
 astribank_hexload: $(ABHEXLOAD_OBJS)
-	$(CC) -L. -o $@ $(ABHEXLOAD_OBJS) $(EXTRA_LIBS) $(USB_LIB)
+astribank_hexload: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
 
 astribank_tool: $(ABTOOL_OBJS)
-	$(CC) -L. -o $@ $(ABTOOL_OBJS) $(EXTRA_LIBS) $(USB_LIB)
+astribank_tool: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
 
 astribank_allow: $(ABALLOW_OBJS)
-	$(CC) -L. -o $@ $(ABALLOW_OBJS) $(EXTRA_LIBS) $(USB_LIB)
+astribank_allow: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
 
 astribank_is_starting: astribank_is_starting.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS)
+astribank_is_starting: LIBS+=$(EXTRA_LIBS)
 
 fpga_load.o: CFLAGS+=-D_GNU_SOURCE	# We use memrchr()
 
 test_parse: test_parse.o hexfile.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
+test_parse: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
 
+%: %.o
+	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
 
 .perlcheck: $(PERL_SCRIPTS)
 	for i in $^; do perl -I./perl_modules -c $$i || exit 1; done