[svn-commits] branch group/kernelmove r1047 - in /team/group/kernelmove/kernel: ./ datamods/

[svn-commits at lists.digium.com]

Author: jcollie
Date: Tue May  9 16:10:35 2006
New Revision: 1047

URL: http://svn.digium.com/view/zaptel?rev=1047&view=rev
Log:
More updates for 2.6 build.

Modified:
    team/group/kernelmove/kernel/Makefile.26
    team/group/kernelmove/kernel/datamods/Makefile

Modified: team/group/kernelmove/kernel/Makefile.26
URL: http://svn.digium.com/view/zaptel/team/group/kernelmove/kernel/Makefile.26?rev=1047&r1=1046&r2=1047&view=diff
==============================================================================
--- team/group/kernelmove/kernel/Makefile.26 (original)
+++ team/group/kernelmove/kernel/Makefile.26 Tue May  9 16:10:35 2006
@@ -10,8 +10,9 @@
 all: modules
 
 modules:
-        $(MAKE) -C $(KERNELDIR) M=`pwd` modules
+	$(MAKE) -C $(KERNELDIR) M=`pwd` modules
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=`pwd` clean
+
 endif

Modified: team/group/kernelmove/kernel/datamods/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/kernelmove/kernel/datamods/Makefile?rev=1047&r1=1046&r2=1047&view=diff
==============================================================================
--- team/group/kernelmove/kernel/datamods/Makefile (original)
+++ team/group/kernelmove/kernel/datamods/Makefile Tue May  9 16:10:35 2006
@@ -1,32 +1,18 @@
-.EXPORT_ALL_VARIABLES:
-MODULES= \
-	hdlc_cisco  hdlc_generic  hdlc_raw      syncppp \
-	hdlc_fr     hdlc_ppp      hdlc_raw_eth  
-	
+ifneq ($(KERNELRELEASE),)
+# support older 2.5/2.6 kernel builds that don't know about 'Kbuild' files
+include Kbuild
 
-PWD=$(shell pwd)
+else
+# Normal Makefile
 
-MODULESO:=$(MODULES:%=%.o)
-MODULESKO:=$(MODULES:%=%.ko)
-KMAKE = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
-KMAKE_INST = $(KMAKE) \
-  INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
+KERNELDIR ?= /lib/modules/`uname -r`/build
 
-obj-m := $(MODULESO)
-#obj-m:=hdlc_raw.o hdlc_cisco.o
-#obj-m := hdlc_cisco.o hdlc_cisco.mod.o hdlc_fr.o hdlc_generic.o hdlc_ppp.o hdlc_raw.o hdlc_raw_eth.o hdlc_raw.mod.o hdlc_x25.o
+all: modules
 
-all: 
-	@echo "You don't want to do make here.  Do it from up above"
+modules:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` modules
 
-clean: 
-	$(KMAKE) clean
+clean:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` clean
 
-install: $(MODULESKO)
-	$(KMAKE_INST)
-	
-datamods:
-	@echo "To build: $(obj-m)"
-	@echo $(KSRC)
-	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-	$(KMAKE) modules
+endif