Daemon: Change the directory including header file to 'include'

To keep consistency with the C-Level API's header file directory, this
patch changes the directory including ML Agent Service's header files to
'include' from 'includes'.

Signed-off-by: Wook Song <wook16.song@samsung.com>

diff --git a/daemon/includes/common.h b/daemon/common.h
similarity index 100%
rename from daemon/includes/common.h
rename to daemon/common.h

diff --git a/daemon/includes/dbus-interface.h b/daemon/dbus-interface.h
similarity index 100%
rename from daemon/includes/dbus-interface.h
rename to daemon/dbus-interface.h

diff --git a/daemon/gdbus-util.c b/daemon/gdbus-util.c
index 6d015d1..38e6af5 100644 (file)
--- a/daemon/gdbus-util.c
+++ b/daemon/gdbus-util.c
@@ -14,8 +14,8 @@
 #include <stdbool.h>
 #include <systemd/sd-daemon.h>
 
-#include <gdbus-util.h>
-#include <log.h>
+#include "gdbus-util.h"
+#include "log.h"
 
 static GDBusConnection *g_dbus_sys_conn = NULL;
 

diff --git a/daemon/includes/gdbus-util.h b/daemon/gdbus-util.h
similarity index 100%
rename from daemon/includes/gdbus-util.h
rename to daemon/gdbus-util.h

diff --git a/daemon/includes/meson.build b/daemon/include/meson.build
similarity index 100%
rename from daemon/includes/meson.build
rename to daemon/include/meson.build

diff --git a/daemon/includes/ml-agent-dbus-interface.h b/daemon/include/ml-agent-dbus-interface.h
similarity index 100%
rename from daemon/includes/ml-agent-dbus-interface.h
rename to daemon/include/ml-agent-dbus-interface.h

diff --git a/daemon/includes/log.h b/daemon/log.h
similarity index 100%
rename from daemon/includes/log.h
rename to daemon/log.h

diff --git a/daemon/meson.build b/daemon/meson.build
index f9cfacf..97d02f3 100644 (file)
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -1,6 +1,6 @@
 # Machine Learning Agent
 # This file should be included when ml-service feature is enabled.
-ml_agentd_incs = include_directories('includes')
+ml_agentd_incs = include_directories('.', 'include')
 ml_agentd_lib_common_srcs = files('modules.c', 'gdbus-util.c', 'ml-agent-dbus-interface.c',
   'pipeline-dbus-impl.cc', 'model-dbus-impl.cc')
 ml_agentd_lib_service_db_srcs = files('service-db.cc')
@@ -102,7 +102,7 @@ lib_ml_agentd_test_dep = declare_dependency(
   link_with: ml_agentd_test_lib,
 )
 
-subdir('includes')
+subdir('include')
 install_headers(ml_agentd_headers,
   subdir: 'ml-agentd'
 )

diff --git a/daemon/ml-agent-dbus-interface.c b/daemon/ml-agent-dbus-interface.c
index 32ede96..9f33647 100644 (file)
--- a/daemon/ml-agent-dbus-interface.c
+++ b/daemon/ml-agent-dbus-interface.c
@@ -7,14 +7,14 @@
  * @bug     No known bugs except for NYI items
  */
 
-#include "includes/ml-agent-dbus-interface.h"
-#include "includes/dbus-interface.h"
+#include <errno.h>
+#include <glib.h>
+
+#include "include/ml-agent-dbus-interface.h"
+#include "dbus-interface.h"
 #include "model-dbus.h"
 #include "pipeline-dbus.h"
 
-#include <glib.h>
-#include <errno.h>
-
 typedef enum
 {
   ML_AGENT_DBUS_SERVICE_PIPELINE = 0,
@@ -312,7 +312,7 @@ ml_agent_dbus_interface_pipeline_get_state (gint64 id, gint * state,
  */
 gint
 ml_agent_dbus_interface_model_register (const gchar * name, const gchar * path,
-    const gboolean activate, const gchar * description, const gchar *app_info,
+    const gboolean activate, const gchar * description, const gchar * app_info,
     guint * version, GError ** err)
 {
   MachinelearningServiceModel *mlsm;

diff --git a/daemon/includes/modules.h b/daemon/modules.h
similarity index 100%
rename from daemon/includes/modules.h
rename to daemon/modules.h

diff --git a/daemon/pipeline-dbus-impl.cc b/daemon/pipeline-dbus-impl.cc
index 838a53f..2674de7 100644 (file)
--- a/daemon/pipeline-dbus-impl.cc
+++ b/daemon/pipeline-dbus-impl.cc
@@ -21,12 +21,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <common.h>
-#include <gdbus-util.h>
-#include <log.h>
-#include <modules.h>
-
+#include "common.h"
 #include "dbus-interface.h"
+#include "gdbus-util.h"
+#include "log.h"
+#include "modules.h"
 #include "pipeline-dbus.h"
 #include "service-db.hh"
 

diff --git a/daemon/includes/pkg-mgr.h b/daemon/pkg-mgr.h
similarity index 100%
rename from daemon/includes/pkg-mgr.h
rename to daemon/pkg-mgr.h

diff --git a/daemon/includes/service-db.hh b/daemon/service-db.hh
similarity index 100%
rename from daemon/includes/service-db.hh
rename to daemon/service-db.hh