projects / platform / upstream / gstreamer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
atomicqueue: fix race
[platform/upstream/gstreamer.git] / gst / Makefile.am
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 8bcb9a1..0da40a0 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -61,6 +61,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstcaps.c               \
        gstchildproxy.c         \
        gstclock.c              \
+       gstdatetime.c           \
        gstdebugutils.c         \
        gstelement.c            \
        gstelementfactory.c     \
@@ -74,6 +75,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstinfo.c               \
        gstinterface.c          \
        gstiterator.c           \
+       gstatomicqueue.c        \
        gstmessage.c            \
        gstminiobject.c         \
        gstpad.c                \
@@ -82,11 +84,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        \
@@ -94,6 +98,8 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gsttagsetter.c          \
        gsttask.c               \
        gsttaskpool.c           \
+       gsttoc.c                \
+       gsttocsetter.c          \
        $(GST_TRACE_SRC)        \
        gsttypefind.c           \
        gsttypefindfactory.c    \
@@ -130,10 +136,11 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD =         \
        $(GST_PARSE_LA)                                 \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
-       $(XML_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
 
@@ -149,6 +156,7 @@ gst_headers =                       \
        gstchildproxy.h         \
        gstclock.h              \
        gstcompat.h             \
+       gstdatetime.h           \
        gstdebugutils.h         \
        gstelement.h            \
        gstelementfactory.h     \
@@ -162,6 +170,7 @@ gst_headers =                       \
        gstinfo.h               \
        gstinterface.h          \
        gstiterator.h           \
+       gstatomicqueue.h        \
        gstmacros.h             \
        gstmessage.h            \
        gstminiobject.h         \
@@ -181,6 +190,8 @@ gst_headers =                       \
        gsttagsetter.h          \
        gsttask.h               \
        gsttaskpool.h           \
+       gsttoc.h                \
+       gsttocsetter.h          \
        gsttrace.h              \
        gsttypefind.h           \
        gsttypefindfactory.h    \
@@ -191,7 +202,8 @@ gst_headers =                       \
        gstparse.h              \
        gstxml.h
 
-libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)
+libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) math-compat.h
+
 nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \
        $(built_header_configure) $(built_header_make)
 
@@ -200,23 +212,26 @@ noinst_HEADERS =          \
        glib-compat-private.h   \
        gst-i18n-lib.h          \
        gst-i18n-app.h          \
+       gstelementdetails.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 +239,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[] = {"     \
@@ -237,6 +252,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
 
@@ -244,13 +276,14 @@ 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
-       $(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 \
                --c-include='gst/gst.h' \
-               --library=gstreamer-0.10 \
+               --library=libgstreamer-0.10.la \
                --include=GLib-2.0 \
                --include=GObject-2.0 \
                --include=GModule-2.0 \
@@ -261,6 +294,8 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
                --pkg gmodule-no-export-2.0 \
                --pkg gthread-2.0 \
                --pkg libxml-2.0 \
+               --pkg-export gstreamer-0.10 \
+               --add-init-section="gst_init(NULL, NULL);" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
@@ -275,7 +310,19 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(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
Domain: Multimedia / Media Common;