Merge branch 'upstream/1.16' into tizen_gst_1.16.2

[platform/upstream/gst-plugins-base.git] / gst-libs / gst / video / Makefile.am

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 6642480..0d35cf8 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -4,10 +4,13 @@ include $(top_srcdir)/common/orc.mak
 
 glib_enum_headers = video.h video-format.h video-color.h video-info.h video-dither.h \
                        colorbalance.h navigation.h video-chroma.h video-tile.h video-converter.h \
-                       video-resampler.h video-frame.h video-scaler.h
+                       video-resampler.h video-frame.h video-scaler.h video-anc.h \
+                       video-overlay-composition.h
 glib_enum_define = GST_VIDEO
 glib_gen_prefix = gst_video
 glib_gen_basename = video
+glib_gen_decl_banner=GST_VIDEO_API
+glib_gen_decl_include=\#include <gst/video/video-prelude.h>
 
 built_sources = video-enumtypes.c
 built_headers = video-enumtypes.h
@@ -24,6 +27,7 @@ libgstvideo_@GST_API_VERSION@_la_SOURCES = \
        colorbalancechannel.c   \
        navigation.c            \
        video.c                 \
+       video-anc.c             \
        video-event.c           \
        video-format.c          \
        video-chroma.c          \
@@ -34,6 +38,7 @@ libgstvideo_@GST_API_VERSION@_la_SOURCES = \
        video-frame.c           \
        video-scaler.c          \
        video-tile.c            \
+       gstvideoaggregator.c    \
        gstvideosink.c          \
        gstvideofilter.c        \
        convertframe.c          \
@@ -63,6 +68,8 @@ libgstvideo_@GST_API_VERSION@include_HEADERS = \
        colorbalancechannel.h   \
        navigation.h            \
        video.h                 \
+       video-prelude.h         \
+       video-anc.h             \
        video-event.h           \
        video-format.h          \
        video-chroma.h          \
@@ -73,6 +80,7 @@ libgstvideo_@GST_API_VERSION@include_HEADERS = \
        video-frame.h           \
        video-scaler.h          \
        video-tile.h            \
+       gstvideoaggregator.h    \
        gstvideosink.h          \
        gstvideofilter.h        \
        gstvideometa.h          \
@@ -94,7 +102,7 @@ nodist_libgstvideo_@GST_API_VERSION@include_HEADERS = $(built_headers)
 noinst_HEADERS = gstvideoutilsprivate.h
 
 libgstvideo_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
-                                       $(ORC_CFLAGS)
+                                       $(ORC_CFLAGS) -DBUILDING_GST_VIDEO
 libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
 libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
@@ -110,7 +118,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
 
 GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@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_UPDATE=no \
+               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 GstVideo \
                --nsversion=@GST_API_VERSION@ \
@@ -125,7 +133,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
                --library=libgstvideo-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
                --include=GstBase-@GST_API_VERSION@ \
-               --libtool="$(top_builddir)/libtool" \
+               --libtool="${LIBTOOL}" \
                --pkg gstreamer-@GST_API_VERSION@ \
                --pkg gstreamer-base-@GST_API_VERSION@ \
                --pkg-export gstreamer-video-@GST_API_VERSION@ \