Fix r189 to make sure it also works for people who didn't add the slcan

line discipline. If you want to build the slcan module, just run

	make CONFIG_CAN_SLCAN={y,m}

from the 2.6 directory.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@192 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index dc7221c9ea79d610a73c3c5b9cf58a1fd129a9a4..4c8829bcb8a0651bd5e21ec3c182fe7de020ba1d 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -5,16 +5,22 @@
 
 ifeq ($(KERNELRELEASE),)
 
+ifdef $(CONFIG_CAN_SLCAN)
+SLCAN_MOD = slcan
+else
+SLCAN_MOD =
+endif
+
 KERNELDIR = /usr/src/linux
 PWD       = $(shell pwd)
 
-all: vcan slcan sja1000 mscan
+all: vcan $(SLCAN_MOD) sja1000 mscan
 
 vcan:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CAN_VCAN=m modules
 
 slcan:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CAN_SLCAN=m modules
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CAN_SLCAN=$(CONFIG_CAN_SLCAN) modules
 
 sja1000:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CAN_SJA1000=m modules