filter: remove gst_filter_run() and deprecated filter func

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

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 92ae4e4..8c1b234 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,11 +1,5 @@
 lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la
 
-if GST_DISABLE_LOADSAVE
-GST_LOADSAVE_SRC =
-else
-GST_LOADSAVE_SRC = gstxml.c
-endif
-
 if GST_DISABLE_REGISTRY
 GST_REGISTRY_SRC =
 else
@@ -44,7 +38,7 @@ built_header_make = gstenumtypes.h gstmarshal.h
 built_source_make = gstenumtypes.c gstmarshal.c
 
 EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
-       gstmarshal.list gsttrace.c gstxml.c \
+       gstmarshal.list gsttrace.c \
        gstregistrybinary.c
 
 
@@ -57,6 +51,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstbin.c                \
        gstbuffer.c             \
        gstbufferlist.c         \
+       gstbufferpool.c         \
        gstbus.c                \
        gstcaps.c               \
        gstchildproxy.c         \
@@ -67,15 +62,16 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstelementfactory.c     \
        gsterror.c              \
        gstevent.c              \
-       gstfilter.c             \
        gstformat.c             \
        gstghostpad.c           \
        gstindex.c              \
        gstindexfactory.c       \
        gstinfo.c               \
-       gstinterface.c          \
        gstiterator.c           \
+       gstatomicqueue.c        \
        gstmessage.c            \
+       gstmeta.c               \
+       gstmemory.c             \
        gstminiobject.c         \
        gstpad.c                \
        gstpadtemplate.c        \
@@ -104,8 +100,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstutils.c              \
        gstvalue.c              \
        gstparse.c              \
-       $(GST_REGISTRY_SRC)     \
-       $(GST_LOADSAVE_SRC)
+       $(GST_REGISTRY_SRC)
 
 # do not put files in the distribution that are generated
 nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = $(built_source_make)
@@ -133,7 +128,6 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD =           \
        $(GST_PARSE_LA)                                 \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
-       $(XML_LIBS)                                     \
        $(LIBM)
 
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS =             \
@@ -148,6 +142,7 @@ gst_headers =                       \
        gstbin.h                \
        gstbuffer.h             \
        gstbufferlist.h         \
+       gstbufferpool.h         \
        gstbus.h                \
        gstcaps.h               \
        gstchildproxy.h         \
@@ -156,19 +151,21 @@ gst_headers =                     \
        gstdatetime.h           \
        gstdebugutils.h         \
        gstelement.h            \
+       gstelementmetadata.h    \
        gstelementfactory.h     \
        gsterror.h              \
        gstevent.h              \
-       gstfilter.h             \
        gstformat.h             \
        gstghostpad.h           \
        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        \
@@ -193,8 +190,7 @@ gst_headers =                       \
        gstutils.h              \
        gstvalue.h              \
        gstregistry.h           \
-       gstparse.h              \
-       gstxml.h
+       gstparse.h
 
 libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) math-compat.h
 
@@ -206,7 +202,7 @@ noinst_HEADERS =            \
        glib-compat-private.h   \
        gst-i18n-lib.h          \
        gst-i18n-app.h          \
-       gstelementdetails.h     \
+       gstelementmetadata.h    \
        gstpluginloader.h       \
        gstquark.h              \
        gstregistrybinary.h     \
@@ -246,6 +242,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
 
@@ -253,24 +266,25 @@ 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 \
                --include=GObject-2.0 \
                --include=GModule-2.0 \
-               --include=libxml2-2.0 \
                --libtool="$(top_builddir)/libtool" \
                --pkg glib-2.0 \
                --pkg gobject-2.0 \
                --pkg gmodule-no-export-2.0 \
                --pkg gthread-2.0 \
-               --pkg libxml-2.0 \
-               --pkg-export gstreamer-0.11 \
+               --pkg-export gstreamer-@GST_MAJORMINOR@ \
+               --add-init-section="gst_init(NULL, NULL);" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)