From e0afdb10ae879d26d7f81d1dba8d47978a9a2aa9 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 4 Sep 2013 12:46:11 +0200
Subject: [PATCH] Move includes into subdirectory

---
 CMakeLists.txt                      | 2 +-
 exec.c                              | 2 +-
 file.c                              | 2 +-
 exec.h => include/rpcd/exec.h       | 0
 plugin.h => include/rpcd/plugin.h   | 0
 session.h => include/rpcd/session.h | 0
 uci.h => include/rpcd/uci.h         | 0
 iwinfo.c                            | 2 +-
 luci2.c                             | 2 +-
 main.c                              | 6 +++---
 plugin.c                            | 2 +-
 session.c                           | 2 +-
 uci.c                               | 4 ++--
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename exec.h => include/rpcd/exec.h (100%)
 rename plugin.h => include/rpcd/plugin.h (100%)
 rename session.h => include/rpcd/session.h (100%)
 rename uci.h => include/rpcd/uci.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f448a72..cbdf743 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 PROJECT(rpcd C)
-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations)
+ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations -Iinclude)
 
 OPTION(FILE_SUPPORT "File plugin support" ON)
 OPTION(LUCI2_SUPPORT "LuCI2 plugin support" ON)
diff --git a/exec.c b/exec.c
index c03e450..a5f6561 100644
--- a/exec.c
+++ b/exec.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include "exec.h"
+#include <rpcd/exec.h>
 
 static int
 rpc_errno_status(void)
diff --git a/file.c b/file.c
index b1cfe99..4a8a5c8 100644
--- a/file.c
+++ b/file.c
@@ -29,7 +29,7 @@
 #include <libubox/blobmsg.h>
 #include <libubox/ustream.h>
 
-#include "plugin.h"
+#include <rpcd/plugin.h>
 
 /* limit of sys & proc files */
 #define RPC_FILE_MIN_SIZE		(128)
diff --git a/exec.h b/include/rpcd/exec.h
similarity index 100%
rename from exec.h
rename to include/rpcd/exec.h
diff --git a/plugin.h b/include/rpcd/plugin.h
similarity index 100%
rename from plugin.h
rename to include/rpcd/plugin.h
diff --git a/session.h b/include/rpcd/session.h
similarity index 100%
rename from session.h
rename to include/rpcd/session.h
diff --git a/uci.h b/include/rpcd/uci.h
similarity index 100%
rename from uci.h
rename to include/rpcd/uci.h
diff --git a/iwinfo.c b/iwinfo.c
index 78f4485..3faf662 100644
--- a/iwinfo.c
+++ b/iwinfo.c
@@ -22,7 +22,7 @@
 #include <iwinfo.h>
 #include <iwinfo/utils.h>
 
-#include "plugin.h"
+#include <rpcd/plugin.h>
 
 
 static struct blob_buf buf;
diff --git a/luci2.c b/luci2.c
index 50381a2..f136c56 100644
--- a/luci2.c
+++ b/luci2.c
@@ -34,7 +34,7 @@
 #include <libubus.h>
 #include <uci.h>
 
-#include "plugin.h"
+#include <rpcd/plugin.h>
 
 /* limit of log size buffer */
 #define RPC_LUCI2_MAX_LOGSIZE		(128 * 1024)
diff --git a/main.c b/main.c
index efaa114..7335780 100644
--- a/main.c
+++ b/main.c
@@ -23,9 +23,9 @@
 #include <libubus.h>
 #include <signal.h>
 
-#include "session.h"
-#include "uci.h"
-#include "plugin.h"
+#include <rpcd/session.h>
+#include <rpcd/uci.h>
+#include <rpcd/plugin.h>
 
 static struct ubus_context *ctx;
 
diff --git a/plugin.c b/plugin.c
index afc1383..2d5b6c1 100644
--- a/plugin.c
+++ b/plugin.c
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "plugin.h"
+#include <rpcd/plugin.h>
 
 static struct blob_buf buf;
 
diff --git a/session.c b/session.c
index 6cc4ffe..c8da5a4 100644
--- a/session.c
+++ b/session.c
@@ -22,7 +22,7 @@
 #include <libubus.h>
 #include <fnmatch.h>
 
-#include "session.h"
+#include <rpcd/session.h>
 
 static struct avl_tree sessions;
 static struct blob_buf buf;
diff --git a/uci.c b/uci.c
index 34c6830..3fd187d 100644
--- a/uci.c
+++ b/uci.c
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "uci.h"
-#include "session.h"
+#include <rpcd/uci.h>
+#include <rpcd/session.h>
 
 static struct blob_buf buf;
 static struct uci_context *cursor;
-- 
2.11.0