OMK makefiles updated to support OCERA Qconf tool.

The new rule (default-config) added to generate
"config.omk-default" file. This file can be used as is
or can be edited and saved into "config.omk" file.
If "config.omk" exists, it is preferred over "config.omk-default"
file.

diff --git a/lincan/src/Makefile.omk b/lincan/src/Makefile.omk
index 69927f971716358962d0c460f1d79fba919cf4a1..00e99143a1f27f910226915805210fa5660afa1e 100644 (file)
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@ -1,4 +1,8 @@
-rtlinux_INCLUDES = -I $(srcdir)/../include -DCAN_WITH_RTL
+default_CONFIG = CONFIG_OC_LINCAN=y CONFIG_OC_LINCANRTL=y
+
+ifeq ($(CONFIG_OC_LINCAN),y)
+
+rtlinux_INCLUDES = -I $(srcdir)/../include

 kernel_INCLUDES = -I $(srcdir)/../include
 #kernel_INCLUDES += -DCAN_DEBUG
 kernel_INCLUDES += -DWITH_DEVFS_FS
 kernel_INCLUDES = -I $(srcdir)/../include
 #kernel_INCLUDES += -DCAN_DEBUG
 kernel_INCLUDES += -DWITH_DEVFS_FS


@@ -10,8 +14,11 @@ kernel_MODULES = lincan
 lincan_cards_SOURCES = pip.c pccan.c smartcan.c nsi.c cc_can104.c \
                pc_i03.c pcm3680.c aim104.c m437.c pcccan.c ssv.c \
                bfadcan.c pikronisa.c kv_pcican.c virtual.c template.c
 lincan_cards_SOURCES = pip.c pccan.c smartcan.c nsi.c cc_can104.c \
                pc_i03.c pcm3680.c aim104.c m437.c pcccan.c ssv.c \
                bfadcan.c pikronisa.c kv_pcican.c virtual.c template.c

-               
+
+ifeq ($(CONFIG_OC_LINCANRTL),y)
+rtlinux_INCLUDES +=  -DCAN_WITH_RTL

 lincan_rtl_SOURCES = open_rtl.c close_rtl.c read_rtl.c write_rtl.c ioctl_rtl.c
 lincan_rtl_SOURCES = open_rtl.c close_rtl.c read_rtl.c write_rtl.c ioctl_rtl.c

+endif #CONFIG_OC_LINCANRTL

 
 lincan_SOURCES = can_queue.c can_quekern.c can_quertl.c main.c modparms.c \
                devcommon.c can_devrtl.c setup.c finish.c irq.c boardlist.c \
 
 lincan_SOURCES = can_queue.c can_quekern.c can_quertl.c main.c modparms.c \
                devcommon.c can_devrtl.c setup.c finish.c irq.c boardlist.c \


@@ -19,3 +26,4 @@ lincan_SOURCES = can_queue.c can_quekern.c can_quertl.c main.c modparms.c \
                open.c close.c read.c write.c ioctl.c select.c fasync.c \
                proc.c $(lincan_cards_SOURCES) $(lincan_rtl_SOURCES)
                
                open.c close.c read.c write.c ioctl.c select.c fasync.c \
                proc.c $(lincan_cards_SOURCES) $(lincan_rtl_SOURCES)
                

+endif #CONFIG_OC_LINCAN

diff --git a/lincan/src/main.c b/lincan/src/main.c
index 02a8ef9f7880dcf0701a770c28ee2b8eb7393439..7851340b81eca5df17b02ea083a7bbd9a4323593 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -7,7 +7,9 @@
  * Version lincan-0.2  9 Jul 2003
  */
 
  * Version lincan-0.2  9 Jul 2003
  */
 

+#ifndef EXPORT_SYMTAB

 #define EXPORT_SYMTAB
 #define EXPORT_SYMTAB

+#endif

 
 #include <linux/autoconf.h>
 
 
 #include <linux/autoconf.h>
 

diff --git a/lincan/utils/Makefile.omk b/lincan/utils/Makefile.omk
index cdfaf52afc4ce6d2685da62ac02e53e7d0774e2d..8eeb02a8a1e6e35c652af0030a039bd63f3eecf6 100644 (file)
--- a/lincan/utils/Makefile.omk
+++ b/lincan/utils/Makefile.omk
@@ -1,3 +1,7 @@
+default_CONFIG = CONFIG_OC_LINCAN=y CONFIG_OC_LINCANRTL=y
+
+ifeq ($(CONFIG_OC_LINCAN),y)
+

 INCLUDES = -I $(srcdir)/../include
 
 utils_PROGRAMS = readburst sendburst rxtx send can_proxy 
 INCLUDES = -I $(srcdir)/../include
 
 utils_PROGRAMS = readburst sendburst rxtx send can_proxy 


@@ -10,8 +14,14 @@ can_proxy_SOURCES = can-proxy.c
 
 # RT-Linux version of build
 
 
 # RT-Linux version of build
 

+ifeq ($(CONFIG_OC_LINCANRTL),y)
+

 rtlinux_MODULES = sendburst_rtl readburst_rtl
 
 sendburst_rtl_SOURCES = sendburst_rtl.c
 
 readburst_rtl_SOURCES = readburst_rtl.c
 rtlinux_MODULES = sendburst_rtl readburst_rtl
 
 sendburst_rtl_SOURCES = sendburst_rtl.c
 
 readburst_rtl_SOURCES = readburst_rtl.c

+
+endif #CONFIG_OC_LINCANRTL
+endif #CONFIG_OC_LINCAN
+