Fix compilation of sprinklerd

2017-04-21 23:56:05 +02:00
parent 298cde361d
commit 936487e3d9
22 changed files with 110 additions and 72 deletions
--- a/bsp/buildroot_external/Config.in
+++ b/bsp/buildroot_external/Config.in
@@ -28,6 +28,22 @@ endmenu # Third parties

 menu "Domo"

+menu "Libraries"
+
+source "$BR2_EXTERNAL_DOMO_PATH/package/libubus-cpp/Config.in"
+
+endmenu # Libraries
+
+menu "Programmes"
+
+# CHACOND
+source "$BR2_EXTERNAL_DOMO_PATH/package/chacond/Config.in"
+
+# SPRINKLERD
+source "$BR2_EXTERNAL_DOMO_PATH/package/sprinklerd/Config.in"
+
+endmenu # Programmes
+
 endmenu # Domo

 menu "Host tools"
--- a/bsp/buildroot_external/Domo.in
+++ b/bsp/buildroot_external/Domo.in
@@ -1,5 +0,0 @@
-
-menu "Domo"
-
-
-endmenu # Domo
--- a/bsp/buildroot_external/package/sprinklerd/Config.in
+++ b/bsp/buildroot_external/package/sprinklerd/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_SPRINKLERD
 	bool "sprinklerd"
 	select BR2_PACKAGE_LIBUBUS_CPP
-	select BR2_PACKAGE_JSON_C
+	select BR2_PACKAGE_JSONCPP
 	default n
 	help
 		This program manage the sprinklers of the domo project.
--- a/bsp/buildroot_external/package/sprinklerd/sprinklerd.mk
+++ b/bsp/buildroot_external/package/sprinklerd/sprinklerd.mk
@@ -10,7 +10,7 @@ SPRINKLERD_SITE = $(TOPDIR)/../../src/prog/sprinklerd/builders/cmake
 SPRINKLERD_SITE_METHOD = local
 SPRINKLERD_INSTALL_STAGING = YES

-SPRINKLERD_DEPENDENCIES = libubus-cpp json-c
+SPRINKLERD_DEPENDENCIES = libubus-cpp jsoncpp

 SPRINKLERD_CONF = SRC_DIR=$(TOPDIR)/../..