Build again

Change-Id: Ib5e750f01aa494b1abad9fb4df98fb6c6dbbddf1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73b746f..23ca456 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,56 +27,6 @@ pkg_check_modules(pkg REQUIRED
        shortcut
 )
 
-pkg_check_modules(icon REQUIRED
-       capi-appfw-application
-       capi-appfw-app-manager
-       ail
-       dlog
-       aul
-       vconf
-       sqlite3
-       db-util
-       glib-2.0
-       gio-2.0
-       bundle
-       ecore-x
-       ecore
-       provider
-       livebox-service
-       edje
-       evas
-       livebox
-       elementary
-       capi-system-system-settings
-       com-core
-       shortcut
-)
-
-pkg_check_modules(stub REQUIRED
-       capi-appfw-application
-       capi-appfw-app-manager
-       ail
-       dlog
-       aul
-       vconf
-       sqlite3
-       db-util
-       glib-2.0
-       gio-2.0
-       bundle
-       ecore-x
-       ecore
-       provider
-       livebox-service
-       edje
-       evas
-       livebox
-       elementary
-       capi-system-system-settings
-       com-core
-       shortcut
-)
-
 SET(PACKAGE "${PROJECT_NAME}")
 SET(LOCALEDIR "/usr/apps/org.tizen.${PROJECT_NAME}/res/locale")
 SET(ICON_PROVIDER "icon-provider-slave")
@@ -106,7 +56,8 @@ ADD_DEFINITIONS(${pkg_CFLAGS})
 
 # -fpie
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -g -fno-builtin-malloc")
-#SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+SET(CMAKE_EXE_LINKER_FLAGS)
+# "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
 ADD_EXECUTABLE("${PROJECT_NAME}.loader"
        src/main.c
@@ -119,19 +70,20 @@ ADD_EXECUTABLE("${PROJECT_NAME}.loader"
        src/client.c
        src/critical_log.c
 )
-TARGET_LINK_LIBRARIES("${PROJECT_NAME}.loader" ${pkg_LDFLAGS} "-ldl")
 
 ADD_EXECUTABLE(${ICON_PROVIDER}
        icon_src/main.c
        icon_src/script_handler.c
        src/util.c
 )
-TARGET_LINK_LIBRARIES(${ICON_PROVIDER} ${icon_LDFLAGS} "-ldl -levas")
 
 ADD_EXECUTABLE(${EXE_LOADER}
        stub/main.c
 )
-TARGET_LINK_LIBRARIES(${EXE_LOADER} ${stub_LDFLAGS} "-ldl -levas")
+
+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")
 
 #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/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 49fdd13..7acdada 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -50,9 +50,8 @@ export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
 export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
 %endif
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-#-fpie  LDFLAGS="${LDFLAGS} -pie -O3"
-CFLAGS="${CFLAGS} -Wall -Winline -fno-builtin-malloc" make %{?jobs:-j%jobs}
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}