mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 16:26:39 +00:00
introspection: Build pkgconfig before all libraries and set PKG_CONFIG_PATH
This way g-ir-scanner can find the gstreamer-0.10 pkg-config file.
This commit is contained in:
parent
1c253a01a4
commit
3c1f41ee7d
6 changed files with 14 additions and 9 deletions
|
@ -11,17 +11,17 @@ ACLOCAL_AMFLAGS = -I common/m4 -I .
|
||||||
aclocaldir = $(datadir)/aclocal
|
aclocaldir = $(datadir)/aclocal
|
||||||
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
|
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = pkgconfig \
|
||||||
gst libs plugins tools tests \
|
gst libs plugins tools tests \
|
||||||
docs \
|
docs \
|
||||||
pkgconfig po \
|
po \
|
||||||
common
|
common
|
||||||
|
|
||||||
# These are all the possible subdirs
|
# These are all the possible subdirs
|
||||||
DIST_SUBDIRS = \
|
DIST_SUBDIRS = pkgconfig \
|
||||||
gst libs plugins tools tests \
|
gst libs plugins tools tests \
|
||||||
docs \
|
docs \
|
||||||
pkgconfig po \
|
po \
|
||||||
common
|
common
|
||||||
|
|
||||||
# include before EXTRA_DIST for win32 assignment
|
# include before EXTRA_DIST for win32 assignment
|
||||||
|
|
|
@ -51,6 +51,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES))
|
||||||
gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la
|
GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstBase \
|
$(INTROSPECTION_SCANNER) -v --namespace GstBase \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -109,6 +109,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES)
|
||||||
gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la
|
GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstCheck \
|
$(INTROSPECTION_SCANNER) -v --namespace GstCheck \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -40,6 +40,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_la_SOU
|
||||||
gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS))
|
||||||
|
|
||||||
GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la
|
GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstController \
|
$(INTROSPECTION_SCANNER) -v --namespace GstController \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
|
|
@ -30,6 +30,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstdataprotocol_@GST_MAJORMINOR@_la_S
|
||||||
gir_cincludes=$(patsubst %,--c-include='gst/dataprotocol/%',$(libgstdataprotocol_@GST_MAJORMINOR@_include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/dataprotocol/%',$(libgstdataprotocol_@GST_MAJORMINOR@_include_HEADERS))
|
||||||
|
|
||||||
GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la
|
GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \
|
$(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
|
|
|
@ -31,6 +31,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES))
|
||||||
gir_cincludes=$(patsubst %,--c-include='gst/net/%',$(libgstbase_@GST_MAJORMINOR@_include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/net/%',$(libgstbase_@GST_MAJORMINOR@_include_HEADERS))
|
||||||
|
|
||||||
GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la
|
GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstNet \
|
$(INTROSPECTION_SCANNER) -v --namespace GstNet \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
|
|
Loading…
Reference in a new issue