Merge branch 'master' into 0.11

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

diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 2962897..e26ef9b 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -4,6 +4,8 @@ headers_pbutils = \
        pbutils.h         \
        codec-utils.h     \
        descriptions.h    \
+       encoding-profile.h      \
+       encoding-target.h       \
        install-plugins.h \
        missing-plugins.h \
        gstdiscoverer.h
@@ -22,6 +24,8 @@ libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \
        pbutils.c         \
        codec-utils.c     \
        descriptions.c    \
+       encoding-profile.c      \
+       encoding-target.c       \
        install-plugins.c \
        missing-plugins.c \
        gstdiscoverer.c   \
@@ -81,11 +85,14 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ
                --add-include-path=$(srcdir)/../video \
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
                --library=libgstpbutils-@GST_MAJORMINOR@.la \
+               --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-@GST_MAJORMINOR@` \
+               --library=gstreamer-@GST_MAJORMINOR@ \
                --include=Gst-@GST_MAJORMINOR@ \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-@GST_MAJORMINOR@ \
                --pkg gstreamer-video-@GST_MAJORMINOR@ \
                --pkg-export gstreamer-pbutils-@GST_MAJORMINOR@ \
+               --add-init-section="gst_init(NULL,NULL);" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
@@ -100,7 +107,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(srcdir)/../video \
                --includedir=$(builddir) \