[Asterisk-cvs] asterisk/channels Makefile,1.34,1.35

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv21759/channels

Modified Files:
	Makefile 
Log Message:
Get rid of old chan_zap_old


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile	12 Nov 2003 18:23:09 -0000	1.34
+++ Makefile	10 Dec 2003 02:19:22 -0000	1.35
@@ -41,8 +41,6 @@
 CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
 ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
 ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
-CHANZAP=$(shell if [ -f .oldzap ]; then echo "chan_zap_old.c"; else echo "chan_zap.c"; fi)
-ZAPLIB=$(shell if [ -f .oldzap ]; then echo "-lzap"; fi)
 CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
 CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
 
@@ -120,11 +118,11 @@
 	$(CC) $(SOLINK) -o $@ chan_iax.o
 endif
 
-chan_zap.o: $(CHANZAP)
-	$(CC) -c $(CFLAGS) -o chan_zap.o $(CHANZAP)
+chan_zap.o: chan_zap.c
+	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
 
 chan_zap.so: chan_zap.o
-	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -ltonezone $(ZAPLIB)
+	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -ltonezone
 
 chan_alsa.o: $(ALSA_SRC)