Version 0.3.0 from FTP

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@103 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 16 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index fb592cb..05f4c07 100755
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ KFLAGS+=-DECHO_CAN_STEVE
 #
 # Uncomment for Generic PPP support (i.e. ZapRAS)
 #
-KFLAGS+=-DCONFIG_ZAPATA_PPP
+#KFLAGS+=-DCONFIG_ZAPATA_PPP
 #
 # ISA Defaults can be set here.
 #
@@ -68,14 +68,13 @@ MODCONF=$(shell if [ -d /etc/modutils ]; then echo "/etc/modutils/zaptel"; elif
 TZOBJS=zonedata.lo tonezone.lo
 LIBTONEZONE=libtonezone.so.1.0
 MODULES=zaptel.o tor2.o torisa.o wcusb.o wcfxsusb.o wcfxo.o wcfxs.o \
-	ztdynamic.o ztd-eth.o
-MODULES+=$(shell if [ -f wct1xxp.c ]; then echo wct1xxp.o; fi)
+	ztdynamic.o ztd-eth.o wct1xxp.o # ztdummy.o
 ZTTOOL=$(shell if [ -f /usr/include/newt.h ]; then echo zttool; fi)
 #PRIMARY=wcfxsusb
 PRIMARY=torisa
 #PRIMARY=wcfxo
 
-all:	$(MODULES) ztcfg torisatool fxstest makefw ztmonitor ztspeed $(ZTTOOL)
+all:	$(MODULES) ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL)
 
 devel: tor2ee 
 
@@ -105,6 +104,9 @@ wct1xxp.o:wct1xxp.c zaptel.h
 wcfxs.o:wcfxs.c zaptel.h
 	gcc $(KFLAGS) -c wcfxs.c
 
+ztdummy.o:ztdummy.c ztdummy.h
+	gcc $(KFLAGS) -c ztdummy.c
+
 ztdynamic.o: ztdynamic.c zaptel.h
 	gcc $(KFLAGS)  -c ztdynamic.c
 
@@ -165,6 +167,15 @@ ztcfg.c: ztcfg.h
 ztcfg: ztcfg.o $(LIBTONEZONE)
 	$(CC) -o ztcfg ztcfg.o -L. -ltonezone
 
+usbfxstest.o: usbfxstest.c
+	$(CC) -g -c usbfxstest.c
+
+usbfxstest: usbfxstest.o 
+	$(CC) -o usbfxstest usbfxstest.o -lzap
+
+fxstest: fxstest.o 
+	$(CC) -o fxstest fxstest.o -ltonezone
+
 devices:
 	mkdir -p /dev/zap
 	rm -f /dev/zap/ctl
@@ -228,7 +239,7 @@ install:  all devices
 	if [ -d /etc/modutils ]; then \
 		/sbin/update-modules ; \
 	fi
-	/sbin/depmod -a
+	-/sbin/depmod -a
 	[ -f /etc/zaptel.conf ] || install -m 644 zaptel.conf.sample /etc/zaptel.conf
 
 config: