[svn-commits] tzafrir: tools/trunk r6836 - /tools/trunk/xpp/Makefile

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Jul  9 14:35:53 2009
New Revision: 6836

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6836
Log:
xpp: Use CFLGAS and libs from autoconf

Use CFLAGS and USB_{INCLUDE,LIB} from dahdi-tools's autoconf.

(closes issue #15477)
Reported by: pprindeville
Patches:
      usb_use_libs.diff uploaded by tzafrir (license 46)

Tested by: pprindeville


Modified:
    tools/trunk/xpp/Makefile

Modified: tools/trunk/xpp/Makefile
URL: http://svn.asterisk.org/svn-view/dahdi/tools/trunk/xpp/Makefile?view=diff&rev=6836&r1=6835&r2=6836
==============================================================================
--- tools/trunk/xpp/Makefile (original)
+++ tools/trunk/xpp/Makefile Thu Jul  9 14:35:53 2009
@@ -38,7 +38,7 @@
 HOSTCC		?= $(CC)
 
 
-CFLAGS		= -g -Wall $(EXTRA_CFLAGS)
+CFLAGS		+= -g -Wall $(USB_INCLUDE)
 
 %.8: %
 	pod2man --section 8 $^ > $@ || $(RM) $@
@@ -102,21 +102,21 @@
 endif
 
 fpga_load: fpga_load.o hexfile.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) -lusb
+	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
 
 astribank_hexload: $(ABHEXLOAD_OBJS)
-	$(CC) -L. -o $@ $(ABHEXLOAD_OBJS) $(EXTRA_LIBS) -lusb
+	$(CC) -L. -o $@ $(ABHEXLOAD_OBJS) $(EXTRA_LIBS) $(USB_LIB)
 
 astribank_tool: $(ABTOOL_OBJS)
-	$(CC) -L. -o $@ $(ABTOOL_OBJS) $(EXTRA_LIBS) -lusb
+	$(CC) -L. -o $@ $(ABTOOL_OBJS) $(EXTRA_LIBS) $(USB_LIB)
 
 astribank_allow: $(ABALLOW_OBJS)
-	$(CC) -L. -o $@ $(ABALLOW_OBJS) $(EXTRA_LIBS) -lusb
+	$(CC) -L. -o $@ $(ABALLOW_OBJS) $(EXTRA_LIBS) $(USB_LIB)
 
 fpga_load.o: CFLAGS+=-D_GNU_SOURCE	# We use memrchr()
 
 test_parse: test_parse.o hexfile.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) -lusb
+	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
 
 
 .perlcheck: $(PERL_SCRIPTS)