X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/b08aa0e975a3d20affa15a5426991b8df1db1623..f77a6eb55fdb81f0aebffa7010d5038e95dfacab:/lincan/src/Makefile.std

diff --git a/lincan/src/Makefile.std b/lincan/src/Makefile.std
index c70ce4c..49c4956 100644
--- a/lincan/src/Makefile.std
+++ b/lincan/src/Makefile.std
@@ -48,6 +48,7 @@ endif
 #KERNEL_LOCATION=/usr/src/linux-2.2.19
 #KERNEL_LOCATION=/usr/src/linux-2.2.22
 #KERNEL_LOCATION=/usr/src/linux-2.6.0
+#KERNEL_LOCATION=/usr/src/linux-2.6.18-rc4/_build/arm
 #KERNEL_LOCATION=/home/cvs/ocera/ocera-build/kernel/linux
 
 
@@ -62,12 +63,13 @@ endif
 
 SUPPORTED_CARDS = pip pccan smartcan nsi cc_can104 \
 	          pc_i03 pcm3680 aim104 m437 pcccan ssv \
-		  bfadcan pikronisa kv_pcican msmcan virtual template \
-		  unican unican_cl2 ems_cpcpci oscar
-#		  hms30c7202_can c_can c_can_irq
+		  bfadcan gensja1000mm gensja1000io kv_pcican msmcan virtual template \
+		  unican unican_cl2 ems_cpcpci adlink7841 oscar \
+		  pcan_pci esdpci200
+#		  hms30c7202_can c_can c_can_irq tscan1
 #		  pcan_dongle
 
-#SUPPORTED_CARDS = pcm3680 bfadcan pikronisa template
+#SUPPORTED_CARDS = pcm3680 bfadcan template
 
 #SUPPORTED_CARDS = virtual
 
@@ -97,6 +99,17 @@ CONFIG_SHELL = TOPDIR=$(TOPDIR)
 KERNEL_VERSION := $(shell awk -F\" '/REL/ {print $$2}' \
 	$(KERNEL_LOCATION)/include/linux/version.h | awk -F\- '{print $$1}')
 
+ifeq ($(KERNEL_VERSION),)
+KERNEL_VERSION=$(shell grep UTS_RELEASE ${KERNEL_LOCATION}/include/linux/utsrelease.h | \
+                 sed 's/[^"]*"\(.*\)\{1\}"/\1/')
+endif
+ifeq ($(KERNEL_VERSION),)
+KERNEL_VERSION=$(shell grep UTS_RELEASE ${KERNEL_LOCATION}/include/generated/utsrelease.h | \
+                 sed 's/[^"]*"\(.*\)\{1\}"/\1/')
+endif
+
+#$(warning KERNEL_VERSION = $(KERNEL_VERSION))
+
 PROC_FS := $(shell awk -F\  '/PROC_FS/ {print $$3}' \
 	$(KERNEL_LOCATION)/include/linux/autoconf.h)
 
@@ -134,12 +147,12 @@ endif
 # Target object file if any
 # this must be undefined for 2.5.xx kernels
 ifndef KERNEL_MODULE_V26
-O_TARGET     = can.o
+O_TARGET     = lincan.o
 endif
 # Regular object files
 O_OBJS	     += $(SUPPORTED_CARDS:%=%.o)
 O_OBJS       += can_queue.o can_quekern.o devcommon.o main.o modparms.o \
-		setup.o finish.o irq.o boardlist.o \
+		setup.o finish.o irq.o sysdep_lnx.o boardlist.o \
 		sja1000p.o sja1000.o i82527.o  \
 	        open.o proc.o close.o write.o read.o \
 		ioctl.o ioctl_query.o ioctl_remote.o select.o fasync.o
@@ -157,9 +170,11 @@ LX_OBJS      =
 EXTRA_CFLAGS +=
 
 # Linux 2.4.2 and newer build system needs next
-can-objs = $(O_OBJS)
+lincan-objs = $(O_OBJS)
+ifndef KERNEL_MODULE_V26
 obj-y = $(O_OBJS)
-obj-m = can.o
+endif
+obj-m = lincan.o
 
 ifndef KERNEL_MODULE_V26
 FINAL_MODULE_OBJS=$(obj-m)
@@ -185,8 +200,8 @@ make_this_module: lincan_config.h
 	echo Linux kernel version $(KERNEL_VERSION)
 	echo Linux kernel sources $(KERNEL_LOCATION)
 	echo Module target $(obj-m)
-	echo Module objects $(can-objs)
-	DIR=`pwd`; (cd $(KERNEL_LOCATION); make SUBDIRS=$$DIR modules)
+	echo Module objects $(lincan-objs)
+	DIR=`pwd`; (cd $(KERNEL_LOCATION); make M=$$DIR SUBDIRS=$$DIR modules)
 
 make_this_module_dep:
 	DIR=`pwd`; (cd $(KERNEL_LOCATION); make SUBDIRS=$$DIR dep)