From 8f2f577cf2edcad5d6dd666c516bcdbf818a7784 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Sat, 3 Aug 2013 10:39:01 +0900 Subject: [PATCH] revise document --- CMakeLists.txt | 12 ++-- capi-network-nfc.pc.in | 2 +- include/nfc.h | 155 ++++++++++++++++++++++++---------------- include/nfc_private.h | 4 +- packaging/capi-network-nfc.spec | 8 ++- 5 files changed, 109 insertions(+), 72 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aadfd9..6407cce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,6 @@ SET(Services "system" ) - # project SET(project_prefix "capi") SET(prefix "/usr") @@ -44,7 +43,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") @@ -54,9 +53,10 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") + +SET(SOURCES src/nfc.c) -aux_source_directory(src SOURCES) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS}) @@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(TARGETS ${fw_name} DESTINATION lib) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/${service} FILES_MATCHING @@ -85,7 +85,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc @ONLY ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig) #ADD_SUBDIRECTORY(test) diff --git a/capi-network-nfc.pc.in b/capi-network-nfc.pc.in index 2b11cf6..8792e0a 100644 --- a/capi-network-nfc.pc.in +++ b/capi-network-nfc.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=@LIB_INSTALL_DIR@ +libdir=/usr/lib includedir=/usr/include/network Name: @PC_NAME@ diff --git a/include/nfc.h b/include/nfc.h index cc7977d..e077048 100755 --- a/include/nfc.h +++ b/include/nfc.h @@ -44,7 +44,7 @@ typedef enum { NFC_ERROR_INVALID_NDEF_MESSAGE = NFC_ERROR_CLASS | 0x02, /**< Invalid NDEF message */ NFC_ERROR_INVALID_RECORD_TYPE = NFC_ERROR_CLASS | 0x03, /**< Invalid record type*/ NFC_ERROR_TIMED_OUT = TIZEN_ERROR_TIMED_OUT, /**< Timeout error, no answer */ - NFC_ERROR_DEVICE_BUSY = TIZEN_ERROR_RESOURCE_BUSY, /**< Previous opertion is not finished still busy */ + NFC_ERROR_DEVICE_BUSY = TIZEN_ERROR_RESOURCE_BUSY, /**< Previous operation is not finished still busy */ NFC_ERROR_NO_DEVICE = NFC_ERROR_CLASS | 0x04, /**< no device */ NFC_ERROR_NOT_ACTIVATED = NFC_ERROR_CLASS | 0x05, /**< NFC is not activated */ NFC_ERROR_NOT_SUPPORTED = NFC_ERROR_CLASS | 0x06, /**< Not supported */ @@ -168,17 +168,15 @@ typedef enum{ NFC_SE_TYPE_UICC = 0x02 /**< UICC type card emulation */ } nfc_se_type_e; - - /** - * @brief Enumerations for NFC AC(Alternative Carrior) + * @brief Enumerations for NFC AC(Alternative Carrier) * @ingroup CAPI_NETWORK_NFC_P2P_MODULE */ typedef enum { NFC_AC_TYPE_BT = 0x00, /**< Bluetooth AC*/ NFC_AC_TYPE_WIFI, /** #include -#include +#include "nfc.h" typedef enum { @@ -75,4 +75,4 @@ typedef struct { int callback_type; } _async_callback_data; -#endif // __NET_NFC_PRIVATE_H__ +#endif // __NFC_PRIVATE_H__ diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec index b30e9a2..2daf719 100644 --- a/packaging/capi-network-nfc.spec +++ b/packaging/capi-network-nfc.spec @@ -1,7 +1,7 @@ #sbs-git:slp/api/nfc capi-network-nfc 0.0.1 14f15050f8f6ff8217421da04fa5d66e834e2016 Name: capi-network-nfc Summary: A NFC library in SLP C API -Version: 0.0.8 +Version: 0.0.18 Release: 0 Group: API/C API License: Apache-2.0 @@ -9,12 +9,14 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(nfc) BuildRequires: pkgconfig(nfc-common-lib) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(ecore-x) -BuildRequires: pkgconfig(capi-appfw-app-manager) +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig %description A NFC library in SLP C API. @@ -37,7 +39,7 @@ This package contains the development files for %{name}. %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} -- 2.7.4