Fix build breaks

Change-Id: I19a76544556b2b96522deece3e42f12cc1a03dc9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df5c0df..56bd6b2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,6 @@ SET(SRCS
        src/badge_internal.c
 )
 
-SET(SUBMODULES_SO
-       badge
-)
 SET(SUBMODULES_DEVEL
        badge
        badge-service
@@ -68,19 +65,22 @@ ADD_DEFINITIONS("-DDBDIR=\"${DBDIR}\"")
 ADD_DEFINITIONS("-DDBFILE=\"${DBFILE}\"")
 ADD_DEFINITIONS("-DBADGE_DB_PATH=\"${DBPATH}\"")
 
-FOREACH(lib_file ${SUBMODULES_SO})
-       ADD_LIBRARY(${lib_file} SHARED ${SRCS})
-       TARGET_LINK_LIBRARIES(${lib_file} ${pkgs_LDFLAGS})
-       SET_TARGET_PROPERTIES(${lib_file} PROPERTIES SOVERSION ${VERSION_MAJOR})
-       SET_TARGET_PROPERTIES(${lib_file} PROPERTIES VERSION ${VERSION})
-       INSTALL(TARGETS ${lib_file} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
-ENDFOREACH(lib_file)
-
-FOREACH(pcfile ${SUBMODULES_DEVEL})
-       CONFIGURE_FILE(${pcfile}.pc.in ${pcfile}.pc @ONLY)
-       SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${pcfile}.pc")
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-ENDFOREACH(pcfile)
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
+
+MESSAGE(${LIB_INSTALL_DIR} ====)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+
+CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+CONFIGURE_FILE("${PROJECT_NAME}-service.pc.in" "${PROJECT_NAME}-service.pc" @ONLY)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}-service.pc")
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${INSTALL_HEADERS_DEVEL})
        INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/${hfile} DESTINATION include/${PROJECT_NAME})

diff --git a/packaging/badge.spec b/packaging/badge.spec
index f2b3f94..014d331 100755 (executable)
--- a/packaging/badge.spec
+++ b/packaging/badge.spec
@@ -51,7 +51,7 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+LDFLAGS="$LDFLAGS" %cmake .
 make %{?jobs:-j%jobs}
 
 %install