From 9ec775577248428acb7f7809b71ae586e22d864a Mon Sep 17 00:00:00 2001
From: Sung-jae Park <nicesj.park@samsung.com>
Date: Tue, 22 Oct 2013 15:14:25 +0900
Subject: [PATCH] Fix build error.

Change-Id: I07f86e71deb2f31893d466e5fe71556cda8b59bb
---
 CMakeLists.txt | 25 ++++++++++++++++++-------
 src/main.c     |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3901588..ad5cbba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,16 @@ SET(LOCALEDIR "/usr/apps/org.tizen.${PROJECT_NAME}/res/locale")
 SET(ICON_PROVIDER "icon-provider-slave")
 SET(EXE_LOADER "${PROJECT_NAME}")
 
+SET(EXTRA_CFLAGS "-Wall -Winline -g -fno-builtin-malloc")
+SET(EXTRA_CXXFLAGS "-Wall -Winline -g -fno-builtin-malloc")
+FOREACH(flag ${pkg_CFLAGS})
+	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+	SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -Wall")
+
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
@@ -53,11 +63,13 @@ ADD_DEFINITIONS("-DNDEBUG")
 #ADD_DEFINITIONS("-D_ENABLE_MCHECK")
 ADD_DEFINITIONS("-DLOG_TAG=\"DATA_PROVIDER_SLAVE\"")
 ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET")
+#ADD_DEFINITIONS(${pkg_CFLAGS})
 
-ADD_DEFINITIONS(${pkg_CFLAGS})
+SET(EXTRA_LDFLAGS "-ldl")
+FOREACH(flag ${pkg_LDFLAGS})
+	SET(EXTRA_LDFLAGS "${EXTRA_LDFLAGS} ${flag}")
+ENDFOREACH(flag)
 
-# -fpie
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -g -fno-builtin-malloc")
 SET(CMAKE_EXE_LINKER_FLAGS)
 # "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
@@ -72,20 +84,19 @@ ADD_EXECUTABLE("${PROJECT_NAME}.loader"
 	src/client.c
 	src/critical_log.c
 )
+TARGET_LINK_LIBRARIES(${PROJECT_NAME}.loader "${EXTRA_LDFLAGS}")
 
 ADD_EXECUTABLE(${ICON_PROVIDER}
 	icon_src/main.c
 	icon_src/script_handler.c
 	src/util.c
 )
+TARGET_LINK_LIBRARIES(${ICON_PROVIDER} "${EXTRA_LDFLAGS}")
 
 ADD_EXECUTABLE(${EXE_LOADER}
 	stub/main.c
 )
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}.loader "${pkg_LDFLAGS} -ldl")
-TARGET_LINK_LIBRARIES(${ICON_PROVIDER} "${pkg_LDFLAGS} -ldl")
-TARGET_LINK_LIBRARIES(${EXE_LOADER} "${pkg_LDFLAGS} -ldl")
+TARGET_LINK_LIBRARIES(${EXE_LOADER} "${EXTRA_LDFLAGS}")
 
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-slave.desktop DESTINATION /usr/share/applications)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-slave.xml DESTINATION /usr/share/packages)
diff --git a/src/main.c b/src/main.c
index 480d0e6..9c029c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,7 @@
 #include <Eina.h>
 
 #include <system_settings.h>
+#include <app_service.h>
 
 #include <dlog.h>
 #include <bundle.h>
-- 
2.7.4