Merge tizen patch based on 1.12.2

[platform/upstream/gstreamer.git] / omx / Makefile.am

diff --git a/omx/Makefile.am b/omx/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 5462a4b..23742f3
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -5,11 +5,23 @@ VP8_C_FILES=gstomxvp8dec.c
 VP8_H_FILES=gstomxvp8dec.h
 endif
 
+if HAVE_VP9
+VP9_C_FILES=gstomxvp9dec.c
+VP9_H_FILES=gstomxvp9dec.h
+endif
+
 if HAVE_THEORA
 THEORA_C_FILES=gstomxtheoradec.c
 THEORA_H_FILES=gstomxtheoradec.h
 endif
 
+if HAVE_HEVC
+HEVC_C_FILES=gstomxh265dec.c   \
+                       gstomxh265enc.c
+HEVC_H_FILES=gstomxh265dec.h   \
+                       gstomxh265enc.h
+endif
+
 libgstomx_la_SOURCES = \
        gstomx.c \
        gstomxbufferpool.c \
@@ -25,7 +37,9 @@ libgstomx_la_SOURCES = \
        gstomxh263dec.c \
        gstomxwmvdec.c \
        $(VP8_C_FILES) \
+       $(VP9_C_FILES) \
        $(THEORA_C_FILES) \
+       $(HEVC_C_FILES) \
        gstomxmpeg4videoenc.c \
        gstomxh264enc.c \
        gstomxh263enc.c \
@@ -35,7 +49,7 @@ libgstomx_la_SOURCES = \
        gstomxamrdec.c \
        gstomxaudiosink.c \
        gstomxanalogaudiosink.c \
-       gstomxhdmiaudiosink.c   
+       gstomxhdmiaudiosink.c
 
 noinst_HEADERS = \
        gstomx.h \
@@ -52,7 +66,9 @@ noinst_HEADERS = \
        gstomxh263dec.h \
        gstomxwmvdec.h \
        $(VP8_H_FILES) \
+       $(VP9_H_FILES) \
        $(THEORA_H_FILES) \
+       $(HEVC_H_FILES) \
        gstomxmpeg4videoenc.h \
        gstomxh264enc.h \
        gstomxh263enc.h \
@@ -70,6 +86,7 @@ endif
 
 libgstomx_la_CFLAGS = \
        -DGST_USE_UNSTABLE_API=1 \
+       $(CFLAGS) \
        $(OMX_INCLUDEPATH) \
        $(GST_GL_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
@@ -95,25 +112,9 @@ libgstomx_la_LDFLAGS = \
        $(TBM_LDFLAGS) \
        $(MM_COMMON_LDFLAGS)
 
-
 EXTRA_DIST = \
        openmax \
        gstomxvp8dec.c \
        gstomxvp8dec.h \
        gstomxtheoradec.c \
        gstomxtheoradec.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstomx -:SHARED libgstomx \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstomx_la_SOURCES) \
-                  $(nodist_libgstomx_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstomx_la_CFLAGS) \
-        -:LDFLAGS $(libgstomx_la_LDFLAGS) \
-                  $(libgstomx_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-$(GST_API_VERSION)' \
-       > $@