settings: Move to a separate folder

6 files changed, 15 insertions, 13 deletions

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 24f0bc552..5f22bf114 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -32,12 +32,12 @@ networking/streams/stream_service.c networking/streams/stream_manager.c \
 pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c \
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 processing/watcher.c resolver/resolver_manager.c resolver/rr_set.c \
-selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
+selectors/traffic_selector.c settings/settings.c \
+threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
 utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
 utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
-utils/printf_hook/printf_hook_builtin.c utils/settings.c utils/test.c \
-utils/utils/strerror.c
+utils/printf_hook/printf_hook_builtin.c utils/test.c utils/utils/strerror.c
 
 # adding the plugin source files
 
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 3462d2ffc..d202b023d 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -30,12 +30,12 @@ networking/streams/stream_service.c networking/streams/stream_manager.c \
 pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c \
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 processing/watcher.c resolver/resolver_manager.c resolver/rr_set.c \
-selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
+selectors/traffic_selector.c settings/settings.c \
+threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
 utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
 utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
-utils/settings.c utils/test.c \
-utils/utils/strerror.c
+utils/test.c utils/utils/strerror.c
 
 if USE_DEV_HEADERS
 strongswan_includedir = ${dev_headers}
@@ -75,15 +75,14 @@ resolver/rr.h resolver/resolver_manager.h \
 plugins/plugin_loader.h plugins/plugin.h plugins/plugin_feature.h \
 processing/jobs/job.h processing/jobs/callback_job.h processing/processor.h \
 processing/scheduler.h processing/watcher.h selectors/traffic_selector.h \
-threading/thread.h threading/thread_value.h \
+settings/settings.h threading/thread.h threading/thread_value.h \
 threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h \
 threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \
 utils/utils.h utils/chunk.h utils/debug.h utils/enum.h utils/identification.h \
 utils/lexparser.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
 utils/leak_detective.h utils/printf_hook/printf_hook.h \
 utils/printf_hook/printf_hook_vstr.h utils/printf_hook/printf_hook_builtin.h \
-utils/settings.h utils/test.h utils/integrity_checker.h \
-utils/utils/strerror.h
+utils/test.h utils/integrity_checker.h utils/utils/strerror.h
 endif
 
 library.lo :	$(top_builddir)/config.status
diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 4125328b7..37a83fa2f 100644
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -113,8 +113,8 @@
 #include "utils/capabilities.h"
 #include "utils/integrity_checker.h"
 #include "utils/leak_detective.h"
-#include "utils/settings.h"
 #include "plugins/plugin_loader.h"
+#include "settings/settings.h"
 
 typedef struct library_t library_t;
 
diff --git a/src/libstrongswan/utils/settings.c b/src/libstrongswan/settings/settings.c
index cf34fd1cf..cf34fd1cf 100644
--- a/src/libstrongswan/utils/settings.c
+++ b/src/libstrongswan/settings/settings.c
diff --git a/src/libstrongswan/utils/settings.h b/src/libstrongswan/settings/settings.h
index 46403c4d3..23f3a8ead 100644
--- a/src/libstrongswan/utils/settings.h
+++ b/src/libstrongswan/settings/settings.h
@@ -16,7 +16,10 @@
 
 /**
  * @defgroup settings settings
- * @{ @ingroup utils
+ * @ingroup libstrongswan
+ *
+ * @defgroup settings_t settings
+ * @{ @ingroup settings
  */
 
 #ifndef SETTINGS_H_
@@ -24,7 +27,7 @@
 
 typedef struct settings_t settings_t;
 
-#include "utils.h"
+#include "utils/utils.h"
 #include "collections/enumerator.h"
 
 /**
diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c
index 096465191..8a08e360c 100644
--- a/src/libstrongswan/tests/suites/test_settings.c
+++ b/src/libstrongswan/tests/suites/test_settings.c
@@ -17,7 +17,7 @@
 
 #include <unistd.h>
 
-#include <utils/settings.h>
+#include <settings/settings.h>
 #include <utils/chunk.h>
 #include <utils/utils.h>
 #include <collections/linked_list.h>