atomicqueue: fix race

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

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 5e1a93d..0da40a0 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -75,6 +75,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstinfo.c               \
        gstinterface.c          \
        gstiterator.c           \
+       gstatomicqueue.c        \
        gstmessage.c            \
        gstminiobject.c         \
        gstpad.c                \
@@ -97,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    \
@@ -167,6 +170,7 @@ gst_headers =                       \
        gstinfo.h               \
        gstinterface.h          \
        gstiterator.h           \
+       gstatomicqueue.h        \
        gstmacros.h             \
        gstmessage.h            \
        gstminiobject.h         \
@@ -186,6 +190,8 @@ gst_headers =                       \
        gsttagsetter.h          \
        gsttask.h               \
        gsttaskpool.h           \
+       gsttoc.h                \
+       gsttocsetter.h          \
        gsttrace.h              \
        gsttypefind.h           \
        gsttypefindfactory.h    \
@@ -246,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
 
@@ -253,7 +276,8 @@ 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) \
@@ -271,6 +295,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
                --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)