From 296dd7ff0d7dff64a2942b1960a33b1386bd1461 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Thu, 9 Jul 2009 19:35:53 +0000 Subject: 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 git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@6836 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- xpp/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xpp/Makefile') diff --git a/xpp/Makefile b/xpp/Makefile index 9409e97..111bb6d 100644 --- a/xpp/Makefile +++ b/xpp/Makefile @@ -38,7 +38,7 @@ PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT)) HOSTCC ?= $(CC) -CFLAGS = -g -Wall $(EXTRA_CFLAGS) +CFLAGS += -g -Wall $(USB_INCLUDE) %.8: % pod2man --section 8 $^ > $@ || $(RM) $@ @@ -102,21 +102,21 @@ ifneq (,$(PERLLIBDIR)) 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) -- cgit v1.2.3