[zaptel-commits] branch group/kernelmove r1046 - in /team/group/kernelmove: ./ kernel/

[zaptel-commits at lists.digium.com]

Author: jcollie
Date: Tue May  9 13:12:16 2006
New Revision: 1046

URL: http://svn.digium.com/view/zaptel?rev=1046&view=rev
Log:
Move more stuff to kernel dir.

Added:
    team/group/kernelmove/kernel/gendigits.c
      - copied unchanged from r1037, team/group/kernelmove/gendigits.c
Removed:
    team/group/kernelmove/gendigits.c
Modified:
    team/group/kernelmove/Makefile
    team/group/kernelmove/kernel/   (props changed)
    team/group/kernelmove/kernel/Kbuild

Modified: team/group/kernelmove/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/kernelmove/Makefile?rev=1046&r1=1045&r2=1046&view=diff
==============================================================================
--- team/group/kernelmove/Makefile (original)
+++ team/group/kernelmove/Makefile Tue May  9 13:12:16 2006
@@ -225,11 +225,11 @@
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
 tor2.o: tor2-hw.h tor2fw.h
-  
+
 zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
-  
+
 torisa.o: torisa.h
-  
+
 wcusb.o: wcusb.h
 
 wcfxsusb.o: wcfxsusb.h
@@ -258,14 +258,9 @@
 torisatool: torisatool.o
 	$(CC) -o $@ $^
 
-tones.h: gendigits
-	./gendigits > $@
-
-gendigits: LDFLAGS+=-lm
-
 zaptel.c: tones.h 
 
-prereq: tones.h tor2fw.h radfw.h version.h
+prereq: version.h
 
 zttool.o: zttool.c $(ZAPTEL_H)
 

Propchange: team/group/kernelmove/kernel/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May  9 13:12:16 2006
@@ -4,8 +4,8 @@
 .tmp_versions
 *.so
 *.a
-version.h
 radfw.h
 tor2fw.h
 tones.h
 .*.swp
+gendigits

Modified: team/group/kernelmove/kernel/Kbuild
URL: http://svn.digium.com/view/zaptel/team/group/kernelmove/kernel/Kbuild?rev=1046&r1=1045&r2=1046&view=diff
==============================================================================
--- team/group/kernelmove/kernel/Kbuild (original)
+++ team/group/kernelmove/kernel/Kbuild Tue May  9 13:12:16 2006
@@ -1,26 +1,31 @@
 EXTRA_CFLAGS =-I$(src)/.. -I$(obj) -DSTANDALONE_ZAPATA 
 
-obj-m = zaptel.o tor2.o torisa.o wcusb.o wcfxo.o wctdm.o wctdm24xxp.o	\
-	ztdynamic.o ztd-eth.o wct1xxp.o wct4xxp.o wcte11xp.o		\
-	pciradio.o ztd-loc.o ztdummy.o
+obj-m := zaptel.o tor2.o torisa.o wcusb.o wcfxo.o wctdm.o wctdm24xxp.o	\
+	 ztdynamic.o ztd-eth.o wct1xxp.o wct4xxp.o wcte11xp.o		\
+	 pciradio.o ztd-loc.o ztdummy.o
+
+hostprogs-y := gendigits
+HOSTLOADLIBES_gendigits := -lm
+
+$(obj)/zaptel.o: $(obj)/tones.h $(src)/../version.h
 
 $(obj)/tor2.o: $(obj)/tor2fw.h
 
 $(obj)/tor2fw.h: $(src)/tormenta2.rbt
-	$(src)/makefw $(src)/tormenta2.rbt tor2fw > $(obj)/tor2fw.h
+	$(src)/makefw $^ tor2fw > $@
 
 $(obj)/pciradio.o: $(obj)/radfw.h
 
 $(obj)/radfw.h: $(src)/pciradio.rbt
-	$(src)/makefw $(src)/pciradio.rbt radfw > $(obj)/radfw.h
+	$(src)/makefw $^ radfw > $@
 
-$(src)/../tones.h: 
-	make -C $(src)/.. tones.h
+$(obj)/tones.h: $(obj)/gendigits
+	$(obj)/gendigits > $@
 
 $(src)/../version.h:
 	make -C $(src)/.. version.h
 
-clean-files = $(obj)/tor2fw.h $(obj)/radfw.h
+clean-files = $(obj)/tor2fw.h $(obj)/radfw.h $(obj)/tones.h $(obj)/gendigits
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
 # for i386. On other archs the module will probably build but panic.