From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 26 May 2009 10:00:43 +0000 (+0200)
Subject: Fixes to allow compilation without distributed support
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/frsh.git/commitdiff_plain/6f135af36010b4f557d26499bf7f0262318cbf0c

Fixes to allow compilation without distributed support

To disable distributed support just put
FRSH_DISTRIBUTED_MODULE_SUPPORTED=false to config.omk or config.target.
---

diff --git a/demo/dcamera/Makefile.omk b/demo/dcamera/Makefile.omk
index 328774a..f1b4e3e 100644
--- a/demo/dcamera/Makefile.omk
+++ b/demo/dcamera/Makefile.omk
@@ -1,3 +1,4 @@
+ifneq ($(filter y true 1,$(FRSH_DISTRIBUTED_MODULE_SUPPORTED)),)
 LDFLAGS+= -L/usr/X11R6/lib
 
 ifneq ($(AQUOSA_ROOT),)
@@ -14,3 +15,4 @@ camserver_SOURCES = camserver.c show_video_v4l_main.c show_video_v4l_capture.c\
 			capture_v4l.c extract_skin_color.c
 camclient_SOURCES = camclient.c show_video_v4l_main.c show_video_v4l_capture.c\
 			capture_v4l.c extract_skin_color.c
+endif
diff --git a/frsh_api/Makefile.omk b/frsh_api/Makefile.omk
index 7758ff2..fa34f24 100644
--- a/frsh_api/Makefile.omk
+++ b/frsh_api/Makefile.omk
@@ -1,10 +1,15 @@
 SUBDIRS = tests
 
 shared_LIBRARIES = frsh
-frsh_SOURCES = frsh_contract.c frsh_vres.c frsh_synchobj.c frsh_distributed.c frsh_core.c \
+frsh_SOURCES = frsh_contract.c frsh_vres.c frsh_synchobj.c frsh_core.c \
 		frsh_spare_capacity.c frsh_error.c frsh_thread.c frsh_sharedobj.c frsh_power.c frsh_feedback.c
 include_HEADERS = frsh_opaque_types.h frsh_forb.h
-frsh_LIBS = fna fcb_client forb contract synchobj sharedobj fra ulut fosa $(allocator-libs-y) $(platform-libs-y)
+frsh_LIBS = fcb_client forb contract synchobj sharedobj fra ulut fosa $(allocator-libs-y) $(platform-libs-y)
+
+ifneq ($(filter y true 1,$(FRSH_DISTRIBUTED_MODULE_SUPPORTED)),)
+frsh_SOURCES += frsh_distributed.c
+frsh_LIBS += fna
+endif
 
 config_include_HEADERS = frsh_resources.h
 frsh_resources_DEFINES = CONFIG_RESOURCE_DUMMY \
diff --git a/frsh_api/frsh_core.c b/frsh_api/frsh_core.c
index 79012b1..355f796 100644
--- a/frsh_api/frsh_core.c
+++ b/frsh_api/frsh_core.c
@@ -62,7 +62,7 @@
 #include "frsh_forb.h"
 #include <frsh_resources.h>
 
-#ifdef FRSH_DISTRIBUTED_MODULE_SUPPORTED
+#if FRSH_DISTRIBUTED_MODULE_SUPPORTED
 #include <frsh_distributed.h>
 #endif
 
@@ -139,7 +139,7 @@ int frsh_init()
 	if (ret) goto err;
 #endif
 
-#ifdef FRSH_DISTRIBUTED_MODULE_SUPPORTED
+#if FRSH_DISTRIBUTED_MODULE_SUPPORTED
 	ret = frsh_distributed_init();
 	if (ret) goto err;
 #endif