pass: Make include directory containing the exported header files

Existing *.[ch] files uses the following type in order to include
the header file which is located in the outside directory. But it is
not proper method for including the header file.
- #include "core/*.h:

Make 'include' directory containing the all exported header files
and move the exported header files under 'include/' as following:
- src/core/*.h   -> include/pass/log.h
- src/shared/*.h -> include/pass/*.h
- src/hal/hal.h  -> include/pass/hal/hal.h

Change-Id: I68f6ad4c711b50a1d48bee3785d5657a8b58c963
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 048523b..1b6053f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,8 +87,7 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/pass)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/hal)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 SET(PKG_MODULES
        vconf

diff --git a/src/core/common.h b/include/pass/common.h
similarity index 100%
rename from src/core/common.h
rename to include/pass/common.h

diff --git a/src/core/config-parser.h b/include/pass/config-parser.h
similarity index 100%
rename from src/core/config-parser.h
rename to include/pass/config-parser.h

diff --git a/src/core/device-notifier.h b/include/pass/device-notifier.h
similarity index 100%
rename from src/core/device-notifier.h
rename to include/pass/device-notifier.h

diff --git a/src/core/devices.h b/include/pass/devices.h
similarity index 100%
rename from src/core/devices.h
rename to include/pass/devices.h

diff --git a/src/core/gdbus-util.h b/include/pass/gdbus-util.h
similarity index 100%
rename from src/core/gdbus-util.h
rename to include/pass/gdbus-util.h

diff --git a/src/hal/hal.h b/include/pass/hal/hal.h
similarity index 100%
rename from src/hal/hal.h
rename to include/pass/hal/hal.h

diff --git a/src/shared/log.h b/include/pass/log.h
similarity index 100%
rename from src/shared/log.h
rename to include/pass/log.h

diff --git a/src/core/common.c b/src/core/common.c
index b75a016..a0ee779 100644 (file)
--- a/src/core/common.c
+++ b/src/core/common.c
@@ -34,9 +34,8 @@
 #include <poll.h>
 #include <mntent.h>
 
-#include "shared/log.h"
-
-#include "common.h"
+#include <pass/log.h>
+#include <pass/common.h>
 
 #define BUFF_MAX       255
 

diff --git a/src/core/config-parser.c b/src/core/config-parser.c
index d0e2632..b13a5b2 100644 (file)
--- a/src/core/config-parser.c
+++ b/src/core/config-parser.c
@@ -20,9 +20,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "shared/log.h"
-
-#include "config-parser.h"
+#include <pass/log.h>
+#include <pass/config-parser.h>
 
 #define BUFF_MAX       255
 #define MAX_SECTION    64

diff --git a/src/core/device-notifier.c b/src/core/device-notifier.c
index 4a03ead..2c6e99b 100644 (file)
--- a/src/core/device-notifier.c
+++ b/src/core/device-notifier.c
@@ -18,10 +18,9 @@
 
 #include <glib.h>
 
-#include "shared/log.h"
-
-#include "device-notifier.h"
-#include "common.h"
+#include <pass/common.h>
+#include <pass/device-notifier.h>
+#include <pass/log.h>
 
 #define DEVICE_NOTIFIER_MAX_COUNT      255
 

diff --git a/src/core/devices.c b/src/core/devices.c
index 46ca468..42e193c 100644 (file)
--- a/src/core/devices.c
+++ b/src/core/devices.c
@@ -19,10 +19,9 @@
 #include <glib.h>
 #include <stdio.h>
 
-#include "shared/log.h"
-
-#include "common.h"
-#include "devices.h"
+#include <pass/common.h>
+#include <pass/devices.h>
+#include <pass/log.h>
 
 static const struct device_ops default_ops = {
        .name = "default-ops",

diff --git a/src/core/gdbus-util.c b/src/core/gdbus-util.c
index 0702dc2..42d21b8 100644 (file)
--- a/src/core/gdbus-util.c
+++ b/src/core/gdbus-util.c
@@ -19,8 +19,8 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "gdbus-util.h"
-#include "shared/log.h"
+#include <pass/gdbus-util.h>
+#include <pass/log.h>
 
 static GDBusConnection *g_dbus_sys_conn = NULL;
 

diff --git a/src/core/main.c b/src/core/main.c
index 9b56d8c..a3c2542 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -23,12 +23,11 @@
 #include <gio/gio.h>
 #include <sys/reboot.h>
 
-#include "shared/log.h"
-
-#include "common.h"
-#include "device-notifier.h"
-#include "devices.h"
-#include "gdbus-util.h"
+#include <pass/common.h>
+#include <pass/device-notifier.h>
+#include <pass/devices.h>
+#include <pass/gdbus-util.h>
+#include <pass/log.h>
 
 #define PASS_DBUS_BUS_NAME     "org.tizen.system.pass"
 

diff --git a/src/hal/CMakeLists.txt b/src/hal/CMakeLists.txt
index ade8159..c0f1fbc 100755 (executable)
--- a/src/hal/CMakeLists.txt
+++ b/src/hal/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(pass-hal-devel C)
 
 SET(HAL_HEADERS
-       hal.h
+       ../../include/pass/hal/hal.h
        hal-log.h
 )
 

diff --git a/src/hal/hal.c b/src/hal/hal.c
index 2f65a71..beadab5 100644 (file)
--- a/src/hal/hal.c
+++ b/src/hal/hal.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 #include <linux/limits.h>
 
-#include "hal.h"
+#include <pass/hal/hal.h>
+
 #include "hal-log.h"
 
 #ifndef EXPORT

diff --git a/src/pass/pass-gov.c b/src/pass/pass-gov.c
index 19febfd..6601220 100644 (file)
--- a/src/pass/pass-gov.c
+++ b/src/pass/pass-gov.c
@@ -21,15 +21,15 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
+#include <pass/device-notifier.h>
+#include <pass/config-parser.h>
+
 #include "pass.h"
 #include "pass-gov.h"
 #include "pass-pmqos.h"
 #include "pass-hal.h"
 #include "pass-rescon.h"
 
-#include "core/device-notifier.h"
-#include "core/config-parser.h"
-
 #define PASS_CPU_STATS_MAX_COUNT       20
 
 struct pass_governor {

diff --git a/src/pass/pass-hal.c b/src/pass/pass-hal.c
index 48d1e33..0d91fcc 100644 (file)
--- a/src/pass/pass-hal.c
+++ b/src/pass/pass-hal.c
@@ -22,11 +22,11 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#include <pass/common.h>
+
 #include "pass.h"
 #include "pass-hal.h"
 
-#include "core/common.h"
-
 static struct pass_resource_dvfs_ops *get_dvfs(struct pass_resource *res,
                                                int res_type)
 {

diff --git a/src/pass/pass-hal.h b/src/pass/pass-hal.h
index 172b0a4..8d1fd6f 100644 (file)
--- a/src/pass/pass-hal.h
+++ b/src/pass/pass-hal.h
@@ -20,7 +20,7 @@
 #ifndef __PASS_HAL__
 #define __PASS_HAL__
 
-#include "hal/hal.h"
+#include <pass/hal/hal.h>
 
 /***
  * Functions for all H/W resources

diff --git a/src/pass/pass-parser.c b/src/pass/pass-parser.c
index 12e6ce7..57a08cc 100644 (file)
--- a/src/pass/pass-parser.c
+++ b/src/pass/pass-parser.c
@@ -22,11 +22,11 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "pass.h"
+#include <pass/common.h>
+#include <pass/config-parser.h>
+#include <pass/hal/hal.h>
 
-#include "core/common.h"
-#include "core/config-parser.h"
-#include "hal/hal.h"
+#include "pass.h"
 
 #define MAX_NUM                                255
 #define MIN_TIMEOUT_SEC                0.2

diff --git a/src/pass/pass-pmqos.c b/src/pass/pass-pmqos.c
index 22668b2..64606f0 100644 (file)
--- a/src/pass/pass-pmqos.c
+++ b/src/pass/pass-pmqos.c
@@ -21,13 +21,13 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
+#include <pass/device-notifier.h>
+#include <pass/config-parser.h>
+
 #include "pass.h"
 #include "pass-gov.h"
 #include "pass-rescon.h"
 
-#include "core/device-notifier.h"
-#include "core/config-parser.h"
-
 /****************************************************************************
  *                             PASS Notifier                                *
  * - DEVICE_NOTIFIER_PMQOS                                                  *

diff --git a/src/pass/pass.c b/src/pass/pass.c
index 9cf90d2..c85d440 100644 (file)
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -22,16 +22,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <pass/common.h>
+#include <pass/device-notifier.h>
+#include <pass/devices.h>
+#include <pass/gdbus-util.h>
+
 #include "pass.h"
 #include "pass-parser.h"
 #include "pass-hal.h"
 #include "pass-gov.h"
 
-#include "core/device-notifier.h"
-#include "core/devices.h"
-#include "core/common.h"
-#include "core/gdbus-util.h"
-
 #define DBUS_CORE_I_START_HANDLER              "handle_start"
 #define DBUS_CORE_I_STOP_HANDLER               "handle_stop"
 #define DBUS_CORE_I_NUM_SIGNALS                        2

diff --git a/src/pass/pass.h b/src/pass/pass.h
index c5959fd..adaffcd 100644 (file)
--- a/src/pass/pass.h
+++ b/src/pass/pass.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#include "shared/log.h"
+#include <pass/log.h>
 
 #define BUFF_MAX               255
 

diff --git a/src/pmqos/pmqos-parser.c b/src/pmqos/pmqos-parser.c
index 6d6b83c..8352f08 100644 (file)
--- a/src/pmqos/pmqos-parser.c
+++ b/src/pmqos/pmqos-parser.c
@@ -24,8 +24,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include "core/config-parser.h"
-#include "shared/log.h"
+#include <pass/log.h>
+#include <pass/config-parser.h>
 
 #include "pmqos.h"
 

diff --git a/src/pmqos/pmqos.c b/src/pmqos/pmqos.c
index 78854dd..88d19ab 100644 (file)
--- a/src/pmqos/pmqos.c
+++ b/src/pmqos/pmqos.c
@@ -20,11 +20,11 @@
 #include <stdio.h>
 #include <limits.h>
 
-#include "core/gdbus-util.h"
-#include "core/devices.h"
-#include "core/common.h"
-#include "core/device-notifier.h"
-#include "shared/log.h"
+#include <pass/common.h>
+#include <pass/devices.h>
+#include <pass/device-notifier.h>
+#include <pass/gdbus-util.h>
+#include <pass/log.h>
 
 #include "pmqos.h"