Update CMakeLists.txt and spec files

Change-Id: I21b74f70a670b6609681bef924dacdd65d6aa85b
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b4a1b7..d28da8d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,19 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 # project
-SET(prefix "/usr")
 SET(maintainer "Jeongmo Yang<jm80.yang>, Hyuntae Kim<ht1211.kim@samsung.com>, Sejong Park<sejong123.park@samsung.com>")
-SET(description "A Camera library in Tizen Native API")
+SET(description "A Camera module for muse server")
 SET(service "mmsvc")
 SET(submodule "camera")
 SET(fw_name "${service}-${submodule}")
 
 PROJECT(${fw_name})
 
-SET(CMAKE_INSTALL_PREFIX ${prefix})
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(pc_dependents "dlog mm-common mused libtbm")
 
-SET(INC_DIR legacy/include)
-INCLUDE_DIRECTORIES(${INC_DIR})
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-
-IF("${ARCH}" STREQUAL "arm")
-    ADD_DEFINITIONS("-DTARGET")
-ENDIF("${ARCH}" STREQUAL "arm")
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+SET(PC_NAME ${fw_name})
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -lmuse-camera)
 
 CONFIGURE_FILE(
     ${fw_name}.pc.in

diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt
index 18c8017..2f3f762 100644 (file)
--- a/legacy/CMakeLists.txt
+++ b/legacy/CMakeLists.txt
@@ -5,7 +5,6 @@ SET(submodule "camera")
 
 # for package file
 SET(dependents "dlog audio-session-mgr mm-camcorder capi-base-common capi-media-tool gstreamer-1.0 libtbm evas ecore elementary vconf")
-SET(pc_dependents "mm-camcorder capi-base-common capi-media-tool gstreamer-1.0 libtbm evas ecore elementary")
 
 SET(fw_name "${service}-${submodule}")
 
@@ -63,6 +62,3 @@ INSTALL(
         PATTERN "${INC_DIR}/*.h"
         )
 
-SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${pc_dependents})
-SET(PC_LDFLAGS -l${fw_name})

diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index de31329..421953b
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -3,8 +3,8 @@ SET(service "muse")
 SET(submodule "camera")
 
 SET(dependents "dlog glib-2.0 mused mm-common libtbm")
-SET(pc_dependents "dlog mm-common mused")
 SET(fw_name "${service}-${submodule}")
+
 PROJECT(${fw_name})
 
 SET(CMAKE_INSTALL_PREFIX /usr)
@@ -13,15 +13,13 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-
-
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})
 FOREACH(flag ${${fw_name}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "-I./include ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
+SET(CMAKE_C_FLAGS "-I./include -I../legacy/include ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
 IF("${ARCH}" STREQUAL "arm")
@@ -43,7 +41,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 aux_source_directory(src MUSED_SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${MUSED_SOURCES})
 
-
 TARGET_LINK_LIBRARIES(${fw_name} legacy-camera ${${fw_name}_LDFLAGS})
 
 SET_TARGET_PROPERTIES(${fw_name}
@@ -61,7 +58,3 @@ INSTALL(
         PATTERN "${INC_DIR}/*.h"
         )
 
-SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${pc_dependents})
-SET(PC_LDFLAGS -l${fw_name})
-SET(PC_CFLAGS -I\${includedir}/media)

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 6f2afe8..bcc2300 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -2,10 +2,10 @@
 %bcond_with x
 
 Name:       mmsvc-camera
-Summary:    A Camera library in Tizen C API
+Summary:    A Camera module for muse server
 Version:    0.2.4
-Release:    0
-Group:      Multimedia/API
+Release:    1
+Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
@@ -33,20 +33,18 @@ Requires(postun): /sbin/ldconfig
 
 
 %description
-A Camera library in Tizen C API.
+A Camera module for muse server and native camera API.
 
 
 %package devel
-Summary:  A Camera library in Tizen C API (Development)
+Summary:  A Camera module for muse server (Development)
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(libtbm)
 Requires: pkgconfig(capi-media-tool)
 
 
 %description devel
-A Camera library in Tizen C API.
-
-Development related files.
+Development related files of a Camera module for muse server.
 
 
 %prep
@@ -90,10 +88,9 @@ cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 %{_libdir}/liblegacy-camera.so*
 %{_libdir}/libmuse-camera.so*
 %{_datadir}/license/%{name}
-%{_includedir}/media/legacy_camera.h
-%{_includedir}/media/legacy_camera_internal.h
 
 %files devel
-%{_includedir}/media/muse_camera.h
-%{_includedir}/media/muse_camera_msg.h
+%{_includedir}/media/*.h
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/liblegacy-camera.so
+%{_libdir}/libmuse-camera.so