Update pc file & cmake, spec files

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I12fff02745973d2638f50975afd554bcc2cc4a8c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91e0999..954b639 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,3 +2,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ADD_SUBDIRECTORY(dynamicbox_viewer)
 ADD_SUBDIRECTORY(livebox-viewer)
+
+ADD_DEPENDENCIES(livebox-viewer dynamicbox_viewer)

diff --git a/dynamicbox_viewer/CMakeLists.txt b/dynamicbox_viewer/CMakeLists.txt
index 623225b..ed8efa1 100644 (file)
--- a/dynamicbox_viewer/CMakeLists.txt
+++ b/dynamicbox_viewer/CMakeLists.txt
@@ -6,8 +6,8 @@ SET(EXEC_PREFIX "\${prefix}")
 SET(PROJECT_NAME "${PROJECT_NAME}")
 SET(LIBDIR "\${exec_prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.0.1")
+SET(VERSION_MAJOR 1)
+SET(VERSION "${VERSION_MAJOR}.0.0")
 
 SET(CMAKE_SKIP_BUILD_RPATH true)
 

diff --git a/livebox-viewer/CMakeLists.txt b/livebox-viewer/CMakeLists.txt
index c6f5c37..16bc5e3 100644 (file)
--- a/livebox-viewer/CMakeLists.txt
+++ b/livebox-viewer/CMakeLists.txt
@@ -6,15 +6,15 @@ SET(EXEC_PREFIX "\${prefix}")
 SET(PROJECT_NAME "${PROJECT_NAME}")
 SET(LIBDIR "\${exec_prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.0.1")
+SET(VERSION_MAJOR 1)
+SET(VERSION "${VERSION_MAJOR}.0.0")
 
 SET(CMAKE_SKIP_BUILD_RPATH true)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(lb_pkgs REQUIRED
+pkg_check_modules(pkgs REQUIRED
        dlog
        aul
        glib-2.0
@@ -22,15 +22,15 @@ pkg_check_modules(lb_pkgs REQUIRED
        com-core
        sqlite3
        db-util
-       vconf
        livebox-service
+       vconf
 )
 
 SET(BUILD_SOURCE
        src/livebox.c
 )
 
-FOREACH(flag ${lb_pkgs_CFLAGS})
+FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
@@ -42,7 +42,7 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${BUILD_SOURCE})
 
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${lb_pkgs_LDFLAGS} "-lpthread")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-lpthread")
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
@@ -51,3 +51,5 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/livebox.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}")
+
+# End of a file

diff --git a/livebox-viewer/livebox-viewer.pc.in b/livebox-viewer/livebox-viewer.pc.in
index 06f4891..0b0cfa0 100644 (file)
--- a/livebox-viewer/livebox-viewer.pc.in
+++ b/livebox-viewer/livebox-viewer.pc.in
@@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@
 Name: livebox-viewer
 Description: livebox supporting library
 Version: @VERSION@
-Libs: -L${libdir} -llivebox-viewer
+Libs: -L${libdir} -llivebox-viewer -ldynamicbox_viewer
 Cflags: -I${includedir}
 cppflags: -I${includedir}

diff --git a/livebox-viewer/src/livebox.c b/livebox-viewer/src/livebox.c
index 977f405..f6c19d6 100644 (file)
--- a/livebox-viewer/src/livebox.c
+++ b/livebox-viewer/src/livebox.c
@@ -1,28 +1,10 @@
 #include <stdio.h>
 
 #include <livebox-service.h>
+#include <livebox-errno.h>
 
 #include "livebox.h"
 
-enum livebox_status {
-       LB_STATUS_SUCCESS = 0x00000000, /**< Operation is successfully completed */
-       LB_STATUS_ERROR = 0x80000000, /**< This will be OR'd with other specific error value */
-       LB_STATUS_ERROR_INVALID = LB_STATUS_ERROR | 0x0001, /**< Invalid request */
-       LB_STATUS_ERROR_FAULT = LB_STATUS_ERROR | 0x0002, /**< Fault - Unable to recover from the error */
-       LB_STATUS_ERROR_MEMORY = LB_STATUS_ERROR | 0x0004, /**< Memory is not enough to do this operation */
-       LB_STATUS_ERROR_EXIST = LB_STATUS_ERROR | 0x0008, /**< Already exists */
-       LB_STATUS_ERROR_BUSY = LB_STATUS_ERROR | 0x0010, /**< Busy so the operation is not started(accepted), try again */
-       LB_STATUS_ERROR_PERMISSION = LB_STATUS_ERROR | 0x0020, /**< Permission error */
-       LB_STATUS_ERROR_ALREADY = LB_STATUS_ERROR | 0x0040, /**< Operation is already started */
-       LB_STATUS_ERROR_CANCEL = LB_STATUS_ERROR | 0x0080, /**< Operation is canceled */
-       LB_STATUS_ERROR_IO = LB_STATUS_ERROR | 0x0100, /**< I/O Error */
-       LB_STATUS_ERROR_NOT_EXIST = LB_STATUS_ERROR | 0x0200, /**< Not exists */
-       LB_STATUS_ERROR_TIMEOUT = LB_STATUS_ERROR | 0x0400, /**< Timeout */
-       LB_STATUS_ERROR_NOT_IMPLEMENTED = LB_STATUS_ERROR | 0x0800, /**< Operation is not implemented */
-       LB_STATUS_ERROR_NO_SPACE = LB_STATUS_ERROR | 0x1000, /**< No space to operate */
-       LB_STATUS_ERROR_DISABLED = LB_STATUS_ERROR | 0x2000 /**< Disabled */
-};
-
 enum lb_type { /*!< Must have to be sync with data-provider-master */
        _LB_TYPE_NONE = 0x0,
        _LB_TYPE_SCRIPT,

diff --git a/packaging/libdynamicbox_viewer.spec b/packaging/libdynamicbox_viewer.spec
index c69af89..b73bb74 100644 (file)
--- a/packaging/libdynamicbox_viewer.spec
+++ b/packaging/libdynamicbox_viewer.spec
@@ -16,9 +16,9 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(com-core)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(db-util)
+BuildRequires: pkgconfig(livebox-service)
 BuildRequires: pkgconfig(dynamicbox_service)
 BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(livebox-service)
 
 %if %{with wayland}
 %else
@@ -118,4 +118,5 @@ Dynamicbox provider application development library (dev) (old version)
 %defattr(-,root,root,-)
 %{_includedir}/livebox-viewer/livebox.h
 %{_libdir}/pkgconfig/livebox-viewer.pc
+
 # End of a file