Fix CMakeLists for compatibility

- Fix CMakeLists to include additional source files automatically

Change-Id: I6990759ae72674e26dea5d3627d28d62740baca8
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c76497..fe7ecc3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,13 +25,7 @@ INCLUDE_DIRECTORIES(include)
 INCLUDE(FindPkgConfig)
 
 SET(PKGMGR_SERVER "pkgmgr-server")
-SET(SRCS
-       src/pkgmgr-server.c
-       src/request.c
-       src/pm-queue.c
-       src/restriction_mode.c
-       src/signal.c
-       )
+AUX_SOURCE_DIRECTORY(src SRCS)
 
 SET(SERVER_CHECK_MODULES gio-2.0 dlog pkgmgr-parser pkgmgr-info libtzplatform-config drm-service-core-tizen libgum sqlite3 pkgmgr pkgmgr-installer libsystemd aul)
 IF(TIZEN_FEATURE_CSR)
@@ -53,10 +47,12 @@ TARGET_LINK_LIBRARIES(${PKGMGR_SERVER} pkgmgr_installer)
 TARGET_LINK_LIBRARIES(${PKGMGR_SERVER} ${SERVER_DEPS_LDFLAGS})
 
 CONFIGURE_FILE(org.tizen.pkgmgr.service.in org.tizen.pkgmgr.service @ONLY)
-CONFIGURE_FILE(org.tizen.pkgmgr.conf.in org.tizen.pkgmgr.conf @ONLY)
 CONFIGURE_FILE(package-manager.service.in package-manager.service @ONLY)
 
 INSTALL(TARGETS ${PKGMGR_SERVER} DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.pkgmgr.service DESTINATION ${PREFIX}/share/dbus-1/system-services/)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.pkgmgr.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d
+       FILES_MATCHING
+       PATTERN "*.conf")
+
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/package-manager.service DESTINATION ${UNITDIR})

diff --git a/org.tizen.pkgmgr.conf.in b/org.tizen.pkgmgr.conf
similarity index 100%
rename from org.tizen.pkgmgr.conf.in
rename to org.tizen.pkgmgr.conf

diff --git a/packaging/pkgmgr-server.spec b/packaging/pkgmgr-server.spec
index ef78063..1fcf88e 100644 (file)
--- a/packaging/pkgmgr-server.spec
+++ b/packaging/pkgmgr-server.spec
@@ -82,7 +82,7 @@ install -m 0600 restriction.db %{buildroot}%{db_dir}
 %defattr(-,root,root,-)
 %{_unitdir}/package-manager.service
 %{_datadir}/dbus-1/system-services/org.tizen.pkgmgr.service
-%config %{_sysconfdir}/dbus-1/system.d/org.tizen.pkgmgr.conf
+%config %{_sysconfdir}/dbus-1/system.d/*pkgmgr*.conf
 %config(noreplace) %{db_dir}
 %config(noreplace) %{db_dir}/restriction.db
 %{_bindir}/pkgmgr-server