tee: Check for the removed pad flag also in the slow pushing path

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

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 655211a..1ca0765 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -14,12 +14,6 @@ SUBDIRS_PARSE = parse
 GST_PARSE_LA = parse/libgstparse.la
 endif
 
-if GST_DISABLE_TRACE
-GST_TRACE_SRC =
-else
-GST_TRACE_SRC = gsttrace.c
-endif
-
 if GST_DISABLE_PLUGIN
 GST_PLUGIN_SRC =
 else
@@ -41,13 +35,11 @@ DIST_SUBDIRS = parse printf
 # make variables for all generated source and header files to make the
 # distinction clear
 
-built_header_configure = gstversion.h
-built_sys_header_configure = gstconfig.h
+built_headers_configure = gstversion.h gstconfig.h
 built_header_make = gstenumtypes.h
 built_source_make = gstenumtypes.c
 
 EXTRA_libgstreamer_@GST_API_VERSION@_la_SOURCES = \
-       gsttrace.c \
        gstregistrybinary.c
 
 
@@ -67,7 +59,6 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gstcapsfeatures.c       \
        gstchildproxy.c         \
        gstclock.c              \
-       gstclock-linreg.c       \
        gstcontext.c \
        gstcontrolbinding.c \
        gstcontrolsource.c \
@@ -77,6 +68,7 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gstdevicemonitor.c      \
        gstdeviceprovider.c     \
        gstdeviceproviderfactory.c \
+       gstdynamictypefactory.c \
        gstelement.c            \
        gstelementfactory.c     \
        gsterror.c              \
@@ -104,6 +96,7 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gstquery.c              \
        gstregistry.c           \
        gstregistrychunks.c     \
+       gstpromise.c    \
        gstsample.c             \
        gstsegment.c            \
        gststreamcollection.c   \
@@ -116,7 +109,6 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gsttaskpool.c           \
        gsttoc.c                \
        gsttocsetter.c          \
-       $(GST_TRACE_SRC)        \
        gsttracer.c             \
        gsttracerfactory.c      \
        gsttracerrecord.c               \
@@ -134,22 +126,23 @@ nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES = $(built_source_make)
 
 # BUILT_SOURCES are built on make all/check/install before all other targets
 BUILT_SOURCES = \
-        $(built_header_configure)      \
-        $(built_sys_header_configure)  \
+        $(built_headers_configure)     \
         $(built_header_make)           \
         $(built_source_make)
 # CLEANFILES is for files generated by make
 CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out
 # DISTCLEANFILES is for files generated by configure
-DISTCLEANFILES = $(built_header_configure) $(built_sys_header_configure)
+DISTCLEANFILES = $(built_headers_configure)
 
 libgstreamer_@GST_API_VERSION@_la_CFLAGS =             \
        -D_GNU_SOURCE                                   \
-       -DGST_EXPORTS                                   \
+       -DBUILDING_GST                                  \
        -DG_LOG_DOMAIN=g_log_domain_gstreamer           \
        -DGST_API_VERSION=\""$(GST_API_VERSION)"\"      \
        -DGST_DISABLE_DEPRECATED                        \
        $(VALGRIND_CFLAGS)                              \
+       $(UNWIND_CFLAGS)                                \
+       $(DW_CFLAGS)                            \
        $(GST_ALL_CFLAGS)
 
 libgstreamer_@GST_API_VERSION@_la_LIBADD =             \
@@ -158,6 +151,8 @@ libgstreamer_@GST_API_VERSION@_la_LIBADD =          \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
        $(SOCKET_LIBS)                                  \
+       $(UNWIND_LIBS)                                  \
+       $(DW_LIBS)                                      \
        $(LIBM)
 
 libgstreamer_@GST_API_VERSION@_la_LDFLAGS =            \
@@ -190,6 +185,7 @@ gst_headers =                       \
        gstdevice.h             \
        gstdeviceprovider.h     \
        gstdeviceproviderfactory.h \
+       gstdynamictypefactory.h \
        gstelementfactory.h     \
        gsterror.h              \
        gstevent.h              \
@@ -214,6 +210,7 @@ gst_headers =                       \
        gstpreset.h             \
        gstprotection.h         \
        gstquery.h              \
+       gstpromise.h   \
        gstsample.h             \
        gstsegment.h            \
        gststreamcollection.h   \
@@ -240,10 +237,7 @@ gst_headers =                      \
 libgstreamer_@GST_API_VERSION@include_HEADERS = $(gst_headers) math-compat.h
 
 nodist_libgstreamer_@GST_API_VERSION@include_HEADERS = \
-       $(built_header_configure) $(built_header_make)
-
-configexecincludedir = $(libdir)/gstreamer-@GST_API_VERSION@/include/gst
-nodist_configexecinclude_HEADERS = $(built_sys_header_configure)
+       $(built_headers_configure) $(built_header_make)
 
 noinst_HEADERS =               \
        gettext.h               \
@@ -255,15 +249,14 @@ noinst_HEADERS =          \
        gstquark.h              \
        gstregistrybinary.h     \
        gstregistrychunks.h     \
-       gsttrace.h              \
        gsttracerutils.h                \
        gst_private.h
 
 gstenumtypes.h: $(gst_headers)
        $(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" \
+       --fhead "#ifndef __GST_ENUM_TYPES_H__\n#define __GST_ENUM_TYPES_H__\n\n#include <glib-object.h>\n#include <gst/gstconfig.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"         \
+       --vhead "GST_API GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
        --ftail "G_END_DECLS\n\n#endif /* __GST_ENUM_TYPES_H__ */" \
        $^ > gstenumtypes.h
 
@@ -291,7 +284,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_API_VERSION@_la_SOURCE
 gir_sources+=$(patsubst %,$(builddir)/%, $(built_source_make))
 
 Gst-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_API_VERSION@.la
-       $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no GI_SCANNER_DISABLE_CACHE=yes \
+       $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_DISABLE=yes GI_SCANNER_DISABLE_CACHE=yes \
                CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
                $(INTROSPECTION_SCANNER) -v --namespace Gst \
                --nsversion=@GST_API_VERSION@ \