Fixes Martin's previous commit

diff --git a/frsh_api/Makefile.omk b/frsh_api/Makefile.omk
index 2aee9ae08a30b54e1544c2f02a588af31c6b9a0c..cbc2af8cb975006e08270cece60feec998bc9dab 100644 (file)
--- a/frsh_api/Makefile.omk
+++ b/frsh_api/Makefile.omk
@@ -8,8 +8,8 @@ frsh_LIBS = fna fcb_client forb contract frs ulut fosa $(scheduler-libs-y)
 config_include_HEADERS = frsh_resources.h
 frsh_resources_DEFINES = CONFIG_RESOURCE_DUMMY CONFIG_FWP
 
-scheduler-libs-$(CONFIG_RESOURCE_DUMMY) := frs_dummy
-scheduler-libs-$(CONFIG_FWP) := frsh_fwp
+scheduler-libs-$(CONFIG_RESOURCE_DUMMY) += frs_dummy
+scheduler-libs-$(CONFIG_FWP) += frsh_fwp fwp
 
 
 

diff --git a/frsh_api/frsh_core.c b/frsh_api/frsh_core.c
index a191de28388ffd15e01550b330bdb147e069a1f8..1ccc46d96d8ae7a587e89a457bf913e63c403f6c 100644 (file)
--- a/frsh_api/frsh_core.c
+++ b/frsh_api/frsh_core.c
@@ -3,7 +3,10 @@
 #include <forb.h>
 #include "frsh_forb.h"
 #include <frsh_resources.h>
-#include <stdio.h>
+
+#ifdef FRSH_DISTRIBUTED_MODULE_SUPPORTED
+#include <frsh_distributed.h>
+#endif
 
 #ifdef CONFIG_RESOURCE_DUMMY
 #include <res_dummy.h>
@@ -39,17 +42,15 @@ int frsh_init()
        if (ret) goto err;
        
 #ifdef CONFIG_RESOURCE_DUMMY
-#if 0  
        ret = frs_dummy_init(frsh_forb_global.orb, frsh_forb_global.fcb,
                             &frsh_forb_global.sch_executor);
        if (ret) goto err;
 #endif
-#endif
 
-//#if FRSH_DISTRIBUTED_MODULE_SUPPORTED
+#ifdef FRSH_DISTRIBUTED_MODULE_SUPPORTED
        ret = frsh_distributed_init();
        if (ret) goto err;
-//#endif
+#endif
        /* Run resource schedulers */
        fosa_thread_create(&frsh_forb_global.sch_executor_thread, NULL,
                           sch_executor_thread, NULL);