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

[canping.git] / src / Makefile.omk

diff --git a/src/Makefile.omk b/src/Makefile.omk
index b902cd4125f855a4fc83e9290a1198fe497ab4e0..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,6 +13,16 @@ 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
+vca_canping_SOURCES = vca_canping.c
+vca_canping_LIBS = pthread m vca ulut
+
+endif #CONFIG_OC_CANVCA
+