Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/heap-monitor...

Conflicts:
	CMakeLists.txt
	packaging/libheap-monitor.spec

Change-Id: Idca5571207e866602a63cfa49e3c870120473287

diff --cc CMakeLists.txt
index b3b92ea,78549d7..3c0600e
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -13,18 -13,9 +13,8 @@@ set(CMAKE_SKIP_BUILD_RPATH true
  
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
  
- INCLUDE(FindPkgConfig)
- pkg_check_modules(pkgs REQUIRED
-       dlog
- )
- 
- FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
- ENDFOREACH(flag)
- 
- SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -fno-builtin-malloc -O3 -g")
 -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -fno-builtin-malloc -O3 -g -Wno-error=deprecated-declarations")
--
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
++SET(EXTRA_CFLAGS "-fvisibility=hidden -Wall -fno-builtin-malloc -O3 -g")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wno-error=deprecated-declarations")
  
  ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
  ADD_DEFINITIONS("-DNDEBUG")

diff --cc packaging/libheap-monitor.spec
index f928265,62f162f..3eaeeb1
--- 1/packaging/libheap-monitor.spec
--- 2/packaging/libheap-monitor.spec
+++ b/packaging/libheap-monitor.spec
@@@ -5,9 -5,7 +5,8 @@@ Release: 
  Group: HomeTF/Livebox
  License: Flora License
  Source0: %{name}-%{version}.tar.gz
 +Source1001:   libheap-monitor.manifest
  BuildRequires: cmake, gettext-tools, coreutils
- BuildRequires: pkgconfig(dlog)
  
  %description
  Monitoring the heap usage to manage them safely.
@@@ -22,13 -20,18 +21,18 @@@ Monitoring the heap usage to manage the
  
  %prep
  %setup -q
 +cp %{SOURCE1001} .
  
  %build
- %cmake .
- CFLAGS+="${CFLAGS} -fvisibility=hidden -Wall -fno-builtin-malloc" make %{?jobs:-j%jobs}
+ %if 0%{?tizen_build_binary_release_type_eng}
+ export CFLAGS="${CFLAGS} -DTIZEN_ENGINEER_MODE"
+ export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
+ export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
+ %endif
 -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
++%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+ CFLAGS+="${CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -fno-builtin-malloc" make %{?jobs:-j%jobs}
  
  %install
 -rm -rf %{buildroot}
  %make_install
  mkdir -p %{buildroot}/%{_datarootdir}/license