aggregator: Assert if the sink/src pad type that is to be used is not a GstAggregator...

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

diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index 1680836..8439ebf 100644 (file)
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -1,95 +1,96 @@
-lib_LTLIBRARIES = libgstbase-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstbase-@GST_API_VERSION@.la
 
-libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
-       $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
-libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
+libgstbase_@GST_API_VERSION@_la_DEPENDENCIES = \
+       $(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la
+libgstbase_@GST_API_VERSION@_la_SOURCES = \
        gstadapter.c            \
+       gstaggregator.c         \
        gstbaseparse.c          \
        gstbasesink.c           \
        gstbasesrc.c            \
        gstbasetransform.c      \
        gstbitreader.c          \
+       gstbitwriter.c          \
        gstbytereader.c         \
        gstbytewriter.c         \
        gstcollectpads.c        \
-       gstcollectpads2.c       \
+       gstdataqueue.c          \
+       gstflowcombiner.c       \
        gstpushsrc.c            \
+       gstqueuearray.c         \
        gsttypefindhelper.c
 
-libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
-libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstbase_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS) -DBUILDING_GST_BASE
+libgstbase_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS)
+libgstbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
-libgstbase_@GST_MAJORMINOR@includedir =                \
-       $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base
+libgstbase_@GST_API_VERSION@includedir =               \
+       $(includedir)/gstreamer-@GST_API_VERSION@/gst/base
 
-libgstbase_@GST_MAJORMINOR@include_HEADERS =   \
+libgstbase_@GST_API_VERSION@include_HEADERS =  \
+       base.h                  \
+       base-prelude.h          \
        gstadapter.h            \
+       gstaggregator.h         \
        gstbaseparse.h          \
        gstbasesink.h           \
        gstbasesrc.h            \
        gstbasetransform.h      \
        gstbitreader.h          \
+       gstbitwriter.h          \
        gstbytereader.h         \
        gstbytewriter.h         \
        gstcollectpads.h        \
-       gstcollectpads2.h       \
+       gstdataqueue.h          \
+       gstflowcombiner.h       \
        gstpushsrc.h            \
+       gstqueuearray.h         \
        gsttypefindhelper.h
 
 noinst_HEADERS = \
        gstbytereader-docs.h \
        gstbytewriter-docs.h \
-       gstbitreader-docs.h
+       gstbitreader-docs.h \
+       gstbitwriter-docs.h \
+       gstindex.h
+
+EXTRA_DIST = gstindex.c gstmemindex.c
 
 CLEANFILES = *.gcno *.gcda *.gcov
 
-%.c.gcov: .libs/libgstbase_@GST_MAJORMINOR@_la-%.gcda %.c
+%.c.gcov: .libs/libgstbase_@GST_API_VERSION@_la-%.gcda %.c
        $(GCOV) -b -f -o $^ > $@.out
 
-gcov: $(libgstbase_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
-
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstbase-@GST_MAJORMINOR@ -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstbase_@GST_MAJORMINOR@_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstbase_@GST_MAJORMINOR@_la_CFLAGS) \
-        -:LDFLAGS $(libgstbase_@GST_MAJORMINOR@_la_LDFLAGS) \
-                  $(libgstbase_@GST_MAJORMINOR@_la_LIBADD) \
-        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/base \
-        -:HEADERS $(libgstbase_@GST_MAJORMINOR@include_HEADERS) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
+gcov: $(libgstbase_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
 if HAVE_INTROSPECTION
-BUILT_GIRSOURCES = GstBase-@GST_MAJORMINOR@.gir
+BUILT_GIRSOURCES = GstBase-@GST_API_VERSION@.gir
 
-gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@include_HEADERS))
-gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES))
-gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS))
+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@include_HEADERS))
+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@_la_SOURCES))
 
-GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la
-       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
-               GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
+GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERSION@.la
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" GI_SCANNER_DISABLE_CACHE=yes\
+               GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_DISABLE=yes \
+               CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
                $(INTROSPECTION_SCANNER) -v --namespace GstBase \
-               --nsversion=@GST_MAJORMINOR@ \
+               --nsversion=@GST_API_VERSION@ \
                --warn-all \
-               --strip-prefix=Gst \
-               -DGST_USE_UNSTABLE_API \
+               --identifier-prefix=Gst \
+               --symbol-prefix=gst \
                -I$(top_srcdir) \
                -I$(top_srcdir)/libs \
                -I$(top_builddir) \
                -I$(top_builddir)/libs \
-               $(gir_cincludes) \
+               --c-include "gst/base/base.h" \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-0.11.la \
-               --library=libgstbase-0.11.la \
-               --include=Gst-0.11 \
-               --libtool="$(top_builddir)/libtool" \
-               --pkg gstreamer-@GST_MAJORMINOR@ \
-               --pkg-export gstreamer-base-@GST_MAJORMINOR@ \
-               --add-init-section="gst_init(NULL,NULL);" \
+               --library=libgstbase-@GST_API_VERSION@.la \
+               --include=Gst-@GST_API_VERSION@ \
+               --libtool="${LIBTOOL}" \
+               --pkg gstreamer-@GST_API_VERSION@ \
+               --pkg-export gstreamer-base-@GST_API_VERSION@ \
+               --add-init-section="$(INTROSPECTION_INIT)" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)