Add main file

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 969d351a679e9001d9dad0a061f322eba289f46a..18c51207d7554a50ae2e1ec26850e5879e9ccd73 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,20 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(d2d-manager C CXX)
+PROJECT(d2d-manager-daemon C CXX)
 
 MESSAGE("===================================================================")
 MESSAGE("Building...d2d-manager")
 MESSAGE("===================================================================")
 
+MESSAGE(" - Set include folder")
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/util)
+
+MESSAGE(" - Set source folder")
+AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/subownerclient SRCS)
+
 MESSAGE(" - Checking...packages dependency")
 INCLUDE(FindPkgConfig)
 
-SET(PKG_MODULES gio-2.0 gio-unix-2.0 dlog dbus-1 iotivity uuid)
+SET(PKG_MODULES glib-2.0 gio-2.0 gio-unix-2.0 dlog dbus-1 iotivity uuid)
 
 MESSAGE(" - Adding external C flags")
 FOREACH(flag ${daemon_pkgs_CFLAGS})
@@ -32,4 +38,8 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DUSE_DLOG")
 ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
 
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} pthread)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+
 ADD_SUBDIRECTORY(test)

diff --git a/packaging/d2d-manager.service b/packaging/d2d-manager.service
index 6b886fac6b239b53a7ab780005288a59faa81536..e7bf09a2d1148a00a98ae2e0331453b4c1d96205 100644 (file)
--- a/packaging/d2d-manager.service
+++ b/packaging/d2d-manager.service
@@ -9,7 +9,4 @@ User=network_fw
 Group=network_fw
 BusName=net.d2d.manager
 SmackProcessLabel=System
-ExecStart=/usr/bin/d2dd
-CapabilityBoundingSet=~CAP_MAC_ADMIN
-CapabilityBoundingSet=~CAP_DAC_OVERRIDE
-SecureBits=keep-caps
+ExecStart=/usr/bin/d2d-manager-daemon

diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec
index a166031110cb9c1b579ac522e1757595f267c661..ae3a9eef26ce8c4fe011add46e1af0de7213b522 100644 (file)
--- a/packaging/d2d-manager.spec
+++ b/packaging/d2d-manager.spec
@@ -78,7 +78,7 @@ cp test/oic_svr_db_client.dat oic_svr_db_subowner_client.dat
 %manifest %{name}.manifest
 %license LICENSE
 %defattr(-,root,root,-)
-#%{_bindir}/%{name}-daemon
+%{_bindir}/%{name}-daemon
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 %attr(644,root,root) %{_unitdir}/%{name}.service