Fix compilation of netifd and uci.

src/3P/netifd/builders/cmake/CMakeLists.txt

@@ -4,6 +4,8 @@ project (netifd)
 
 ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -Wmissing-declarations)
 
+include_directories ($ENV{INC_DIR}/libnl3)
+
 set (CMAKE_MODULE_PATH "${MODULE_PATH}")
 
 set(DISABLE_TARGET_OPTIMIZATION ON)
@@ -41,6 +43,6 @@ file (
 
 
 add_executable (netifd ${source_files})
-target_link_libraries (netifd ubox ubus json-c blobmsg_json)
+target_link_libraries (netifd ubox ubus json-c blobmsg_json uci nl-3)
 
 install (TARGETS netifd RUNTIME DESTINATION ../sbin)

src/3P/netifd/config.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <uci.h>
+#include <uci/uci.h>
 
 #include "netifd.h"
 #include "interface.h"

src/3P/netifd/config.h

@@ -15,7 +15,7 @@
 #define __NETIFD_CONFIG_H
 
 #include <libubox/blobmsg.h>
-#include <uci_blob.h>
+#include <uci/uci_blob.h>
 
 extern bool config_init;
 

src/3P/netifd/netifd.h

@@ -24,7 +24,7 @@
 #include <libubox/ustream.h>
 #include <libubox/utils.h>
 
-#include <libubus.h>
+#include <ubus/libubus.h>
 
 #include "utils.h"
 

src/3P/netifd/utils.h

@@ -16,7 +16,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
-#include <uci_blob.h>
+#include <uci/uci_blob.h>
 #include <libubox/list.h>
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>