Fix build error and manage the invalid package config file of libraries

Change-Id: Id0a25b33660911e7b47ad075a9a9ffbbdb4e150b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a590a14..74aba81 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@ PROJECT(data-provider-slave C)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkg REQUIRED
+       dlog
        capi-appfw-application
        capi-appfw-app-manager
-       dlog
        aul
        vconf
        sqlite3
@@ -172,10 +172,13 @@ IF (SERVICE_APP_ENABLED)
 ENDIF (SERVICE_APP_ENABLED)
 ENDIF (X11_SUPPORT)
 
+STRING(REPLACE "-L-l" "-l" pkg_fixed_LDFLAGS ${pkg_LDFLAGS})
+STRING(REPLACE "-l" " -l" pkg_LDFLAGS ${pkg_fixed_LDFLAGS})
+
 ADD_EXECUTABLE("${PROJECT_NAME}"
        ${BUILD_SOURCE}
 )
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} "-ldl -pie" ${pkg_extra_LDFLAGS} ${pkg_LDFLAGS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} "-ldl -pie ${pkg_LDFLAGS}" ${pkg_extra_LDFLAGS})
 
 IF (SERVICE_APP_ENABLED)
 ADD_EXECUTABLE(${SVC_PROVIDER}
@@ -189,7 +192,7 @@ ADD_EXECUTABLE(${ICON_PROVIDER}
        icon_src/script_handler.c
        src/util.c
 )
-TARGET_LINK_LIBRARIES(${ICON_PROVIDER} "-ldl -pie" ${pkg_extra_LDFLAGS} ${pkg_LDFLAGS})
+TARGET_LINK_LIBRARIES(${ICON_PROVIDER} "-ldl -pie ${pkg_LDFLAGS}" ${pkg_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/icon_src/main.c b/icon_src/main.c
index 4a7cf72..9230fca 100644 (file)
--- a/icon_src/main.c
+++ b/icon_src/main.c
@@ -47,7 +47,6 @@
 #include <com-core_packet.h>
 
 #include <shortcut.h>
-#include <shortcut_private.h>
 
 #include "util.h"
 #include "debug.h"

diff --git a/src/util.c b/src/util.c
index 20ed817..97163bf 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -115,7 +115,7 @@ HAPI char *util_get_current_module(char **symbol)
        char *ret;
        pthread_attr_t attr;
        unsigned long stack_boundary = 0;
-       unsigned int stack_size = 0;
+       size_t stack_size = 0;
        register int i;
 
        if (!pthread_getattr_np(pthread_self(), &attr)) {