[Asterisk-cvs] zaptel Makefile,1.36,1.37

[citats at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv4027

Modified Files:
	Makefile 
Log Message:
Autodetect 2.6 vs 2.4 when building zaptel modules.  
Don't require 'make linux26' anymore


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile	4 Mar 2004 19:19:51 -0000	1.36
+++ Makefile	19 Mar 2004 09:49:29 -0000	1.37
@@ -49,17 +49,22 @@
 MODULESKO=$(shell for x in $(MODULES); do echo "$$x.ko "; done )
 
 ZTTOOL=$(shell if [ -f /usr/include/newt.h ]; then echo zttool; fi)
+BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL)
+
 #PRIMARY=wcfxsusb
 PRIMARY=torisa
 #PRIMARY=wcfxo
 PWD=$(shell pwd)
 
-all:	$(MODULESO) ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL)
+BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
+all: $(BUILDVER)
+
+linux24: $(MODULESO) $(BINS)
 
 linux26: 
-linux26: prereq ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL)
+linux26: prereq $(BINS)
 	@if ! [ -d /usr/src/linux-2.6 ]; then echo "Link /usr/src/linux-2.6 to your kernel sources first!"; exit 1 ; fi
-	make -C /usr/src/linux-2.6 SUBDIRS=$(PWD) modules
+	@make -C /usr/src/linux-2.6 SUBDIRS=$(PWD) modules
 
 obj-m := $(MODULESO)