Merge my local version with 'master' of git://ortcan.git.sourceforge.net/gitroot...

diff --git a/src/Makefile.omk b/src/Makefile.omk
index 4a9ab11c03a50d9a96e5eb6b1a6d77915780bb72..db3c0789060119cd4aa08688b216c4eb969595b4 100644 (file)
--- a/src/Makefile.omk
+++ b/src/Makefile.omk
@@ -1,5 +1,9 @@
 # -*- makefile -*-
 
+default_CONFIG = CONFIG_OC_LINCAN=x CONFIG_OC_CANVCA=x
+
+ifeq ($(CONFIG_OC_LINCAN),y)
+
 bin_PROGRAMS = canping
 
 canping_SOURCES = canping.c
@@ -9,14 +13,14 @@ INCLUDE = -D_REENTRANT -ggdb
 INCLUDES = -I $(srcdir)/../include
 kernel_INCLUDES = -I $(srcdir)/../include
 
-
 #rtlinux_MODULES = canping_rtl
 canping_rtl_SOURCES = canping_rtl.c
 
+endif
 
 ifeq ($(CONFIG_OC_CANVCA),y)
 
-bin_PROGRAMS = vca_canping
+bin_PROGRAMS += vca_canping
 vca_canping_SOURCES = vca_canping.c
 vca_canping_LIBS = pthread m vca ulut