Fixes for OLSRd2 build process
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 17 Nov 2014 16:32:44 +0000 (17:32 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 17 Nov 2014 16:32:44 +0000 (17:32 +0100)
openwrt/oonf-olsrd2-git/Makefile
src-plugins/generic/cfg_uciloader/cfg_uciloader.h
src-plugins/nhdp/ff_dat_metric/ff_dat_metric.c
src-plugins/nhdp/mpr/mpr.c
src-plugins/nhdp/neighbor_probing/neighbor_probing.c
src-plugins/nhdp/nhdp/nhdp.c
src-plugins/nhdp/nhdp/nhdp_db.c
src-plugins/olsrv2/route_modifier/route_modifier.c
src/app_config.cmake

index c178e9e..f0e40f1 100644 (file)
@@ -17,13 +17,12 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_SOURCE_DIR=$(CURDIR)/../../
-CMAKE_OPTIONS=-D OONF_DO_NOT_REGISTER_PACKAGE:Bool=true \
-              -D OONF_NO_WERROR:Bool=true \
+CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_LOGGING_LEVEL:String=debug \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_CUSTOM_STATIC_PLUGINS:String="class clock duplicate_set interface layer2 packet_socket rfc5444 socket stream_socket telnet timer viewer os_clock os_net os_routing os_system cfg_uciloader ff_dat_metric neighbor_probing nl80211_listener link_config layer2info cfg_uciloader nhdpinfo olsrv2info" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_net;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;cfg_uciloader;nhdpinfo;olsrv2info" \
               -D INSTALL_LIB_DIR:Path=lib/oonf \
               -D INSTALL_INCLUDE_DIR:Path=include/oonf \
               -D INSTALL_CMAKE_DIR:Path=lib/oonf \
index 1b3a195..561a0b1 100644 (file)
 #ifndef CFG_UCILOADER_H_
 #define CFG_UCILOADER_H_
 
-#include "common/common_types.h"
-#include "core/oonf_subsystem.h"
-
 #define OONF_CFG_UCILOADER_SUBSYSTEM "cfg_uciloader"
-
 #define UCI_OPTION_FOR_SECTION_NAME "name"
 
 #endif /* CFG_UCILOADER_H_ */
index 665338a..2fb444c 100644 (file)
@@ -129,6 +129,7 @@ static const char *_dependencies[] = {
   OONF_LAYER2_SUBSYSTEM,
   OONF_RFC5444_SUBSYSTEM,
   OONF_TIMER_SUBSYSTEM,
+  OONF_NHDP_SUBSYSTEM,
 };
 static struct oonf_subsystem _olsrv2_ffdat_subsystem = {
   .name = OONF_FF_DAT_METRIC_SUBSYSTEM,
index 6e83170..7295f66 100644 (file)
@@ -97,6 +97,7 @@ static struct cfg_schema_section _mpr_rfc_section = {
 static const char *_dependencies[] = {
   OONF_CLASS_SUBSYSTEM,
   OONF_TIMER_SUBSYSTEM,
+  OONF_NHDP_SUBSYSTEM,
 };
 static struct oonf_subsystem _olsrv2_mpr_subsystem = {
   .name = OONF_MPR_SUBSYSTEM,
index de9fdc2..709ca56 100644 (file)
@@ -114,6 +114,7 @@ static const char *_dependencies[] = {
   OONF_LAYER2_SUBSYSTEM,
   OONF_RFC5444_SUBSYSTEM,
   OONF_TIMER_SUBSYSTEM,
+  OONF_NHDP_SUBSYSTEM,
 };
 static struct oonf_subsystem _olsrv2_neighbor_probing_subsystem = {
   .name = OONF_NEIGHBOR_PROBING_SUBSYSTEM,
index 80be881..83e12d5 100644 (file)
@@ -45,7 +45,6 @@
 #include "core/oonf_subsystem.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_interface.h"
-#include "subsystems/oonf_layer2.h"
 #include "subsystems/oonf_rfc5444.h"
 #include "nhdp/nhdp_hysteresis.h"
 #include "nhdp/nhdp_interfaces.h"
index 8701fdd..e0beb71 100644 (file)
@@ -47,7 +47,6 @@
 
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
-#include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp_internal.h"
index 2f3dca4..3bfd257 100644 (file)
@@ -117,8 +117,8 @@ static struct cfg_schema_section _modifier_section = {
 };
 
 static const char *_dependencies[] = {
-  OONF_OLSRV2_SUBSYSTEM,
   OONF_CLASS_SUBSYSTEM,
+  OONF_OLSRV2_SUBSYSTEM,
 };
 struct oonf_subsystem olsrv2_routemodifier_subsystem = {
   .name = OONF_ROUTE_MODIFIER_SUBSYSTEM,
index 8791aaa..7a50472 100644 (file)
@@ -23,20 +23,31 @@ set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 ####  set static subsystems  ####
 #################################
 
-set (OONF_STATIC_PLUGINS class
-                         clock
-                         duplicate_set
-                         interface
-                         layer2
-                         packet_socket
-                         rfc5444
-                         socket
-                         stream_socket
-                         telnet
-                         timer
-                         viewer
-                         os_clock
-                         os_net
-                         os_routing
-                         os_system
-                         )
+IF (NOT OONF_STATIC_PLUGINS)
+    set (OONF_STATIC_PLUGINS class
+                             clock
+                             duplicate_set
+                             interface
+                             layer2
+                             packet_socket
+                             rfc5444
+                             socket
+                             stream_socket
+                             telnet
+                             timer
+                             viewer
+                             os_clock
+                             os_net
+                             os_routing
+                             os_system
+                             layer2info
+                             nl80211_listener
+                             nhdp
+                             ff_dat_metric
+                             link_config
+                             neighbor_probing
+                             nhdpinfo
+                             olsrv2
+                             olsrv2info
+                             )
+ENDIF (NOT OONF_STATIC_PLUGINS)