From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 9 Nov 2010 11:59:41 +0000 (+0100)
Subject: Merge my local version with 'master' of git://ortcan.git.sourceforge.net/gitroot... 
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/canping.git/commitdiff_plain/472c30c0ba17095562f9d4b493e78c6a76350659?hp=9c02efb698d2072ac7de98f5f606b44280c40518

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

diff --git a/src/Makefile.omk b/src/Makefile.omk
index 4a9ab11..db3c078 100644
--- 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