Exclude storage dependency for VD

 - Remove unnecessary parts
 - Revise the same flag name of the cmake and source file

Change-Id: I1df397e258c932b1b8c3df16e26ec1999e3eb474

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e90b65..9ed5bdb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,15 +22,18 @@ SET(pc_dependents
 
 IF(${MUSE_REGISTER_VIP})
 SET(dependents ${dependents} " libresourced")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMUSE_VIP_REGISTERED")
 ENDIF(${MUSE_REGISTER_VIP})
 
-IF(${MUSE_USE_LWIPC})
+IF(${MUSE_LWIPC_ENABLE})
 SET(dependents ${dependents} " lwipc")
-ENDIF(${MUSE_USE_LWIPC})
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMUSE_USE_LWIPC")
+ENDIF(${MUSE_LWIPC_ENABLE})
 
-IF(${MUSE_TTRACE_LOG})
+IF(${MUSE_TTRACE_ENABLE})
 SET(dependents ${dependents} " ttrace")
-ENDIF(${MUSE_TTRACE_LOG})
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMUSE_TTRACE_LOG")
+ENDIF(${MUSE_TTRACE_ENABLE})
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${MUSE_CORE} REQUIRED ${dependents})

diff --git a/packaging/mused.spec b/packaging/mused.spec
index acd1bb0..6a719ac 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -29,12 +29,12 @@ BuildRequires: pkgconfig(json-c)
 BuildRequires: pkgconfig(libtbm)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(mm-common)
-BuildRequires: pkgconfig(storage)
 %if "%{tizen_profile_name}" == "tv"
 BuildRequires: pkgconfig(libresourced)
 BuildRequires: pkgconfig(lwipc)
 BuildRequires: pkgconfig(ttrace)
 %else
+BuildRequires: pkgconfig(storage)
 BuildRequires: pkgconfig(mm-resource-manager)
 %endif
 %if 0%{?gtests:1}
@@ -80,11 +80,10 @@ export LDFLAGS+=" -lgcov "
 %endif
 
 %if ("%{_vd_cfg_product_type}" == "AUDIO") || ("%{_vd_cfg_product_type}" == "TV") || ("%{_vd_cfg_product_type}" == "LFD") || ("%{_vd_cfg_product_type}" == "HTV") || ("%{_vd_cfg_product_type}" == "AV") || ("%{_vd_cfg_product_type}" == "IWB") || ("%{_vd_cfg_product_type}" == "WALL")
-export CFLAGS+=" -DMUSE_REGISTER_VIP -DMUSE_USE_LWIPC -DMUSE_TTRACE_LOG"
-%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_REGISTER_VIP=1 -DMUSE_TTRACE_LOG=1 -DMUSE_USE_LWIPC=1
+%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_REGISTER_VIP=1 -DMUSE_TTRACE_ENABLE=1 -DMUSE_LWIPC_ENABLE=1
 %else
-export CFLAGS+=" -DMUSE_USE_POWER_OFF_STATE_CHANGE -DMUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE -DMUSE_USE_WATCHDOG"
-%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_GTESTS_BUILD=%{?gtests:1}%{!?gtests:0}
+export CFLAGS+=" -DMUSE_USE_POWER_OFF_STATE_CHANGE -DMUSE_USE_WATCHDOG"
+%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_GTESTS_BUILD=%{?gtests:1}%{!?gtests:0} -DMUSE_STORAGE_ENABLE=1
 %endif
 
 make %{?jobs:-j%jobs}

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index b0577cc..b55d968 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -26,15 +26,15 @@ SET(dependents
     gstreamer-base-1.0
     iniparser
     libtbm
-    storage
     libtzplatform-config
     libsystemd)
 
 SET(pc_dependents "gio-2.0 mm-common libtbm")
 
-IF(MUSE_USE_RM_READY)
-SET(dependents ${dependents} " mm-resource-manager")
-ENDIF(MUSE_USE_RM_READY)
+IF(${MUSE_STORAGE_ENABLE})
+SET(dependents ${dependents} " storage")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE")
+ENDIF(${MUSE_STORAGE_ENABLE})
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${MUSE_SERVER} REQUIRED ${dependents})

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index cd286da..45db8b3 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -35,7 +35,7 @@
 #endif
 
 
-#ifdef MUSE_REGISTER_VIP
+#ifdef MUSE_VIP_REGISTERED
 #include <proc_stat.h>
 #endif
 
@@ -1010,7 +1010,7 @@ void ms_init(char **argv)
        else
                _ms_launch_foreground();
 
-#ifdef MUSE_REGISTER_VIP
+#ifdef MUSE_VIP_REGISTERED
        proc_stat_set_vip_process();
 #endif
 

diff --git a/server/src/muse_server_system.c b/server/src/muse_server_system.c
index bb88252..581aff6 100644 (file)
--- a/server/src/muse_server_system.c
+++ b/server/src/muse_server_system.c
@@ -20,12 +20,15 @@
  */
 
 #include "muse_server_private.h"
-#include <storage.h>
 #include <system_info.h>
 #include <runtime_info.h>
 #include <malloc.h>
 
+#ifdef MUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE
+#include <storage.h>
+
 #define MUSE_STORAGE_EXTERNAL_FEATURE          "http://tizen.org/feature/storage.external"
+#endif
 
 #define MUSE_STAT_CHECK_COUNT                          3
 #define MUSE_STAT_TIMER_PERIOD                         1