Apply CMake 19/161719/5
authorJiyong Min <jiyong.min@samsung.com>
Mon, 27 Nov 2017 06:20:37 +0000 (15:20 +0900)
committerhj kim <backto.kim@samsung.com>
Mon, 27 Nov 2017 08:07:45 +0000 (08:07 +0000)
Change-Id: If83b3416c06d22f5df1935e7e4a12cf02814f2e2
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
30 files changed:
CMakeLists.txt [new file with mode: 0755]
Makefile.am [deleted file]
bmp/Makefile.am [deleted file]
bmp/mmutil-bmp.pc.in
bmp/test/CMakeLists.txt [new file with mode: 0755]
bmp/test/Makefile.am [deleted file]
configure.ac [deleted file]
gif/Makefile.am [deleted file]
gif/mmutil-gif.pc.in
gif/test/CMakeLists.txt [new file with mode: 0755]
gif/test/Makefile.am [deleted file]
imgcv/Makefile.am [deleted file]
imgcv/mmutil-imgcv.pc.in
imgcv/test/CMakeLists.txt [new file with mode: 0755]
imgcv/test/Makefile.am [deleted file]
imgp/Makefile.am [deleted file]
imgp/mm_util_imgp.c
imgp/mmutil-imgp.pc.in
imgp/test/CMakeLists.txt [new file with mode: 0755]
imgp/test/Makefile.am [deleted file]
jpeg/Makefile.am [deleted file]
jpeg/mm_util_jpeg.c
jpeg/mmutil-jpeg.pc.in
jpeg/test/CMakeLists.txt [new file with mode: 0755]
jpeg/test/Makefile.am [deleted file]
packaging/libmm-utility.spec
png/Makefile.am [deleted file]
png/mmutil-png.pc.in
png/test/CMakeLists.txt [new file with mode: 0755]
png/test/Makefile.am [deleted file]

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..50082c7
--- /dev/null
@@ -0,0 +1,134 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(mm-utility C)
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+
+SET(BMP-LIB "mmutil_bmp")
+SET(GIF-LIB "mmutil_gif")
+SET(IMGCV-LIB "mmutil_imgcv")
+SET(IMGP-LIB "mmutil_imgp")
+SET(JPEG-LIB "mmutil_jpeg")
+SET(PNG-LIB "mmutil_png")
+
+SET(BMP_SRCS bmp/mm_util_bmp.c)
+SET(GIF_SRCS gif/mm_util_gif.c)
+SET(IMGCV_SRCS imgcv/mm_util_imgcv.c)
+SET(IMGP_SRCS imgp/mm_util_imgp.c)
+SET(JPEG_SRCS jpeg/mm_util_jpeg.c)
+SET(PNG_SRCS png/mm_util_png.c)
+
+SET(VENDOR "samsung")
+SET(PACKAGE ${PROJECT_NAME})
+SET(PKGNAME "com.${VENDOR}.${PACKAGE}")
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(BINDIR "${PREFIX}/bin")
+SET(DATADIR "${PREFIX}/share")
+SET(EXEC_PREFIX "\${prefix}")
+SET(LIBDIR "\${prefix}/lib")
+SET(INCLUDEDIR "\${prefix}/include")
+
+IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+       SET(CMAKE_BUILD_TYPE "Release")
+ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
+MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
+
+SET(INC_DIR
+       bmp/include
+       common/include
+       gif/include
+       imgcv/include
+       imgp/include
+       jpeg/include
+       png/include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR})
+
+FIND_PROGRAM(UNAME NAMES uname)
+EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(pkgs REQUIRED dlog glib-2.0 gio-2.0 gmodule-2.0 libtzplatform-config opencv)
+
+FOREACH(flag ${pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC")
+
+IF("${ARCH}" STREQUAL "arm")
+       ADD_DEFINITIONS("-DTARGET")
+       MESSAGE("add -DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DVENDOR=\"${VENDOR}\"")
+ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
+ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"")
+ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
+ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIBDIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both")
+CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/imgp/mmutil-imgp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/imgp/mmutil-imgp.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/jpeg/mmutil-jpeg.pc.in ${CMAKE_CURRENT_BINARY_DIR}/jpeg/mmutil-jpeg.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/imgcv/mmutil-imgcv.pc.in ${CMAKE_CURRENT_BINARY_DIR}/imgcv/mmutil-imgcv.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/bmp/mmutil-bmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bmp/mmutil-bmp.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/gif/mmutil-gif.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gif/mmutil-gif.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/png/mmutil-png.pc.in ${CMAKE_CURRENT_BINARY_DIR}/png/mmutil-png.pc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgp/mmutil-imgp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jpeg/mmutil-jpeg.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgcv/mmutil-imgcv.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bmp/mmutil-bmp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gif/mmutil-gif.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/png/mmutil-png.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(bmp/test)
+ADD_SUBDIRECTORY(gif/test)
+ADD_SUBDIRECTORY(imgcv/test)
+ADD_SUBDIRECTORY(imgp/test)
+ADD_SUBDIRECTORY(jpeg/test)
+ADD_SUBDIRECTORY(png/test)
+
+LINK_DIRECTORIES(${LIB_INSTALL_DIR})
+
+ADD_LIBRARY(${IMGP-LIB} SHARED ${IMGP_SRCS})
+TARGET_LINK_LIBRARIES(${IMGP-LIB} ${pkgs_LDFLAGS})
+SET_TARGET_PROPERTIES(${IMGP-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${IMGP-LIB} PROPERTIES VERSION ${VERSION})
+ADD_LIBRARY(${JPEG-LIB} SHARED ${JPEG_SRCS})
+TARGET_LINK_LIBRARIES(${JPEG-LIB} ${pkgs_LDFLAGS} ${IMGP-LIB} jpeg turbojpeg)
+SET_TARGET_PROPERTIES(${JPEG-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${JPEG-LIB} PROPERTIES VERSION ${VERSION})
+ADD_LIBRARY(${IMGCV-LIB} SHARED ${IMGCV_SRCS})
+TARGET_LINK_LIBRARIES(${IMGCV-LIB} ${pkgs_LDFLAGS})
+SET_TARGET_PROPERTIES(${IMGCV-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${IMGCV-LIB} PROPERTIES VERSION ${VERSION})
+ADD_LIBRARY(${BMP-LIB} SHARED ${BMP_SRCS})
+TARGET_LINK_LIBRARIES(${BMP-LIB} ${pkgs_LDFLAGS} bmp nsbmp)
+SET_TARGET_PROPERTIES(${BMP-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${BMP-LIB} PROPERTIES VERSION ${VERSION})
+ADD_LIBRARY(${GIF-LIB} SHARED ${GIF_SRCS})
+TARGET_LINK_LIBRARIES(${GIF-LIB} ${pkgs_LDFLAGS} gif)
+SET_TARGET_PROPERTIES(${GIF-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${GIF-LIB} PROPERTIES VERSION ${VERSION})
+ADD_LIBRARY(${PNG-LIB} SHARED ${PNG_SRCS})
+TARGET_LINK_LIBRARIES(${PNG-LIB} ${pkgs_LDFLAGS} png)
+SET_TARGET_PROPERTIES(${PNG-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${PNG-LIB} PROPERTIES VERSION ${VERSION})
+
+INSTALL(TARGETS ${IMGP-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${JPEG-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${IMGCV-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${BMP-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${GIF-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${PNG-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+
+INSTALL(FILES bmp/include/mm_util_bmp.h DESTINATION include/mmf)
+INSTALL(FILES common/include/mm_util_type.h DESTINATION include/mmf)
+INSTALL(FILES gif/include/mm_util_gif.h DESTINATION include/mmf)
+INSTALL(FILES imgcv/include/mm_util_imgcv.h DESTINATION include/mmf)
+INSTALL(FILES imgp/include/mm_util_imgp.h DESTINATION include/mmf)
+INSTALL(FILES jpeg/include/mm_util_jpeg.h DESTINATION include/mmf)
+INSTALL(FILES png/include/mm_util_png.h DESTINATION include/mmf)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100755 (executable)
index 51cf6a7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-ACLOCAL_AMFLAGS = -I m4
-
-#aclocaldir = $(datadir)/aclocal
-
-SUBDIRS = \
-       imgp \
-       jpeg \
-       imgcv \
-        png \
-        gif \
-        bmp
-
-DIST_SUBDIRS = \
-       imgp \
-       jpeg \
-       imgcv \
-        png \
-        gif \
-        bmp
-
-EXTRA_DIST = \
-       configure.ac autogen.sh depcomp
-
-check: check-exports
-
diff --git a/bmp/Makefile.am b/bmp/Makefile.am
deleted file mode 100755 (executable)
index ec8764b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-ACLOCAL_AMFLAGS='-I m4'
-
-lib_LTLIBRARIES = libmmutil_bmp.la
-
-installmmutil_bmpdir = $(includedir)/mmf
-installmmutil_bmp_HEADERS = include/mm_util_bmp.h \
-                            ../common/include/mm_util_type.h
-
-libmmutil_bmp_la_SOURCES = mm_util_bmp.c
-
-libmmutil_bmp_la_CFLAGS = -I$(srcdir)/include \
-                               -I$(srcdir)/../common/include \
-                               $(DLOG_CFLAGS) \
-                               $(GLIB_CFLAGS)
-
-libmmutil_bmp_la_LIBADD = $(GLIB_LIBS) -lnsbmp -lbmp -ldl \
-                               $(DLOG_LIBS) \
-                               $(GMODULE_LIBS)
-
-libmmutil_bmp_la_CFLAGS += -DLIBPREFIX=\"$(libdir)\"
-
-libmmutil_bmp_la_DEPENDENCIES = $(srcdir)/../imgp/libmmutil_imgp.la
-
-pcfiles = mmutil-bmp.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
-SUBDIRS = . test
index 38cb6a2..b69e0a3 100644 (file)
@@ -1,7 +1,7 @@
-prefix = @prefix@
-exec_prefix=@exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
 
 Name : mmutil-bmp
 Description : Multimedia Framework Utility Library
diff --git a/bmp/test/CMakeLists.txt b/bmp/test/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..4e3f1f7
--- /dev/null
@@ -0,0 +1,18 @@
+SET(fw_name "mmutil_bmp")
+SET(fw_test "${fw_name}-test")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog)
+FOREACH(flag ${${fw_test}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+
+aux_source_directory(. sources)
+FOREACH(src ${sources})
+    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+    MESSAGE("${src_name}")
+    ADD_EXECUTABLE(${src_name} ${src})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
+ENDFOREACH()
diff --git a/bmp/test/Makefile.am b/bmp/test/Makefile.am
deleted file mode 100755 (executable)
index f2e6b90..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-bin_PROGRAMS = mm_util_bmp_testsuite
-
-mm_util_bmp_testsuite_SOURCES = mm_util_bmp_testsuite.c
-
-mm_util_bmp_testsuite_CFLAGS = -I$(srcdir)/../include \
-                               -I$(srcdir)/../../common/include
-mm_util_bmp_testsuite_CFLAGS += $(TZ_PLATFORM_CONFIG_FLAGS) \
-                                -fPIE -pie
-
-
-############################################
-
-mm_util_bmp_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_bmp.la
-
-mm_util_bmp_testsuite_LDADD = $(srcdir)/../libmmutil_bmp.la
-mm_util_bmp_testsuite_LDADD += $(TZ_PLATFORM_CONFIG_LIBS)
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100755 (executable)
index f381ad2..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT([libmm-utility],[0.1])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-
-# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AM_PROG_CC_C_O
-
-# Checks for libraries.
-# FIXME: Replace `main' with a function in `-liniparser':
-# AC_CHECK_LIB([iniparser], [main])
-# FIXME: Replace `main' with a function in `-ljpeg':
-# AC_CHECK_LIB([jpeg], [main])
-# FIXME: Replace `main' with a function in `-lrt':
-# AC_CHECK_LIB([rt], [main])
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_STRUCT_TM
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([memset strdup])
-
-PKG_CHECK_MODULES(DLOG, dlog)
-AC_SUBST(DLOG_CFLAGS)
-AC_SUBST(DLOG_LIBS)
-
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(GIO, gio-2.0)
-AC_SUBST(GIO_CFLAGS)
-AC_SUBST(GIO_LIBS)
-
-PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
-
-PKG_CHECK_MODULES(OPENCV, opencv)
-AC_SUBST(OPENCV_CFLAGS)
-AC_SUBST(OPENCV_LIBS)
-
-#tz-platform-config lib
-PKG_CHECK_MODULES(TZ_PLATFORM_CONFIG, libtzplatform-config)
-AC_SUBST(TZ_PLATFORM_CONFIG_CFLAGS)
-AC_SUBST(TZ_PLATFORM_CONFIG_LIBS)
-
-AC_CONFIG_FILES([Makefile
-                imgp/Makefile
-                imgp/test/Makefile
-                imgp/mmutil-imgp.pc
-                jpeg/Makefile
-                jpeg/test/Makefile
-                jpeg/mmutil-jpeg.pc
-                imgcv/Makefile
-                imgcv/test/Makefile
-                imgcv/mmutil-imgcv.pc
-                png/Makefile
-                png/test/Makefile
-                png/mmutil-png.pc
-                gif/Makefile
-                gif/test/Makefile
-                gif/mmutil-gif.pc
-                bmp/Makefile
-                bmp/test/Makefile
-                bmp/mmutil-bmp.pc
-])
-
-AC_OUTPUT
diff --git a/gif/Makefile.am b/gif/Makefile.am
deleted file mode 100755 (executable)
index 577cd74..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-ACLOCAL_AMFLAGS='-I m4'
-
-lib_LTLIBRARIES = libmmutil_gif.la
-
-installmmutil_gifdir = $(includedir)/mmf
-installmmutil_gif_HEADERS = include/mm_util_gif.h \
-                            ../common/include/mm_util_type.h
-
-libmmutil_gif_la_SOURCES = mm_util_gif.c
-
-libmmutil_gif_la_CFLAGS = -I$(srcdir)/include \
-                               -I$(srcdir)/../common/include \
-                               $(DLOG_CFLAGS) \
-                               $(GLIB_CFLAGS) \
-                               $(GIO_CFLAGS)
-
-libmmutil_gif_la_LIBADD = $(GLIB_LIBS) -lgif -ldl \
-                               $(DLOG_LIBS) \
-                               $(GIO_LIBS) \
-                               $(GMODULE_LIBS)
-
-libmmutil_gif_la_CFLAGS += -DLIBPREFIX=\"$(libdir)\"
-
-libmmutil_gif_la_DEPENDENCIES = $(srcdir)/../imgp/libmmutil_imgp.la
-
-pcfiles = mmutil-gif.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
-SUBDIRS = . test
index a44ad12..5d7734b 100644 (file)
@@ -1,7 +1,7 @@
-prefix = @prefix@
-exec_prefix=@exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
 
 Name : mmutil-gif
 Description : Multimedia Framework Utility Library
diff --git a/gif/test/CMakeLists.txt b/gif/test/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..5545a6a
--- /dev/null
@@ -0,0 +1,18 @@
+SET(fw_name "mmutil_gif")
+SET(fw_test "${fw_name}-test")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog)
+FOREACH(flag ${${fw_test}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+
+aux_source_directory(. sources)
+FOREACH(src ${sources})
+    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+    MESSAGE("${src_name}")
+    ADD_EXECUTABLE(${src_name} ${src})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
+ENDFOREACH()
diff --git a/gif/test/Makefile.am b/gif/test/Makefile.am
deleted file mode 100755 (executable)
index cad7d66..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-bin_PROGRAMS = mm_util_gif_testsuite
-
-mm_util_gif_testsuite_SOURCES = mm_util_gif_testsuite.c
-
-mm_util_gif_testsuite_CFLAGS = -I$(srcdir)/../include \
-                               -I$(srcdir)/../../common/include
-mm_util_gif_testsuite_CFLAGS += $(GLIB_CFLAGS) \
-                               $(TZ_PLATFORM_CONFIG_FLAGS) \
-                               -fPIE -pie
-
-
-############################################
-
-mm_util_gif_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_gif.la
-
-mm_util_gif_testsuite_LDADD = $(srcdir)/../libmmutil_gif.la
-mm_util_gif_testsuite_LDADD += $(TZ_PLATFORM_CONFIG_LIBS)
-
diff --git a/imgcv/Makefile.am b/imgcv/Makefile.am
deleted file mode 100755 (executable)
index 29db355..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-ACLOCAL_AMFLAGS='-I m4'
-
-lib_LTLIBRARIES = libmmutil_imgcv.la
-
-installmmutil_imgcvdir = $(includedir)/mmf
-installmmutil_imgcv_HEADERS = include/mm_util_imgcv.h \
-                            ../common/include/mm_util_type.h
-noinst_HEADERS = include/mm_util_imgcv_internal.h
-
-libmmutil_imgcv_la_SOURCES = mm_util_imgcv.c
-
-libmmutil_imgcv_la_CFLAGS = -I$(srcdir)/include \
-                               -I$(srcdir)/../common/include \
-                               $(GLIB_CFLAGS) \
-                               $(GMODULE_CFLAGS) \
-                               $(DLOG_CFLAGS) \
-                               $(OPENCV_CFLAGS) \
-                               $(srcdir)/../imgp/libmmutil_imgp.la
-
-libmmutil_imgcv_la_LIBADD = $(GLIB_LIBS) \
-                               $(DLOG_LIBS) \
-                               $(GMODULE_LIBS) \
-                               $(OPENCV_LIBS)
-
-libmmutil_imgcv_la_CFLAGS += -DLIBPREFIX=\"$(libdir)\"
-
-pcfiles = mmutil-imgcv.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
-SUBDIRS = . test
index a3c9921..7dc41d0 100755 (executable)
@@ -1,7 +1,7 @@
-prefix = @prefix@
-exec_prefix=@exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
 
 Name : mmutil-imgcv
 Description : Multimedia Framework Utility Library
diff --git a/imgcv/test/CMakeLists.txt b/imgcv/test/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..6e2d146
--- /dev/null
@@ -0,0 +1,18 @@
+SET(fw_name "mmutil_imgcv")
+SET(fw_test "${fw_name}-test")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog)
+FOREACH(flag ${${fw_test}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+
+aux_source_directory(. sources)
+FOREACH(src ${sources})
+    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+    MESSAGE("${src_name}")
+    ADD_EXECUTABLE(${src_name} ${src})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${JPEG-LIB} ${${fw_test}_LDFLAGS})
+ENDFOREACH()
diff --git a/imgcv/test/Makefile.am b/imgcv/test/Makefile.am
deleted file mode 100755 (executable)
index 9d660ed..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-bin_PROGRAMS = mm_util_imgcv_testsuite
-
-mm_util_imgcv_testsuite_SOURCES = mm_util_imgcv_testsuite.c
-
-mm_util_imgcv_testsuite_CFLAGS = -I$(srcdir)/../include \
-                                                               -I$(srcdir)/../../jpeg/include \
-                                                               -I$(srcdir)/../../common/include
-
-mm_util_imgcv_testsuite_CFLAGS += $(MMCOMON_CFLAGS) \
-                                                               -fPIE -pie
-############################################
-
-mm_util_imgcv_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_imgcv.la
-mm_util_imgcv_testsuite_DEPENDENCIES += $(srcdir)/../../jpeg/libmmutil_jpeg.la
-
-mm_util_imgcv_testsuite_LDADD = $(srcdir)/../libmmutil_imgcv.la \
-                                 $(srcdir)/../../jpeg/libmmutil_jpeg.la
-
diff --git a/imgp/Makefile.am b/imgp/Makefile.am
deleted file mode 100755 (executable)
index 55ffd73..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-ACLOCAL_AMFLAGS='-I m4'
-
-lib_LTLIBRARIES = libmmutil_imgp.la
-
-installmmutil_imgpdir = $(includedir)/mmf
-installmmutil_imgp_HEADERS = include/mm_util_imgp.h \
-                             ../common/include/mm_util_type.h
-noinst_HEADERS = include/mm_util_imgp_internal.h
-
-libmmutil_imgp_la_SOURCES = mm_util_imgp.c
-
-libmmutil_imgp_la_CFLAGS = -I$(srcdir)/../common/include \
-                           -I$(srcdir)/include \
-                           $(GLIB_CFLAGS) \
-                           $(GMODULE_CFLAGS) \
-                           $(DLOG_CFLAGS)
-
-libmmutil_imgp_la_LIBADD = $(GLIB_LIBS) \
-                           $(GMODULE_LIBS) \
-                           $(DLOG_LIBS)
-
-libmmutil_imgp_la_CFLAGS += -DLIBPREFIX=\"$(libdir)\"
-
-pcfiles = mmutil-imgp.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
-SUBDIRS = . test
index fb1c466..8e9f812 100755 (executable)
@@ -1369,7 +1369,7 @@ int mm_util_destroy(mm_util_imgp_h imgp_handle)
        return ret;
 }
 
-EXPORT_API int mm_util_convert_colorspace(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format, unsigned char *dst, mm_util_img_format dst_format)
+int mm_util_convert_colorspace(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format, unsigned char *dst, mm_util_img_format dst_format)
 {
        int ret = MM_UTIL_ERROR_NONE;
        unsigned char *output_buffer = NULL;
@@ -1494,7 +1494,7 @@ EXPORT_API int mm_util_convert_colorspace(const unsigned char *src, unsigned int
        return ret;
 }
 
-EXPORT_API int mm_util_resize_image(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format, unsigned char *dst, unsigned int *dst_width, unsigned int *dst_height)
+int mm_util_resize_image(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format, unsigned char *dst, unsigned int *dst_width, unsigned int *dst_height)
 {
        int ret = MM_UTIL_ERROR_NONE;
        unsigned char *output_buffer = NULL;
@@ -1633,7 +1633,7 @@ EXPORT_API int mm_util_resize_image(const unsigned char *src, unsigned int src_w
        return ret;
 }
 
-EXPORT_API int mm_util_rotate_image(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format, unsigned char *dst, unsigned int *dst_width, unsigned int *dst_height, mm_util_img_rotate_type angle)
+int mm_util_rotate_image(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format, unsigned char *dst, unsigned int *dst_width, unsigned int *dst_height, mm_util_img_rotate_type angle)
 {
        int ret = MM_UTIL_ERROR_NONE;
        unsigned char *output_buffer = NULL;
@@ -1793,7 +1793,7 @@ EXPORT_API int mm_util_rotate_image(const unsigned char *src, unsigned int src_w
        return ret;
 }
 
-EXPORT_API int mm_util_crop_image(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format,
+int mm_util_crop_image(const unsigned char *src, unsigned int src_width, unsigned int src_height, mm_util_img_format src_format,
 unsigned int crop_start_x, unsigned int crop_start_y, unsigned int *crop_dest_width, unsigned int *crop_dest_height, unsigned char *dst)
 {
        int ret = MM_UTIL_ERROR_NONE;
@@ -1861,7 +1861,7 @@ unsigned int crop_start_x, unsigned int crop_start_y, unsigned int *crop_dest_wi
        return ret;
 }
 
-EXPORT_API int mm_util_get_image_size(mm_util_img_format format, unsigned int width, unsigned int height, unsigned int *imgsize)
+int mm_util_get_image_size(mm_util_img_format format, unsigned int width, unsigned int height, unsigned int *imgsize)
 {
        int ret = MM_UTIL_ERROR_NONE;
        unsigned char x_chroma_shift = 0;
index 0810a20..ae6e3f9 100755 (executable)
@@ -1,7 +1,7 @@
-prefix = @prefix@
-exec_prefix=@exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
 
 Name : mmutil-imgp
 Description : Multimedia Framework Utility Library
diff --git a/imgp/test/CMakeLists.txt b/imgp/test/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..1202b86
--- /dev/null
@@ -0,0 +1,18 @@
+SET(fw_name "mmutil_imgp")
+SET(fw_test "${fw_name}-test")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
+FOREACH(flag ${${fw_test}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+
+aux_source_directory(. sources)
+FOREACH(src ${sources})
+    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+    MESSAGE("${src_name}")
+    ADD_EXECUTABLE(${src_name} ${src})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
+ENDFOREACH()
diff --git a/imgp/test/Makefile.am b/imgp/test/Makefile.am
deleted file mode 100755 (executable)
index e167c56..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-bin_PROGRAMS = mm_util_imgp_testsuite
-
-mm_util_imgp_testsuite_SOURCES = mm_util_imgp_testsuite.c
-
-mm_util_imgp_testsuite_CFLAGS = -I$(srcdir)/../include \
-                                -I$(srcdir)/../../common/include \
-                                 $(GMODULE_CFLAGS) \
-                                 -fPIE -pie
-
-############################################
-
-mm_util_imgp_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_imgp.la
-
-mm_util_imgp_testsuite_LDADD = $(srcdir)/../libmmutil_imgp.la \
-                              $(GMODULE_LIBS)
-
diff --git a/jpeg/Makefile.am b/jpeg/Makefile.am
deleted file mode 100755 (executable)
index 42db1d4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ACLOCAL_AMFLAGS='-I m4'
-
-lib_LTLIBRARIES = libmmutil_jpeg.la
-
-installmmutil_jpegdir = $(includedir)/mmf
-installmmutil_jpeg_HEADERS = include/mm_util_jpeg.h
-
-libmmutil_jpeg_la_SOURCES = mm_util_jpeg.c
-
-libmmutil_jpeg_la_CFLAGS = -I$(srcdir)/include \
-                               -I$(srcdir)/../common/include \
-                               -I$(srcdir)/../imgp/include \
-                               $(GLIB_CFLAGS) \
-                               $(DLOG_CFLAGS) \
-                               $(srcdir)/../imgp/libmmutil_imgp.la
-
-libmmutil_jpeg_la_LIBADD = $(GLIB_LIBS) -ljpeg -ldl -lturbojpeg\
-                               $(GMODULE_LIBS) \
-                               $(DLOG_LIBS)
-
-libmmutil_jpeg_la_CFLAGS += -DLIBPREFIX=\"$(libdir)\"
-
-libmmutil_jpeg_la_DEPENDENCIES = $(srcdir)/../imgp/libmmutil_imgp.la
-
-pcfiles = mmutil-jpeg.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
-SUBDIRS = . test
index d2d77e0..9f3a271 100755 (executable)
@@ -1219,7 +1219,7 @@ static int __mm_image_decode_from_jpeg_memory_with_libjpeg(mm_util_jpeg_yuv_data
        return iErrorCode;
 }
 #endif
-EXPORT_API int mm_util_jpeg_encode_to_file(const char *filename, void* src, int width, int height, mm_util_jpeg_yuv_format fmt, int quality)
+int mm_util_jpeg_encode_to_file(const char *filename, void* src, int width, int height, mm_util_jpeg_yuv_format fmt, int quality)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
@@ -1274,7 +1274,7 @@ EXPORT_API int mm_util_jpeg_encode_to_file(const char *filename, void* src, int
        return ret;
 }
 
-EXPORT_API int mm_util_jpeg_encode_to_memory(void **mem, unsigned int *size, void* src, int width, int height, mm_util_jpeg_yuv_format fmt, int quality)
+int mm_util_jpeg_encode_to_memory(void **mem, unsigned int *size, void* src, int width, int height, mm_util_jpeg_yuv_format fmt, int quality)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
@@ -1328,7 +1328,7 @@ EXPORT_API int mm_util_jpeg_encode_to_memory(void **mem, unsigned int *size, voi
        return ret;
 }
 
-EXPORT_API int mm_util_decode_from_jpeg_file(mm_util_jpeg_yuv_data *decoded, const char *filename, mm_util_jpeg_yuv_format fmt)
+int mm_util_decode_from_jpeg_file(mm_util_jpeg_yuv_data *decoded, const char *filename, mm_util_jpeg_yuv_format fmt)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
@@ -1419,7 +1419,7 @@ EXPORT_API int mm_util_decode_from_jpeg_file(mm_util_jpeg_yuv_data *decoded, con
        return ret;
 }
 
-EXPORT_API int mm_util_decode_from_jpeg_memory(mm_util_jpeg_yuv_data *decoded, void *src, unsigned int size, mm_util_jpeg_yuv_format fmt)
+int mm_util_decode_from_jpeg_memory(mm_util_jpeg_yuv_data *decoded, void *src, unsigned int size, mm_util_jpeg_yuv_format fmt)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
@@ -1479,7 +1479,7 @@ EXPORT_API int mm_util_decode_from_jpeg_memory(mm_util_jpeg_yuv_data *decoded, v
        return ret;
 }
 
-EXPORT_API int mm_util_decode_from_jpeg_file_with_downscale(mm_util_jpeg_yuv_data *decoded, const char *filename, mm_util_jpeg_yuv_format fmt, mm_util_jpeg_decode_downscale downscale)
+int mm_util_decode_from_jpeg_file_with_downscale(mm_util_jpeg_yuv_data *decoded, const char *filename, mm_util_jpeg_yuv_format fmt, mm_util_jpeg_decode_downscale downscale)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
@@ -1575,7 +1575,7 @@ EXPORT_API int mm_util_decode_from_jpeg_file_with_downscale(mm_util_jpeg_yuv_dat
        return ret;
 }
 
-EXPORT_API int mm_util_decode_from_jpeg_memory_with_downscale(mm_util_jpeg_yuv_data *decoded, void *src, unsigned int size, mm_util_jpeg_yuv_format fmt, mm_util_jpeg_decode_downscale downscale)
+int mm_util_decode_from_jpeg_memory_with_downscale(mm_util_jpeg_yuv_data *decoded, void *src, unsigned int size, mm_util_jpeg_yuv_format fmt, mm_util_jpeg_decode_downscale downscale)
 {
        int ret = MM_UTIL_ERROR_NONE;
 
index 2a01766..b8598bb 100644 (file)
@@ -1,7 +1,7 @@
-prefix = @prefix@
-exec_prefix=@exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
 
 Name : mmutil-jpeg
 Description : Multimedia Framework Utility Library
diff --git a/jpeg/test/CMakeLists.txt b/jpeg/test/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..d0aa2cb
--- /dev/null
@@ -0,0 +1,18 @@
+SET(fw_name "mmutil_jpeg")
+SET(fw_test "${fw_name}-test")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
+FOREACH(flag ${${fw_test}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+
+aux_source_directory(. sources)
+FOREACH(src ${sources})
+    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+    MESSAGE("${src_name}")
+    ADD_EXECUTABLE(${src_name} ${src})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
+ENDFOREACH()
diff --git a/jpeg/test/Makefile.am b/jpeg/test/Makefile.am
deleted file mode 100755 (executable)
index 766795f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-bin_PROGRAMS = mm_util_jpeg_testsuite
-
-mm_util_jpeg_testsuite_SOURCES = mm_util_jpeg_testsuite.c
-
-mm_util_jpeg_testsuite_CFLAGS = -I$(srcdir)/../include \
-                               -I$(srcdir)/../../common/include
-mm_util_jpeg_testsuite_CFLAGS += $(TZ_PLATFORM_CONFIG_FLAGS) \
-                                -fPIE -pie
-
-
-############################################
-
-mm_util_jpeg_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_jpeg.la
-
-mm_util_jpeg_testsuite_LDADD = $(srcdir)/../libmmutil_jpeg.la
-mm_util_jpeg_testsuite_LDADD += $(TZ_PLATFORM_CONFIG_LIBS)
-
index f589667..cab5b4c 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       libmm-utility
 Summary:    Multimedia Framework Utility Library
-Version:    0.1.0
+Version:    0.1.1
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -9,6 +9,8 @@ Source1001: libmm-utility.manifest
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 Requires: libmm-imgp-gstcs
+
+BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -33,28 +35,14 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 Multimedia Framework Utility Library - Development files.
 
-%package tool
-Summary:    Multimedia Framework Utility tools
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description tool
-Multimedia Framework Utility Library - Tools.
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
 %build
-mkdir -p m4
-export CFLAGS+=" -Wextra -Wno-array-bounds"
-export CFLAGS+=" -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow"
-export CFLAGS+=" -Wwrite-strings -Wswitch-default"
-export CFLAGS+=" -Werror"
-CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" \
-LDFLAGS="$LDFLAGS -Wl,--rpath=%{_libdir} -Wl,--hash-style=both -Wl,--as-needed" \
-%reconfigure
-%__make %{?_smp_mflags}
+export CFLAGS="$CFLAGS -DSYSCONFDIR=\\\"%{_sysconfdir}\\\""
+%cmake .
+make %{?jobs:-j%jobs}
 
 sed -i -e "s#@IMGP_REQPKG@#$IMGP_REQPKG#g" imgp/mmutil-imgp.pc
 sed -i -e "s#@JPEG_REQPKG@#$JPEG_REQPKG#g" jpeg/mmutil-jpeg.pc
@@ -86,9 +74,3 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-
-%files tool
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_bindir}/*_testsuite
-
diff --git a/png/Makefile.am b/png/Makefile.am
deleted file mode 100755 (executable)
index 710783e..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-ACLOCAL_AMFLAGS='-I m4'
-
-lib_LTLIBRARIES = libmmutil_png.la
-
-installmmutil_pngdir = $(includedir)/mmf
-installmmutil_png_HEADERS = include/mm_util_png.h \
-                            ../common/include/mm_util_type.h
-
-libmmutil_png_la_SOURCES = mm_util_png.c
-
-libmmutil_png_la_CFLAGS = -I$(srcdir)/include \
-                               -I$(srcdir)/../common/include \
-                               $(GLIB_CFLAGS) \
-                               $(DLOG_CFLAGS)
-
-libmmutil_png_la_LIBADD = $(GLIB_LIBS) -lpng -ldl \
-                               $(GMODULE_LIBS) \
-                               $(DLOG_LIBS)
-
-libmmutil_png_la_CFLAGS += -DLIBPREFIX=\"$(libdir)\"
-
-libmmutil_png_la_DEPENDENCIES = $(srcdir)/../imgp/libmmutil_imgp.la
-
-pcfiles = mmutil-png.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = $(pcfiles)
-SUBDIRS = . test
index 83c1af8..de754c4 100644 (file)
@@ -1,7 +1,7 @@
-prefix = @prefix@
-exec_prefix=@exec_prefix@
-libdir = @libdir@
-includedir = @includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
 
 Name : mmutil-png
 Description : Multimedia Framework Utility Library
diff --git a/png/test/CMakeLists.txt b/png/test/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..662cb32
--- /dev/null
@@ -0,0 +1,18 @@
+SET(fw_name "mmutil_png")
+SET(fw_test "${fw_name}-test")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog)
+FOREACH(flag ${${fw_test}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
+
+aux_source_directory(. sources)
+FOREACH(src ${sources})
+    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+    MESSAGE("${src_name}")
+    ADD_EXECUTABLE(${src_name} ${src})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
+ENDFOREACH()
diff --git a/png/test/Makefile.am b/png/test/Makefile.am
deleted file mode 100755 (executable)
index 561cf49..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-bin_PROGRAMS = mm_util_png_testsuite
-
-mm_util_png_testsuite_SOURCES = mm_util_png_testsuite.c
-
-mm_util_png_testsuite_CFLAGS = -I$(srcdir)/../include \
-                               -I$(srcdir)/../../common/include
-mm_util_png_testsuite_CFLAGS += $(TZ_PLATFORM_CONFIG_FLAGS) \
-                                -fPIE -pie
-
-
-############################################
-
-mm_util_png_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_png.la
-
-mm_util_png_testsuite_LDADD = $(srcdir)/../libmmutil_png.la
-mm_util_png_testsuite_LDADD += $(TZ_PLATFORM_CONFIG_LIBS)