X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2c5dbee366e95b46de0cb95cab23d2a94a13f184..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/Makefile.std

diff --git a/lincan/src/Makefile.std b/lincan/src/Makefile.std
index dc60238..40dacc3 100644
--- a/lincan/src/Makefile.std
+++ b/lincan/src/Makefile.std
@@ -62,7 +62,7 @@ endif
 
 SUPPORTED_CARDS = pip pccan smartcan nsi cc_can104 \
 	          pc_i03 pcm3680 aim104 m437 pcccan ssv \
-		  bfadcan pikronisa kv_pcican virtual template
+		  bfadcan pikronisa kv_pcican msmcan virtual template
 
 #SUPPORTED_CARDS = pcm3680 bfadcan pikronisa template
 
@@ -122,6 +122,12 @@ ifdef PROC_FS
 	O_OBJS += proc.o
 endif
 
+ifdef SUBDIRS
+EXTRA_CFLAGS += -I $(SUBDIRS)
+else
+EXTRA_CFLAGS += -I .
+endif
+
 # Target object file if any
 # this must be undefined for 2.5.xx kernels
 ifndef KERNEL_MODULE_V26
@@ -133,7 +139,7 @@ O_OBJS       += can_queue.o can_quekern.o devcommon.o main.o modparms.o \
 		setup.o finish.o irq.o boardlist.o \
 		sja1000p.o sja1000.o i82527.o  \
 	        open.o proc.o close.o write.o read.o \
-		ioctl.o select.o fasync.o
+		ioctl.o ioctl_query.o select.o fasync.o
 # Objects with exported symbols (-DEXPORT_SYMTAB)
 OX_OBJS      = 
 # Module objects 
@@ -167,12 +173,12 @@ dep: make_this_module_dep
 
 install : install_this_module
 
-.supported_cards.h: Makefile
-	echo >.supported_cards.h
+lincan_config.h: Makefile
+	echo >lincan_config.h
 	$(foreach card, $(SUPPORTED_CARDS), \
-	  echo \#define ENABLE_CARD_$(card) 1 >>.supported_cards.h ;)
+	  echo \#define CONFIG_OC_LINCAN_CARD_$(card) 1 >>lincan_config.h ;)
 	
-make_this_module: .supported_cards.h
+make_this_module: lincan_config.h
 	echo Linux kernel version $(KERNEL_VERSION)
 	echo Linux kernel sources $(KERNEL_LOCATION)
 	echo Module target $(obj-m)
@@ -187,7 +193,7 @@ install_this_module: make_this_module
 
 clean:
 	rm -f $(M_OBJS) $(MX_OBJS) $(O_OBJS) $(OX_OBJS) $(obj-m) \
-	      .*.o.flags .*.o.cmd .*.ko.cmd .depend .supported_cards.h *~ \
+	      .*.o.flags .*.o.cmd .*.ko.cmd .depend lincan_config.h *~ \
 	      $(obj-m:%.o=%.mod.o) $(FINAL_MODULE_OBJS) ../$(FINAL_MODULE_OBJS)
 
 distclean: clean