Add to check installed libraries of libbmp, libnsbmp and libpng and replace the heade...

Change-Id: Iee6ec8819f16d47020545b3b417ae29d6a86a224

diff --git a/bmp/CMakeLists.txt b/bmp/CMakeLists.txt
index 053b0c1..6b01e6e 100755 (executable)
--- a/bmp/CMakeLists.txt
+++ b/bmp/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES(${INC_DIR}
        ../common/include
        )
 
-SET(dependents "dlog glib-2.0")
+SET(dependents "dlog glib-2.0 libbmp libnsbmp")
 SET(pc_dependents "dlog capi-base-common")
 
 INCLUDE(FindPkgConfig)
@@ -39,7 +39,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(. SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
-TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} bmp nsbmp)
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 SET_TARGET_PROPERTIES(${fw_name}
        PROPERTIES
        VERSION ${VERSION}

diff --git a/bmp/include/mm_util_bmp.h b/bmp/include/mm_util_bmp.h
index 648528f..edd6b92 100755 (executable)
--- a/bmp/include/mm_util_bmp.h
+++ b/bmp/include/mm_util_bmp.h
@@ -26,8 +26,6 @@
 extern "C" {
 #endif
 #include "mm_util_type.h"
-#include "libnsbmp.h"
-#include "bmpfile.h"
 
 /**
     @addtogroup UTILITY

diff --git a/bmp/mm_util_bmp.c b/bmp/mm_util_bmp.c
index 2c51412..64d2ed5 100755 (executable)
--- a/bmp/mm_util_bmp.c
+++ b/bmp/mm_util_bmp.c
@@ -23,6 +23,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <libnsbmp.h>
+#include <bmpfile.h>
+
 #include "mm_util_bmp.h"
 #include "mm_util_private.h"
 

diff --git a/imgp/CMakeLists.txt b/imgp/CMakeLists.txt
index ed007d2..d52b101 100755 (executable)
--- a/imgp/CMakeLists.txt
+++ b/imgp/CMakeLists.txt
@@ -39,7 +39,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(. SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
-TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} bmp nsbmp)
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 SET_TARGET_PROPERTIES(${fw_name}
        PROPERTIES
        VERSION ${VERSION}

diff --git a/magick/CMakeLists.txt b/magick/CMakeLists.txt
index 932d2a8..38bb206 100755 (executable)
--- a/magick/CMakeLists.txt
+++ b/magick/CMakeLists.txt
@@ -39,7 +39,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(. SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
-TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} bmp nsbmp)
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 SET_TARGET_PROPERTIES(${fw_name}
        PROPERTIES
        VERSION ${VERSION}

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 4a315a5..02c301f 100755 (executable)
--- a/packaging/libmm-utility.spec
+++ b/packaging/libmm-utility.spec
@@ -1,6 +1,6 @@
 Name:       libmm-utility
 Summary:    Multimedia Framework Utility Library
-Version:    0.1.8
+Version:    0.1.9
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -18,10 +18,10 @@ BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(opencv)
-BuildRequires:  libpng-devel
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  giflib-devel
-BuildRequires:  libbmp-devel
-BuildRequires:  libnsbmp-devel
+BuildRequires:  pkgconfig(libbmp)
+BuildRequires:  pkgconfig(libnsbmp)
 BuildRequires:  pkgconfig(GraphicsMagick)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 

diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt
index a0d9953..74f4c88 100755 (executable)
--- a/png/CMakeLists.txt
+++ b/png/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES(${INC_DIR}
        ../common/include
        )
 
-SET(dependents "dlog glib-2.0")
+SET(dependents "dlog glib-2.0 libpng")
 SET(pc_dependents "dlog capi-base-common")
 
 INCLUDE(FindPkgConfig)
@@ -39,7 +39,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(. SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
-TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} png)
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 SET_TARGET_PROPERTIES(${fw_name}
        PROPERTIES
        VERSION ${VERSION}