Move all sources below src/

Change-Id: I10a75ffe378790a7f7605c3b6aea2818ef7f2e29

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0deede7..a6da765 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,5 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fPIE -Wno-error=shadow -Werror=missin
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIE -Wno-error=shadow -Werror=missing-field-initializers -fconcepts")
 set(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
-add_subdirectory(common)
-add_subdirectory(libsessiond)
-add_subdirectory(sessiond)
+add_subdirectory(src)
 add_subdirectory(tests)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fa8cc96
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(common)
+add_subdirectory(library)
+add_subdirectory(service)

diff --git a/common/CMakeLists.txt b/src/common/CMakeLists.txt
similarity index 65%
rename from common/CMakeLists.txt
rename to src/common/CMakeLists.txt
index 6d9ced1..cc906d7 100644 (file)
--- a/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(
-       sessiond_common_SRCS
-)
-
 add_library(sessiond_common INTERFACE)
-target_include_directories(sessiond_common INTERFACE include/ ${CMAKE_SOURCE_DIR}/libsessiond/include/)
-
+target_include_directories(sessiond_common INTERFACE include/ ${CMAKE_SOURCE_DIR}/src/library/include/)
 install(TARGETS sessiond_common)

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

diff --git a/libsessiond/CMakeLists.txt b/src/library/CMakeLists.txt
similarity index 100%
rename from libsessiond/CMakeLists.txt
rename to src/library/CMakeLists.txt

diff --git a/libsessiond/include/sessiond.h b/src/library/include/sessiond.h
similarity index 100%
rename from libsessiond/include/sessiond.h
rename to src/library/include/sessiond.h

diff --git a/libsessiond/libsessiond.pc.in b/src/library/libsessiond.pc.in
similarity index 100%
rename from libsessiond/libsessiond.pc.in
rename to src/library/libsessiond.pc.in

diff --git a/libsessiond/src/lib.c b/src/library/src/lib.c
similarity index 100%
rename from libsessiond/src/lib.c
rename to src/library/src/lib.c

diff --git a/libsessiond/src/lib.h b/src/library/src/lib.h
similarity index 100%
rename from libsessiond/src/lib.h
rename to src/library/src/lib.h

diff --git a/sessiond/CMakeLists.txt b/src/service/CMakeLists.txt
similarity index 100%
rename from sessiond/CMakeLists.txt
rename to src/service/CMakeLists.txt

diff --git a/sessiond/org.tizen.sessiond.conf b/src/service/org.tizen.sessiond.conf
similarity index 100%
rename from sessiond/org.tizen.sessiond.conf
rename to src/service/org.tizen.sessiond.conf

diff --git a/sessiond/sessiond.service b/src/service/sessiond.service
similarity index 100%
rename from sessiond/sessiond.service
rename to src/service/sessiond.service

diff --git a/sessiond/src/fs_helpers.cpp b/src/service/src/fs_helpers.cpp
similarity index 100%
rename from sessiond/src/fs_helpers.cpp
rename to src/service/src/fs_helpers.cpp

diff --git a/sessiond/src/fs_helpers.h b/src/service/src/fs_helpers.h
similarity index 100%
rename from sessiond/src/fs_helpers.h
rename to src/service/src/fs_helpers.h

diff --git a/sessiond/src/globals.hpp b/src/service/src/globals.hpp
similarity index 100%
rename from sessiond/src/globals.hpp
rename to src/service/src/globals.hpp

diff --git a/sessiond/src/main.cpp b/src/service/src/main.cpp
similarity index 100%
rename from sessiond/src/main.cpp
rename to src/service/src/main.cpp

diff --git a/sessiond/src/tuple_g_variant_helpers.hpp b/src/service/src/tuple_g_variant_helpers.hpp
similarity index 100%
rename from sessiond/src/tuple_g_variant_helpers.hpp
rename to src/service/src/tuple_g_variant_helpers.hpp

diff --git a/sessiond/src/tuple_hash.hpp b/src/service/src/tuple_hash.hpp
similarity index 100%
rename from sessiond/src/tuple_hash.hpp
rename to src/service/src/tuple_hash.hpp

diff --git a/sessiond/src/wait_manager.hpp b/src/service/src/wait_manager.hpp
similarity index 100%
rename from sessiond/src/wait_manager.hpp
rename to src/service/src/wait_manager.hpp

diff --git a/sessiond/systemd/org.tizen.system.sessiond.service b/src/service/systemd/org.tizen.system.sessiond.service
similarity index 100%
rename from sessiond/systemd/org.tizen.system.sessiond.service
rename to src/service/systemd/org.tizen.system.sessiond.service