Merge branch 'master' into 0.11

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

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 7d4e976..dcb8c93 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -51,7 +51,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstbin.c                \
        gstbuffer.c             \
        gstbufferlist.c         \
-       gstbuffermeta.c         \
+       gstbufferpool.c         \
        gstbus.c                \
        gstcaps.c               \
        gstchildproxy.c         \
@@ -68,10 +68,11 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstindex.c              \
        gstindexfactory.c       \
        gstinfo.c               \
-       gstinterface.c          \
        gstiterator.c           \
        gstatomicqueue.c        \
        gstmessage.c            \
+       gstmeta.c               \
+       gstmemory.c             \
        gstminiobject.c         \
        gstpad.c                \
        gstpadtemplate.c        \
@@ -128,7 +129,6 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD =           \
        $(GST_PARSE_LA)                                 \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
-       $(XML_LIBS)                                     \
        $(LIBM)
 
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS =             \
@@ -143,7 +143,7 @@ gst_headers =                       \
        gstbin.h                \
        gstbuffer.h             \
        gstbufferlist.h         \
-       gstbuffermeta.h         \
+       gstbufferpool.h         \
        gstbus.h                \
        gstcaps.h               \
        gstchildproxy.h         \
@@ -152,6 +152,7 @@ gst_headers =                       \
        gstdatetime.h           \
        gstdebugutils.h         \
        gstelement.h            \
+       gstelementmetadata.h    \
        gstelementfactory.h     \
        gsterror.h              \
        gstevent.h              \
@@ -161,11 +162,12 @@ gst_headers =                     \
        gstindex.h              \
        gstindexfactory.h       \
        gstinfo.h               \
-       gstinterface.h          \
        gstiterator.h           \
        gstatomicqueue.h        \
        gstmacros.h             \
        gstmessage.h            \
+       gstmeta.h               \
+       gstmemory.h             \
        gstminiobject.h         \
        gstpad.h                \
        gstpadtemplate.h        \
@@ -242,6 +244,23 @@ gstenumtypes.c: $(gst_headers)
 
 gcov: $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
 
+Android.mk: Makefile.am
+       androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_MAJORMINOR@ \
+        -:TAGS eng debug \
+         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:SOURCES $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES) \
+                  $(nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(libgstreamer_@GST_MAJORMINOR@_la_CFLAGS) \
+        -:LDFLAGS $(libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS) \
+                  $(libgstreamer_@GST_MAJORMINOR@_la_LIBADD) \
+                  -ldl \
+        -:SUBDIR gst/parse \
+        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst \
+        -:HEADERS $(libgstreamer_@GST_MAJORMINOR@include_HEADERS) \
+        -:LIBFILTER_STATIC gstparse \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+       > $@
+
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = Gst-@GST_MAJORMINOR@.gir
 
@@ -249,11 +268,13 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@include_HEA
 gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES))
 
 Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@.la
-       $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v --namespace Gst \
+       $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
+               $(INTROSPECTION_SCANNER) -v --namespace Gst \
                --nsversion=@GST_MAJORMINOR@ \
                -I$(top_srcdir) \
                -I$(top_builddir) \
                -DIN_GOBJECT_INTROSPECTION=1 \
+               -DGST_USE_UNSTABLE_API \
                --c-include='gst/gst.h' \
                --library=libgstreamer-0.11.la \
                --include=GLib-2.0 \
@@ -264,7 +285,8 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
                --pkg gobject-2.0 \
                --pkg gmodule-no-export-2.0 \
                --pkg gthread-2.0 \
-               --pkg-export gstreamer-0.11 \
+               --pkg-export gstreamer-@GST_MAJORMINOR@ \
+               --add-init-section="gst_init(NULL, NULL);" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)