Merge branch 'master' into 0.11
[platform/upstream/gstreamer.git] / gst / Makefile.am
index 91ae694..dcb8c93 100644 (file)
@@ -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,10 +51,12 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstbin.c                \
        gstbuffer.c             \
        gstbufferlist.c         \
+       gstbufferpool.c         \
        gstbus.c                \
        gstcaps.c               \
        gstchildproxy.c         \
        gstclock.c              \
+       gstdatetime.c           \
        gstdebugutils.c         \
        gstelement.c            \
        gstelementfactory.c     \
@@ -72,9 +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        \
@@ -82,11 +80,13 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstpipeline.c           \
        gstplugin.c             \
        gstpluginfeature.c      \
+       gstpluginloader.c       \
        gstpoll.c               \
        gstpreset.c             \
        gstquark.c              \
        gstquery.c              \
        gstregistry.c           \
+       gstregistrychunks.c     \
        gstsegment.c            \
        gststructure.c          \
        gstsystemclock.c        \
@@ -101,8 +101,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)
@@ -130,10 +129,10 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD =         \
        $(GST_PARSE_LA)                                 \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
-       $(XML_LIBS)
+       $(LIBM)
 
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS =             \
-       $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) $(LIBM)
+       $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
 
@@ -144,13 +143,16 @@ gst_headers =                     \
        gstbin.h                \
        gstbuffer.h             \
        gstbufferlist.h         \
+       gstbufferpool.h         \
        gstbus.h                \
        gstcaps.h               \
        gstchildproxy.h         \
        gstclock.h              \
        gstcompat.h             \
+       gstdatetime.h           \
        gstdebugutils.h         \
        gstelement.h            \
+       gstelementmetadata.h    \
        gstelementfactory.h     \
        gsterror.h              \
        gstevent.h              \
@@ -160,10 +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        \
@@ -188,10 +192,10 @@ gst_headers =                     \
        gstutils.h              \
        gstvalue.h              \
        gstregistry.h           \
-       gstparse.h              \
-       gstxml.h
+       gstparse.h
+
+libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) math-compat.h
 
-libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)
 nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \
        $(built_header_configure) $(built_header_make)
 
@@ -200,23 +204,26 @@ noinst_HEADERS =          \
        glib-compat-private.h   \
        gst-i18n-lib.h          \
        gst-i18n-app.h          \
+       gstelementmetadata.h    \
+       gstpluginloader.h       \
        gstquark.h              \
        gstregistrybinary.h     \
+       gstregistrychunks.h     \
        gst_private.h
 
 gstmarshal.h: gstmarshal.list
-       glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp
+       $(AM_V_GEN)glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp && \
        mv gstmarshal.h.tmp gstmarshal.h
 
 gstmarshal.c: gstmarshal.list gst_private.h
-       echo "#include \"gst_private.h\"" > gstmarshal.c.tmp
-       echo "#include \"glib-object.h\"" >> gstmarshal.c.tmp
-       echo "#include \"gstmarshal.h\"" >> gstmarshal.c.tmp
-       glib-genmarshal --body --prefix=gst_marshal $(srcdir)/gstmarshal.list >> gstmarshal.c.tmp
+       $(AM_V_GEN)echo "#include \"gst_private.h\"" > gstmarshal.c.tmp && \
+       echo "#include \"glib-object.h\"" >> gstmarshal.c.tmp && \
+       echo "#include \"gstmarshal.h\"" >> gstmarshal.c.tmp && \
+       glib-genmarshal --body --prefix=gst_marshal $(srcdir)/gstmarshal.list >> gstmarshal.c.tmp && \
        mv gstmarshal.c.tmp gstmarshal.c
 
 gstenumtypes.h: $(gst_headers)
-       glib-mkenums \
+       $(AM_V_GEN)glib-mkenums \
        --fhead "#ifndef __GST_ENUM_TYPES_H__\n#define __GST_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
        --fprod "\n/* enumerations from \"@filename@\" */\n" \
        --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
@@ -224,7 +231,7 @@ gstenumtypes.h: $(gst_headers)
        $^ > gstenumtypes.h
 
 gstenumtypes.c: $(gst_headers)
-       glib-mkenums \
+       $(AM_V_GEN)glib-mkenums \
        --fhead "#include \"gst_private.h\"\n#include <gst/gst.h>\n#define C_ENUM(v) ((gint) v)\n#define C_FLAGS(v) ((guint) v)\n " \
        --fprod "\n/* enumerations from \"@filename@\" */" \
        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static gsize id = 0;\n  static const G@Type@Value values[] = {"     \
@@ -236,3 +243,77 @@ gstenumtypes.c: $(gst_headers)
        $(GCOV) -b -f -o $^ > $@.out
 
 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
+
+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@include_HEADERS))
+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES))
+
+Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@.la
+       $(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 \
+               --libtool="$(top_builddir)/libtool" \
+               --pkg glib-2.0 \
+               --pkg gobject-2.0 \
+               --pkg gmodule-no-export-2.0 \
+               --pkg gthread-2.0 \
+               --pkg-export gstreamer-@GST_MAJORMINOR@ \
+               --add-init-section="gst_init(NULL, NULL);" \
+               --output $@ \
+               $(gir_headers) \
+               $(gir_sources)
+
+# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
+# install anything - we need to install inside our prefix.
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(BUILT_GIRSOURCES)
+
+typelibsdir = $(libdir)/girepository-1.0/
+
+typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir $(INTROSPECTION_COMPILER)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+
+CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
+endif
+
+# try to prevent packaging errors
+check-libexecdir-consistency:
+       @if test "${GST_PLUGIN_SCANNER_INSTALLED}" != "${libexecdir}/gstreamer-$(GST_MAJORMINOR)/gst-plugin-scanner"; then \
+         echo "*** Inconsistent libexecdir! Please use ./configure --libexecdir=/foo/bar"; \
+         echo "*** to set the libexecdir and not make libexecdir=/foo/bar or the like."; \
+         echo "*** The same goes for prefix, libdir etc."; \
+         echo "*** ${GST_PLUGIN_SCANNER_INSTALLED} != ${libexecdir}/gstreamer-$(GST_MAJORMINOR)/gst-plugin-scanner"; \
+         exit 1; \
+       fi
+
+all-local: check-libexecdir-consistency