summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Kumar Dasari <Arun@codeaurora.org>2016-05-26 11:05:29 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-23 03:36:14 -0800
commitf7ad0dbef6d65e49201f4044aae04cb8286de422 (patch)
tree00b903c6e8e40a2e96a283c38d8cb13074492054
parent79a07696a3f6611ad2ce3121bf8033941aa5c3f0 (diff)
downloadmedia-f7ad0dbef6d65e49201f4044aae04cb8286de422.tar.gz
mm-core: Add Makefile and Configure files
add makefile and configure file to build mm-core libraries. Change-Id: I94c714d124594627ce6b61ad4a507d1718e3eee1
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac16
-rw-r--r--mm-core/Makefile.am12
-rw-r--r--mm-core/mm-core.pc.in10
4 files changed, 41 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index aa14ba85..43152633 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,4 +2,10 @@
#
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = mm-core mm-video-v4l2 \ No newline at end of file
+BUILD_COMPONENTS := mm-core
+
+if BUILD_MM_VIDEO
+BUILD_COMPONENTS += mm-video-v4l2
+endif
+
+SUBDIRS := $(BUILD_COMPONENTS)
diff --git a/configure.ac b/configure.ac
index 248b6ba4..73cdd5a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,11 @@ AC_ARG_ENABLE([target-msm8953],
[Enable conditional compile for target msm8953 [default=no]]),
[target_msm8953="${enableval}"])
+AC_ARG_ENABLE([target-msm8909],
+ AC_HELP_STRING([--enable-target-msm8909],
+ [Enable conditional compile for target msm8909 [default=no]]),
+ [target_msm8909="${enableval}"])
+
AC_ARG_ENABLE([target-msm8996],
AC_HELP_STRING([--enable-target-msm8996],
[Enable conditional compile for target msm8996 [default=no]]),
@@ -86,6 +91,11 @@ AC_ARG_ENABLE([use-glib],
[Enable conditional compile for use glib [default=no]]),
[use_glib="${enableval}"])
+AC_ARG_ENABLE([build-mm-video],
+ AC_HELP_STRING([--enable-use-glib],
+ [Enable conditional compile for use glib [default=no]]),
+ [build_mm_video="${enableval}"])
+
AC_ARG_WITH([sanitized-headers],
[AS_HELP_STRING([--with-sanitized-headers=DIR],[location of the sanitized Linux kernel headers])],
[CPPFLAGS="$CPPFLAGS -I $withval"])
@@ -138,11 +148,16 @@ AC_ARG_WITH([display-headers],
[AS_HELP_STRING([--with-binder-inc=DIR],[location of common headers])],
[CPPFLAGS="$CPPFLAGS -I$withval"])
+AC_ARG_WITH([qdutils-headers],
+ [AS_HELP_STRING([--with-binder-inc=DIR],[location of common headers])],
+ [CPPFLAGS="$CPPFLAGS -I$withval"])
+
AC_ARG_WITH([glib-lib-dir],
[AS_HELP_STRING([--with-binder-inc=DIR],[location of common headers])],
[CPPFLAGS="$CPPFLAGS -I$withval"])
AM_CONDITIONAL(TARGET_MSM8953, [test "x$target_msm8953" = "xyes"])
+AM_CONDITIONAL(TARGET_MSM8909, [test "x$target_msm8909" = "xyes"])
AM_CONDITIONAL(TARGET_MSM8996, [test "x$target_msm8996" = "xyes"])
AM_CONDITIONAL(TARGET_MSM8610, [test "x$target_msm8610" = "xyes"])
AM_CONDITIONAL(TARGET_MSM8226, [test "x$target_msm8226" = "xyes"])
@@ -153,6 +168,7 @@ AM_CONDITIONAL(TARGETS_THAT_USE_FLAG_MSM8226, [test "x$targets_that_use_flag_msm
AM_CONDITIONAL(TARGET_USES_MEDIA_EXTENSIONS, [test "x$target_uses_media_extensions" = "xyes"])
AM_CONDITIONAL(MASTER_SIDE_CP_TARGET_LIST, [test "x$master_side_cp_target_list" = "xyes"])
AM_CONDITIONAL(USE_GLIB, [test "x$use_glib" = "xyes"])
+AM_CONDITIONAL(BUILD_MM_VIDEO, [test "x$build_mm_video" = "xyes"])
AC_ARG_WITH([glib],
AC_HELP_STRING([--with-glib],
diff --git a/mm-core/Makefile.am b/mm-core/Makefile.am
index 51f68da9..9fa9b32f 100644
--- a/mm-core/Makefile.am
+++ b/mm-core/Makefile.am
@@ -54,6 +54,10 @@ if TARGET_MSM8996
TARGET_REGISTRY = msm8996
endif
+if TARGET_MSM8909
+TARGET_REGISTRY = 8909
+endif
+
c_sources +=src/${TARGET_REGISTRY}/registry_table_android.c
lib_LTLIBRARIES = libOmxCore.la
@@ -61,8 +65,8 @@ include_HEADERS = $(h_sources)
libOmxCore_la_SOURCES = $(c_sources)
libOmxCore_la_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -fPIC
libOmxCore_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -fPIC
-libOmxCore_la_LDFLAGS = -ldl -lrt -lpthread -lglib-2.0
-libOmxCore_la_LDFLAGS += -shared -version-info 0
+libOmxCore_la_LDFLAGS = -ldl -lrt -lpthread -lglib-2.0 -lcutils
+libOmxCore_la_LDFLAGS += -shared -avoid-version
lib_LTLIBRARIES += libmm-omxcore.la
@@ -74,6 +78,6 @@ include_HEADERS = $(h_sources)
libmm_omxcore_la_SOURCES = $(c_sources)
libmm_omxcore_la_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -fPIC
libmm_omxcore_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -fPIC
-libmm_omxcore_la_LDFLAGS = -ldl -lrt -lpthread -lglib-2.0
-libmm_omxcore_la_LDFLAGS += -shared -version-info 0
+libmm_omxcore_la_LDFLAGS = -ldl -lrt -lpthread -lglib-2.0 -lcutils
+libmm_omxcore_la_LDFLAGS += -shared -avoid-version
diff --git a/mm-core/mm-core.pc.in b/mm-core/mm-core.pc.in
new file mode 100644
index 00000000..5ac2706d
--- /dev/null
+++ b/mm-core/mm-core.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: mm-core
+Description: mm-core library
+Version: @VERSION@
+Libs: -L${libdir} -lOmxCore -lmm-omxcore
+Cflags: -I${includedir}/mm-core/omxcore