From e0b3ad722c4a760408ba97dc6a71eb9e183843e4 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Sun, 7 Mar 2010 07:45:12 +0000
Subject: 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



git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@8263 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 configure.ac |  2 ++
 makeopts.in  |  1 +
 xpp/Makefile | 14 ++++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c755af..d1ea2a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,8 @@ AC_GNU_SOURCE
 
 AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
 
+AC_CHECK_TOOL([LD], [ld])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
diff --git a/makeopts.in b/makeopts.in
index a11777c..9d01d76 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -1,4 +1,5 @@
 CC=@CC@
+LD=@LD@
 HOSTCC=@HOSTCC@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
diff --git a/xpp/Makefile b/xpp/Makefile
index 837ddc4..a501084 100644
--- a/xpp/Makefile
+++ b/xpp/Makefile
@@ -104,25 +104,27 @@ ifneq	(,$(PERLLIBDIR))
 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
-- 
cgit v1.2.3