introspection: Build pkgconfig before all libraries and set PKG_CONFIG_PATH
This way g-ir-scanner can find the gstreamer-*-0.10 pkg-config files.
This commit is contained in:
parent
39c21352e9
commit
df9b8b57b3
@ -7,6 +7,7 @@ SUBDIRS_EXT =
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
pkgconfig \
|
||||||
gst-libs \
|
gst-libs \
|
||||||
gst sys $(SUBDIRS_EXT) \
|
gst sys $(SUBDIRS_EXT) \
|
||||||
tools \
|
tools \
|
||||||
@ -14,10 +15,10 @@ SUBDIRS = \
|
|||||||
docs \
|
docs \
|
||||||
po \
|
po \
|
||||||
common \
|
common \
|
||||||
m4 \
|
m4
|
||||||
pkgconfig
|
|
||||||
|
|
||||||
DIST_SUBDIRS = \
|
DIST_SUBDIRS = \
|
||||||
|
pkgconfig \
|
||||||
docs \
|
docs \
|
||||||
gst-libs \
|
gst-libs \
|
||||||
gst sys ext \
|
gst sys ext \
|
||||||
@ -25,8 +26,7 @@ DIST_SUBDIRS = \
|
|||||||
tests \
|
tests \
|
||||||
po \
|
po \
|
||||||
common \
|
common \
|
||||||
m4 \
|
m4
|
||||||
pkgconfig
|
|
||||||
|
|
||||||
# include before EXTRA_DIST for win32 assignment
|
# include before EXTRA_DIST for win32 assignment
|
||||||
include $(top_srcdir)/common/win32.mak
|
include $(top_srcdir)/common/win32.mak
|
||||||
|
@ -39,6 +39,7 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstapp_@GST_MAJORMINOR@_la_
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/app/%',$(libgstapp_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/app/%',$(libgstapp_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@.la
|
GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstApp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstApp \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -67,6 +67,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstaudio_@GST_MAJORMIN
|
|||||||
gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMINOR@.la
|
GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstAudio \
|
$(INTROSPECTION_SCANNER) -v --namespace GstAudio \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -23,6 +23,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcdda_@GST_MAJORMINOR@_la_SOURCES))
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/cdda/%',$(libgstcdda_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/cdda/%',$(libgstcdda_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINOR@.la
|
GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstCdda \
|
$(INTROSPECTION_SCANNER) -v --namespace GstCdda \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -52,6 +52,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_MAJORMINOR@_la_SOURCES))
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/fft/%',$(libgstfft_@GST_MAJORMINOR@_include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/fft/%',$(libgstfft_@GST_MAJORMINOR@_include_HEADERS))
|
||||||
|
|
||||||
GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@.la
|
GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstFft \
|
$(INTROSPECTION_SCANNER) -v --namespace GstFft \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -80,6 +80,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/interfaces/%',$(libgstinterfacesincl
|
|||||||
gir_cincludes+=$(patsubst %,--c-include='gst/interfaces/%',$(nodist_libgstinterfacesinclude_HEADERS))
|
gir_cincludes+=$(patsubst %,--c-include='gst/interfaces/%',$(nodist_libgstinterfacesinclude_HEADERS))
|
||||||
|
|
||||||
GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@GST_MAJORMINOR@.la
|
GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstInterfaces \
|
$(INTROSPECTION_SCANNER) -v --namespace GstInterfaces \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -17,6 +17,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnetbuffer_@GST_MAJORMINOR@_la_SOUR
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/netbuffer/%',$(libgstnetbufferinclude_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/netbuffer/%',$(libgstnetbufferinclude_HEADERS))
|
||||||
|
|
||||||
GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST_MAJORMINOR@.la
|
GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer \
|
$(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -56,6 +56,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/pbutils/%',$(libgstpbutils_@GST_MAJO
|
|||||||
gir_cincludes+=$(patsubst %,--c-include='gst/pbutils/%',$(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes+=$(patsubst %,--c-include='gst/pbutils/%',$(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJORMINOR@.la
|
GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstPbutils \
|
$(INTROSPECTION_SCANNER) -v --namespace GstPbutils \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -27,6 +27,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_MAJORMINOR@_la_SOURCES))
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/riff/%',$(libgstriff_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/riff/%',$(libgstriff_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINOR@.la
|
GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstRiff \
|
$(INTROSPECTION_SCANNER) -v --namespace GstRiff \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -28,6 +28,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtp_@GST_MAJORMINOR@_la_SOURCES))
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/rtp/%',$(libgstrtpinclude_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/rtp/%',$(libgstrtpinclude_HEADERS))
|
||||||
|
|
||||||
GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@.la
|
GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstRtp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstRtp \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -59,6 +59,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstrtspinclude_HEADERS
|
|||||||
gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstrtspinclude_HEADERS))
|
gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstrtspinclude_HEADERS))
|
||||||
|
|
||||||
GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINOR@.la
|
GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstRtsp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstRtsp \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -19,6 +19,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstsdp_@GST_MAJORMINOR@_la_SOURCES))
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstsdpinclude_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstsdpinclude_HEADERS))
|
||||||
|
|
||||||
GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@.la
|
GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstSdp \
|
$(INTROSPECTION_SCANNER) -v --namespace GstSdp \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -21,6 +21,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgsttag_@GST_MAJORMINOR@_la_SOURCES))
|
|||||||
gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgsttainclude_HEADERS))
|
gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgsttainclude_HEADERS))
|
||||||
|
|
||||||
GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@.la
|
GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstTag \
|
$(INTROSPECTION_SCANNER) -v --namespace GstTag \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
@ -38,6 +38,7 @@ gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstvideo_@GST_MAJORMIN
|
|||||||
gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS))
|
gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS))
|
||||||
|
|
||||||
GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMINOR@.la
|
GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMINOR@.la
|
||||||
|
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
|
||||||
$(INTROSPECTION_SCANNER) -v --namespace GstVideo \
|
$(INTROSPECTION_SCANNER) -v --namespace GstVideo \
|
||||||
--nsversion=@GST_MAJORMINOR@ \
|
--nsversion=@GST_MAJORMINOR@ \
|
||||||
--strip-prefix=Gst \
|
--strip-prefix=Gst \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user