Remove libmm-common dependency

Change-Id: I704dc1fbd65f5c1deda8f7a093390edbb99253e0

diff --git a/bmp/Makefile.am b/bmp/Makefile.am
index c2e1f35..9361d82 100644 (file)
--- a/bmp/Makefile.am
+++ b/bmp/Makefile.am
@@ -11,13 +11,11 @@ libmmutil_bmp_la_CFLAGS = -I$(srcdir)/include \
                                -I$(srcdir)/../imgp/include \
                                $(GLIB_CFLAGS) \
                                $(MEDIA_CFLAGS) \
-                               $(MMCOMMON_CFLAGS) \
                                -I/usr/include \
                                $(SYSTEMINFO_CFLAGS) \
                                $(srcdir)/../imgp/libmmutil_imgp.la
 
-libmmutil_bmp_la_LIBADD = $(MMCOMMON_LIBS) -lnsbmp -lbmp -ldl -lexif -lttrace\
-                               $(GLIB_LIBS) \
+libmmutil_bmp_la_LIBADD = $(GLIB_LIBS) -lnsbmp -lbmp -ldl -lexif -lttrace\
                                $(GMODULE_LIBS) \
                                $(SYSTEMINFO_LIBS)\
                                $(MEDIA_LIBS)

diff --git a/bmp/test/Makefile.am b/bmp/test/Makefile.am
index cff177c..5a0f193 100755 (executable)
--- a/bmp/test/Makefile.am
+++ b/bmp/test/Makefile.am
@@ -4,8 +4,7 @@ mm_util_bmp_testsuite_SOURCES = mm_util_bmp_testsuite.c
 
 mm_util_bmp_testsuite_CFLAGS = -I$(srcdir)/../include \
                                -I$(srcdir)/../../imgp/include
-mm_util_bmp_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
-                                 $(MEDIA_CFLAGS) \
+mm_util_bmp_testsuite_CFLAGS += $(MEDIA_CFLAGS) \
                                 -fPIE -pie \
                                 $(TZ_PLATFORM_CONFIG_FLAGS)
 
@@ -15,7 +14,6 @@ mm_util_bmp_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
 mm_util_bmp_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_bmp.la
 
 mm_util_bmp_testsuite_LDADD = $(srcdir)/../libmmutil_bmp.la
-mm_util_bmp_testsuite_LDADD += $(MMCOMMON_LIBS) \
-                              $(MEDIA_LIBS) \
+mm_util_bmp_testsuite_LDADD += $(MEDIA_LIBS) \
                                $(TZ_PLATFORM_CONFIG_LIBS)
 

diff --git a/configure.ac b/configure.ac
index 8b3c779..c40ea7c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -33,10 +33,6 @@ AC_STRUCT_TM
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset strdup])
 
-PKG_CHECK_MODULES(MMCOMMON, mm-common)
-AC_SUBST(MMCOMMON_CFLAGS)
-AC_SUBST(MMCOMMON_LIBS)
-
 PKG_CHECK_MODULES(DLOG, dlog)
 AC_SUBST(DLOG_CFLAGS)
 AC_SUBST(DLOG_LIBS)

diff --git a/gif/Makefile.am b/gif/Makefile.am
index ae0d405..7c9734d 100644 (file)
--- a/gif/Makefile.am
+++ b/gif/Makefile.am
@@ -11,13 +11,11 @@ libmmutil_gif_la_CFLAGS = -I$(srcdir)/include \
                                -I$(srcdir)/../imgp/include \
                                $(GLIB_CFLAGS) \
                                $(MEDIA_CFLAGS) \
-                               $(MMCOMMON_CFLAGS) \
                                -I/usr/include \
                                $(SYSTEMINFO_CFLAGS) \
                                $(srcdir)/../imgp/libmmutil_imgp.la
 
-libmmutil_gif_la_LIBADD = $(MMCOMMON_LIBS) -lgif -ldl -lexif -lttrace\
-                               $(GLIB_LIBS) \
+libmmutil_gif_la_LIBADD = $(GLIB_LIBS) -lgif -ldl -lexif -lttrace\
                                $(GMODULE_LIBS) \
                                $(SYSTEMINFO_LIBS)\
                                $(MEDIA_LIBS)

diff --git a/gif/test/Makefile.am b/gif/test/Makefile.am
index bead9a8..b724dff 100755 (executable)
--- a/gif/test/Makefile.am
+++ b/gif/test/Makefile.am
@@ -4,8 +4,7 @@ mm_util_gif_testsuite_SOURCES = mm_util_gif_testsuite.c
 
 mm_util_gif_testsuite_CFLAGS = -I$(srcdir)/../include \
                                -I$(srcdir)/../../imgp/include
-mm_util_gif_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
-                                 $(MEDIA_CFLAGS) \
+mm_util_gif_testsuite_CFLAGS += $(MEDIA_CFLAGS) \
                                 -fPIE -pie \
                                 $(TZ_PLATFORM_CONFIG_FLAGS)
 
@@ -15,7 +14,6 @@ mm_util_gif_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
 mm_util_gif_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_gif.la
 
 mm_util_gif_testsuite_LDADD = $(srcdir)/../libmmutil_gif.la
-mm_util_gif_testsuite_LDADD += $(MMCOMMON_LIBS) \
-                              $(MEDIA_LIBS) \
+mm_util_gif_testsuite_LDADD += $(MEDIA_LIBS) \
                                $(TZ_PLATFORM_CONFIG_LIBS)
 

diff --git a/imgcv/Makefile.am b/imgcv/Makefile.am
index 4853a9e..f50648b 100755 (executable)
--- a/imgcv/Makefile.am
+++ b/imgcv/Makefile.am
@@ -10,15 +10,13 @@ libmmutil_imgcv_la_SOURCES = mm_util_imgcv.c
 
 libmmutil_imgcv_la_CFLAGS = -I$(srcdir)/include \
                                -I$(srcdir)/../imgp/include \
-                               $(MMCOMMON_CFLAGS) \
                                $(GLIB_CFLAGS) \
                                $(GMODULE_CFLAGS) \
                                $(MEDIA_CFLAGS) \
                                $(OPENCV_CFLAGS) \
                                $(srcdir)/../imgp/libmmutil_imgp.la
 
-libmmutil_imgcv_la_LIBADD = $(MMCOMMON_LIBS) \
-                               $(GLIB_LIBS) \
+libmmutil_imgcv_la_LIBADD = $(GLIB_LIBS) \
                                $(GMODULE_LIBS) \
                                $(MEDIA_LIBS) \
                                $(OPENCV_LIBS)

diff --git a/imgcv/mmutil-imgcv.pc.in b/imgcv/mmutil-imgcv.pc.in
index a8cd580..a3c9921 100755 (executable)
--- a/imgcv/mmutil-imgcv.pc.in
+++ b/imgcv/mmutil-imgcv.pc.in
@@ -5,7 +5,7 @@ includedir = @includedir@
 
 Name : mmutil-imgcv
 Description : Multimedia Framework Utility Library
-Requires : @IMGCV_REQPKG@ mm-common opencv
+Requires : @IMGCV_REQPKG@ opencv
 Version : @VERSION@
 Libs : -L${libdir} -lmmutil_imgcv
 Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"

diff --git a/imgcv/test/Makefile.am b/imgcv/test/Makefile.am
index 1b5733c..c2393cf 100755 (executable)
--- a/imgcv/test/Makefile.am
+++ b/imgcv/test/Makefile.am
@@ -14,6 +14,5 @@ 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 \
-                                 $(MMCOMMON_LIBS)
+                                 $(srcdir)/../../jpeg/libmmutil_jpeg.la
 

diff --git a/imgp/Makefile.am b/imgp/Makefile.am
index 8241e0f..b518eb1 100755 (executable)
--- a/imgp/Makefile.am
+++ b/imgp/Makefile.am
@@ -11,7 +11,6 @@ libmmutil_imgp_la_SOURCES = mm_util_imgp.c
 
 libmmutil_imgp_la_CFLAGS = -I$(srcdir)/include \
                           -I$(includedir)/drm \
-                          $(MMCOMMON_CFLAGS) \
                            $(GLIB_CFLAGS) \
                            $(GMODULE_CFLAGS) \
                            $(DRM_CFLAGS) \
@@ -23,8 +22,7 @@ libmmutil_imgp_la_CFLAGS = -I$(srcdir)/include \
                            $(TBM_CFLAGS) \
                            $(DLOG_CFLAGS)
 
-libmmutil_imgp_la_LIBADD = $(MMCOMMON_LIBS) \
-                           $(GLIB_LIBS) \
+libmmutil_imgp_la_LIBADD = $(GLIB_LIBS) \
                            $(GMODULE_LIBS) \
                            $(DRM_LIBS) \
                            $(DRM_DEVEL_LIBS) \

diff --git a/imgp/mmutil-imgp.pc.in b/imgp/mmutil-imgp.pc.in
index 2b5efbb..f13ee68 100755 (executable)
--- a/imgp/mmutil-imgp.pc.in
+++ b/imgp/mmutil-imgp.pc.in
@@ -5,7 +5,7 @@ includedir = @includedir@
 
 Name : mmutil-imgp
 Description : Multimedia Framework Utility Library
-Requires : @IMGP_REQPKG@ capi-media-tool mm-common
+Requires : @IMGP_REQPKG@ capi-media-tool
 Version : @VERSION@
 Libs : -L${libdir} -lmmutil_imgp
 Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"

diff --git a/imgp/test/Makefile.am b/imgp/test/Makefile.am
index e34b704..08dcce4 100755 (executable)
--- a/imgp/test/Makefile.am
+++ b/imgp/test/Makefile.am
@@ -4,7 +4,7 @@ mm_util_imgp_testsuite_SOURCES = mm_util_imgp_testsuite.c
 
 mm_util_imgp_testsuite_CFLAGS = -I$(srcdir)/../include \
                                 -I$(includedir)/drm \
-                                 $(MMCOMMON_CFLAGS) \
+                                 $(GMODULE_CFLAGS) \
                                  $(MMCAMCORDER_CFLAGS) \
                                  $(DRM_CFLAGS) \
                                  $(DRM_DEVEL_CFLAGS) \
@@ -20,7 +20,7 @@ mm_util_imgp_testsuite_CFLAGS = -I$(srcdir)/../include \
 mm_util_imgp_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_imgp.la
 
 mm_util_imgp_testsuite_LDADD = $(srcdir)/../libmmutil_imgp.la \
-                              $(MMCOMMON_LIBS) \
+                              $(GMODULE_LIBS) \
                               $(MMCAMCORDER_LIBS) \
                               $(DRM_LIBS) \
                               $(DRM_DEVEL_LIBS) \

diff --git a/jpeg/Makefile.am b/jpeg/Makefile.am
index 85500c3..876170a 100755 (executable)
--- a/jpeg/Makefile.am
+++ b/jpeg/Makefile.am
@@ -11,13 +11,11 @@ libmmutil_jpeg_la_CFLAGS = -I$(srcdir)/include \
                                -I$(srcdir)/../imgp/include \
                                $(GLIB_CFLAGS) \
                                $(MEDIA_CFLAGS) \
-                               $(MMCOMMON_CFLAGS) \
                                -I/usr/include \
                                $(SYSTEMINFO_CFLAGS) \
                                $(srcdir)/../imgp/libmmutil_imgp.la
 
-libmmutil_jpeg_la_LIBADD = $(MMCOMMON_LIBS) -ljpeg -ldl -lexif -lttrace\
-                               $(GLIB_LIBS) \
+libmmutil_jpeg_la_LIBADD = $(GLIB_LIBS) -ljpeg -ldl -lexif -lttrace\
                                $(GMODULE_LIBS) \
                                $(SYSTEMINFO_LIBS)\
                                $(MEDIA_LIBS)

diff --git a/jpeg/test/Makefile.am b/jpeg/test/Makefile.am
index a1e7162..2448e6d 100755 (executable)
--- a/jpeg/test/Makefile.am
+++ b/jpeg/test/Makefile.am
@@ -4,8 +4,7 @@ mm_util_jpeg_testsuite_SOURCES = mm_util_jpeg_testsuite.c
 
 mm_util_jpeg_testsuite_CFLAGS = -I$(srcdir)/../include \
                                -I$(srcdir)/../../imgp/include
-mm_util_jpeg_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
-                                 $(MEDIA_CFLAGS) \
+mm_util_jpeg_testsuite_CFLAGS += $(MEDIA_CFLAGS) \
                                 -fPIE -pie \
                                 $(TZ_PLATFORM_CONFIG_FLAGS)
 
@@ -15,7 +14,6 @@ mm_util_jpeg_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
 mm_util_jpeg_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_jpeg.la
 
 mm_util_jpeg_testsuite_LDADD = $(srcdir)/../libmmutil_jpeg.la
-mm_util_jpeg_testsuite_LDADD += $(MMCOMMON_LIBS) \
-                              $(MEDIA_LIBS) \
+mm_util_jpeg_testsuite_LDADD += $(MEDIA_LIBS) \
                                $(TZ_PLATFORM_CONFIG_LIBS)
 

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 2f0b0de..90cc67c 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.19
+Version:    0.20
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -8,7 +8,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001: libmm-utility.manifest
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
-BuildRequires:  pkgconfig(mm-common)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gmodule-2.0)

diff --git a/png/Makefile.am b/png/Makefile.am
index e280da1..00e535e 100644 (file)
--- a/png/Makefile.am
+++ b/png/Makefile.am
@@ -11,13 +11,11 @@ libmmutil_png_la_CFLAGS = -I$(srcdir)/include \
                                -I$(srcdir)/../imgp/include \
                                $(GLIB_CFLAGS) \
                                $(MEDIA_CFLAGS) \
-                               $(MMCOMMON_CFLAGS) \
                                -I/usr/include \
                                $(SYSTEMINFO_CFLAGS) \
                                $(srcdir)/../imgp/libmmutil_imgp.la
 
-libmmutil_png_la_LIBADD = $(MMCOMMON_LIBS) -lpng -ldl -lexif -lttrace\
-                               $(GLIB_LIBS) \
+libmmutil_png_la_LIBADD = $(GLIB_LIBS) -lpng -ldl -lexif -lttrace\
                                $(GMODULE_LIBS) \
                                $(SYSTEMINFO_LIBS)\
                                $(MEDIA_LIBS)

diff --git a/png/test/Makefile.am b/png/test/Makefile.am
index 79af734..d74868e 100755 (executable)
--- a/png/test/Makefile.am
+++ b/png/test/Makefile.am
@@ -4,8 +4,7 @@ mm_util_png_testsuite_SOURCES = mm_util_png_testsuite.c
 
 mm_util_png_testsuite_CFLAGS = -I$(srcdir)/../include \
                                -I$(srcdir)/../../imgp/include
-mm_util_png_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
-                                 $(MEDIA_CFLAGS) \
+mm_util_png_testsuite_CFLAGS += $(MEDIA_CFLAGS) \
                                 -fPIE -pie \
                                 $(TZ_PLATFORM_CONFIG_FLAGS)
 
@@ -15,7 +14,6 @@ mm_util_png_testsuite_CFLAGS += $(MMCOMMON_CFLAGS) \
 mm_util_png_testsuite_DEPENDENCIES = $(srcdir)/../libmmutil_png.la
 
 mm_util_png_testsuite_LDADD = $(srcdir)/../libmmutil_png.la
-mm_util_png_testsuite_LDADD += $(MMCOMMON_LIBS) \
-                              $(MEDIA_LIBS) \
+mm_util_png_testsuite_LDADD += $(MEDIA_LIBS) \
                                $(TZ_PLATFORM_CONFIG_LIBS)
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 5afd0f5..45050f5 100755 (executable)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,11 +3,4 @@ bin_PROGRAMS = mm_utility_testsuite
 mm_utility_testsuite_SOURCES = mm_utility_testsuite.c
 
 mm_utility_testsuite_CFLAGS = -I$(srcdir)/../include \
-                                $(MMCOMMON_CFLAGS) -fPIE -pie
-
-
-mm_utility_testsuite_LDADD = $(MMCOMMON_LIBS)
-
-
-mm_utility_testsuite_CFLAGS += $(SAVSIMGD_CFLAGS)
-mm_utility_testsuite_LDADD += $(SAVSIMGD_LIBS)
+                                -fPIE -pie