projects / platform / upstream / gstreamer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gstpad: only warn on performance penalty if not using the template caps
[platform/upstream/gstreamer.git] / gst / Makefile.am
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 79dd67f..b06ec4f 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
 
 
@@ -73,15 +65,16 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gstdatetime.c           \
        gstdebugutils.c         \
        gstdevice.c             \
+       gstdevicemonitor.c      \
        gstdeviceprovider.c     \
        gstdeviceproviderfactory.c \
+       gstdynamictypefactory.c \
        gstelement.c            \
        gstelementfactory.c     \
        gsterror.c              \
        gstevent.c              \
        gstformat.c             \
        gstghostpad.c           \
-       gstdevicemonitor.c      \
        gstinfo.c               \
        gstiterator.c           \
        gstatomicqueue.c        \
@@ -98,12 +91,15 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gstpluginloader.c       \
        gstpoll.c               \
        gstpreset.c             \
+       gstprotection.c         \
        gstquark.c              \
        gstquery.c              \
        gstregistry.c           \
        gstregistrychunks.c     \
        gstsample.c             \
        gstsegment.c            \
+       gststreamcollection.c   \
+       gststreams.c            \
        gststructure.c          \
        gstsystemclock.c        \
        gsttaglist.c            \
@@ -112,7 +108,10 @@ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
        gsttaskpool.c           \
        gsttoc.c                \
        gsttocsetter.c          \
-       $(GST_TRACE_SRC)        \
+       gsttracer.c             \
+       gsttracerfactory.c      \
+       gsttracerrecord.c               \
+       gsttracerutils.c                \
        gsttypefind.c           \
        gsttypefindfactory.c    \
        gsturi.c                \
@@ -126,14 +125,13 @@ 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                                   \
@@ -142,6 +140,8 @@ libgstreamer_@GST_API_VERSION@_la_CFLAGS =          \
        -DGST_API_VERSION=\""$(GST_API_VERSION)"\"      \
        -DGST_DISABLE_DEPRECATED                        \
        $(VALGRIND_CFLAGS)                              \
+       $(UNWIND_CFLAGS)                                \
+       $(DW_CFLAGS)                            \
        $(GST_ALL_CFLAGS)
 
 libgstreamer_@GST_API_VERSION@_la_LIBADD =             \
@@ -149,6 +149,9 @@ libgstreamer_@GST_API_VERSION@_la_LIBADD =          \
        $(GST_PRINTF_LA)                                \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
+       $(SOCKET_LIBS)                                  \
+       $(UNWIND_LIBS)                                  \
+       $(DW_LIBS)                                      \
        $(LIBM)
 
 libgstreamer_@GST_API_VERSION@_la_LDFLAGS =            \
@@ -181,6 +184,7 @@ gst_headers =                       \
        gstdevice.h             \
        gstdeviceprovider.h     \
        gstdeviceproviderfactory.h \
+       gstdynamictypefactory.h \
        gstelementfactory.h     \
        gsterror.h              \
        gstevent.h              \
@@ -203,9 +207,12 @@ gst_headers =                      \
        gstpluginfeature.h      \
        gstpoll.h               \
        gstpreset.h             \
+       gstprotection.h         \
        gstquery.h              \
        gstsample.h             \
        gstsegment.h            \
+       gststreamcollection.h   \
+       gststreams.h            \
        gststructure.h          \
        gstsystemclock.h        \
        gsttaglist.h            \
@@ -214,6 +221,9 @@ gst_headers =                       \
        gsttaskpool.h           \
        gsttoc.h                \
        gsttocsetter.h          \
+       gsttracer.h             \
+       gsttracerfactory.h      \
+       gsttracerrecord.h               \
        gsttypefind.h           \
        gsttypefindfactory.h    \
        gsturi.h                \
@@ -225,10 +235,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               \
@@ -240,7 +247,7 @@ noinst_HEADERS =            \
        gstquark.h              \
        gstregistrybinary.h     \
        gstregistrychunks.h     \
-       gsttrace.h              \
+       gsttracerutils.h                \
        gst_private.h
 
 gstenumtypes.h: $(gst_headers)
@@ -265,23 +272,6 @@ gstenumtypes.c: $(gst_headers)
 
 gcov: $(libgstreamer_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_API_VERSION@ \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstreamer_@GST_API_VERSION@_la_SOURCES) \
-                  $(nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstreamer_@GST_API_VERSION@_la_CFLAGS) \
-        -:LDFLAGS $(libgstreamer_@GST_API_VERSION@_la_LDFLAGS) \
-                  $(libgstreamer_@GST_API_VERSION@_la_LIBADD) \
-                  -ldl \
-        -:SUBDIR gst/parse \
-        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst \
-        -:HEADERS $(libgstreamer_@GST_API_VERSION@include_HEADERS) \
-        -:LIBFILTER_STATIC gstparse \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = Gst-@GST_API_VERSION@.gir
 
@@ -292,9 +282,11 @@ 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 \
+       $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no 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@ \
+               --verbose \
                --warn-all \
                -I$(top_srcdir) \
                -I$(top_builddir) \
@@ -309,7 +301,7 @@ Gst-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_API_VERSIO
                --pkg gobject-2.0 \
                --pkg gmodule-no-export-2.0 \
                --pkg-export gstreamer-@GST_API_VERSION@ \
-               --add-init-section="gst_init(NULL, NULL);" \
+               --add-init-section="$(INTROSPECTION_INIT)" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
Domain: Multimedia / Media Common;