summaryrefslogtreecommitdiff
path: root/xpp/Makefile
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-03-10 18:48:11 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-03-10 18:48:11 +0000
commit760d0a2a75aba6307550bf551c5eb06174c256b5 (patch)
treed526eeb7d5ce0aec9e4572f5df0cb3536a2632d1 /xpp/Makefile
parentcf84710ff24dd09e80f9e5ecfeb16ce15137ddc3 (diff)
xpp: use 'xtalk' for the USB access code
* Move most of the USB access code from xpp/ to xpp/xtalk/ . * astribank_tool and such tools can now use a shorter -D mmm/nnn rather than a full path. Signed-off-by: Oron Peled <oron.peled@xorcom.com> Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@9825 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/Makefile')
-rw-r--r--xpp/Makefile17
1 files changed, 11 insertions, 6 deletions
diff --git a/xpp/Makefile b/xpp/Makefile
index 38b5956..e4f460f 100644
--- a/xpp/Makefile
+++ b/xpp/Makefile
@@ -54,9 +54,12 @@ PERL_SCRIPTS = \
PERL_MANS = $(PERL_SCRIPTS:%=%.8)
-ABHEXLOAD_OBJS = astribank_hexload.o hexfile.o pic_loader.o astribank_usb.o mpp_funcs.o debug.o
-ABTOOL_OBJS = astribank_tool.o astribank_usb.o mpp_funcs.o debug.o
-ABALLOW_OBJS = astribank_allow.o astribank_usb.o mpp_funcs.o debug.o
+XTALK_OBJS = xtalk/xtalk.o xtalk/xusb.o xtalk/xlist.o xtalk/debug.o
+ASTRIBANK_OBJS = astribank_usb.o mpptalk.o $(XTALK_OBJS)
+
+ABHEXLOAD_OBJS = astribank_hexload.o hexfile.o pic_loader.o $(ASTRIBANK_OBJS) $(OCT_OBJS)
+ABTOOL_OBJS = astribank_tool.o $(ASTRIBANK_OBJS)
+ABALLOW_OBJS = astribank_allow.o $(ASTRIBANK_OBJS)
TARGETS = .perlcheck astribank_is_starting
PROG_INSTALL = astribank_is_starting
@@ -102,6 +105,8 @@ ifneq (,$(PERLLIBDIR))
done
endif
+CFLAGS += -I. -Ixtalk
+
fpga_load: fpga_load.o hexfile.o
fpga_load: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
@@ -130,11 +135,11 @@ test_parse: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
touch $@
clean:
- $(RM) .depend *.o $(TARGETS)
+ $(RM) .depend *.o xtalk/*.o $(TARGETS)
.PHONY: depend
depend: .depend
-.depend: *.c *.h
- @$(CC) -MM *.c > $@ || rm -f $@
+.depend: *.c *.h xtalk/*.c xtalk/*.h
+ @$(CC) $(CFLAGS) -MM *.c xtalk/*.c > $@ || rm -f $@
include .depend