[svn-commits] branch group/kernelmove r1041 - /team/group/kernelmove/kernel/

[svn-commits at lists.digium.com]

Author: jcollie
Date: Tue May  9 08:47:56 2006
New Revision: 1041

URL: http://svn.digium.com/view/zaptel?rev=1041&view=rev
Log:
Rearrage makefiles a bit.

Added:
    team/group/kernelmove/kernel/Makefile.24
      - copied unchanged from r1037, team/group/kernelmove/kernel/makefile
    team/group/kernelmove/kernel/Makefile.26   (with props)
Removed:
    team/group/kernelmove/kernel/makefile
Modified:
    team/group/kernelmove/kernel/Makefile

Modified: team/group/kernelmove/kernel/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/kernelmove/kernel/Makefile?rev=1041&r1=1040&r2=1041&view=diff
==============================================================================
--- team/group/kernelmove/kernel/Makefile (original)
+++ team/group/kernelmove/kernel/Makefile Tue May  9 08:47:56 2006
@@ -1,36 +1,1 @@
-EXTRA_CFLAGS = -DSTANDALONE_ZAPATA 
-
-MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
-	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
-         ztd-loc ztdummy
-
-MODULESO:=$(MODULES:%=%.o)
-MOD_OBJS:=$(MODULESO:$(obj)/%)
-
-obj-m:=$(MODULESO)
-
-# generated header files. Currently generated in the main dir:
-$(src)/zaptel.c: $(obj)/version.h $(obj)/tones.h 
-$(src)/tor2.c:  $(obj)/tor2fw.h
-$(src)/pciradio.c:  $(obj)/radfw.h
-
-# 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.
-# This line is only meaningful when this Makefile is used as kconfig for 
-# 2.6 build
-
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
-obj-m+=xpp/
-endif
-
-$(obj)/tones.h: $(src)/../tones.h
-	cp $^ $@
-
-$(obj)/version.h: $(src)/../version.h
-	cp $^ $@
-
-$(obj)/tor2fw.h: $(src)/../tor2fw.h
-	cp $^ $@
-
-$(obj)/radfw.h: $(src)/../radfw.h
-	cp $^ $@
+# detect kernel major version and select proper makefile here

Added: team/group/kernelmove/kernel/Makefile.26
URL: http://svn.digium.com/view/zaptel/team/group/kernelmove/kernel/Makefile.26?rev=1041&view=auto
==============================================================================
--- team/group/kernelmove/kernel/Makefile.26 (added)
+++ team/group/kernelmove/kernel/Makefile.26 Tue May  9 08:47:56 2006
@@ -1,0 +1,17 @@
+
+ifneq ($(KERNELRELEASE),)
+# support older 2.5/2.6 kernel builds that don't know about 'Kbuild' files
+include Kbuild
+else
+# Normal Makefile
+
+KERNELDIR := /lib/modules/`uname -r`/build
+
+all: modules
+
+modules:
+        $(MAKE) -C $(KERNELDIR) M=`pwd` modules
+
+clean:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` clean
+endif

Propchange: team/group/kernelmove/kernel/Makefile.26
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/kernelmove/kernel/Makefile.26
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/group/kernelmove/kernel/Makefile.26
------------------------------------------------------------------------------
    svn:mime-type = text/plain