From df9b8b57b37f0ad69d136d8d0cb7af7b2069e448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 12 Sep 2009 14:01:20 +0200 Subject: [PATCH] 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. --- Makefile.am | 8 ++++---- gst-libs/gst/app/Makefile.am | 3 ++- gst-libs/gst/audio/Makefile.am | 3 ++- gst-libs/gst/cdda/Makefile.am | 3 ++- gst-libs/gst/fft/Makefile.am | 3 ++- gst-libs/gst/interfaces/Makefile.am | 3 ++- gst-libs/gst/netbuffer/Makefile.am | 3 ++- gst-libs/gst/pbutils/Makefile.am | 3 ++- gst-libs/gst/riff/Makefile.am | 3 ++- gst-libs/gst/rtp/Makefile.am | 3 ++- gst-libs/gst/rtsp/Makefile.am | 3 ++- gst-libs/gst/sdp/Makefile.am | 3 ++- gst-libs/gst/tag/Makefile.am | 3 ++- gst-libs/gst/video/Makefile.am | 3 ++- 14 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index e74226bf9d..0f188876bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ SUBDIRS_EXT = endif SUBDIRS = \ + pkgconfig \ gst-libs \ gst sys $(SUBDIRS_EXT) \ tools \ @@ -14,10 +15,10 @@ SUBDIRS = \ docs \ po \ common \ - m4 \ - pkgconfig + m4 DIST_SUBDIRS = \ + pkgconfig \ docs \ gst-libs \ gst sys ext \ @@ -25,8 +26,7 @@ DIST_SUBDIRS = \ tests \ po \ common \ - m4 \ - pkgconfig + m4 # include before EXTRA_DIST for win32 assignment include $(top_srcdir)/common/win32.mak diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index c77be40e8d..8ec43e7dda 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -39,7 +39,8 @@ gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstapp_@GST_MAJORMINOR@_la_ gir_cincludes=$(patsubst %,--c-include='gst/app/%',$(libgstapp_@GST_MAJORMINOR@include_HEADERS)) GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstApp \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstApp \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 6a79cdef45..1b3ef2fc87 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -67,7 +67,8 @@ gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstaudio_@GST_MAJORMIN gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS)) GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstAudio \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstAudio \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ -I$(top_srcdir)/gst-libs \ diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am index aa5be32872..bed4edb37f 100644 --- a/gst-libs/gst/cdda/Makefile.am +++ b/gst-libs/gst/cdda/Makefile.am @@ -23,7 +23,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcdda_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/cdda/%',$(libgstcdda_@GST_MAJORMINOR@include_HEADERS)) GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstCdda \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstCdda \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index 59a2fffefd..b45b813ca7 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -52,7 +52,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/fft/%',$(libgstfft_@GST_MAJORMINOR@_include_HEADERS)) GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstFft \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstFft \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index 811c52a9a4..790b52aa24 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -80,7 +80,8 @@ gir_cincludes=$(patsubst %,--c-include='gst/interfaces/%',$(libgstinterfacesincl gir_cincludes+=$(patsubst %,--c-include='gst/interfaces/%',$(nodist_libgstinterfacesinclude_HEADERS)) GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am index d1f5d7b466..7a58109894 100644 --- a/gst-libs/gst/netbuffer/Makefile.am +++ b/gst-libs/gst/netbuffer/Makefile.am @@ -17,7 +17,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnetbuffer_@GST_MAJORMINOR@_la_SOUR gir_cincludes=$(patsubst %,--c-include='gst/netbuffer/%',$(libgstnetbufferinclude_HEADERS)) GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 432ebcb3e2..bdea805383 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -56,7 +56,8 @@ gir_cincludes=$(patsubst %,--c-include='gst/pbutils/%',$(libgstpbutils_@GST_MAJO gir_cincludes+=$(patsubst %,--c-include='gst/pbutils/%',$(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstPbutils \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstPbutils \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 0483f7a99e..ef10cdcd6f 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -27,7 +27,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/riff/%',$(libgstriff_@GST_MAJORMINOR@include_HEADERS)) GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstRiff \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstRiff \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index fe0079c508..42a3bba246 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -28,7 +28,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtp_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/rtp/%',$(libgstrtpinclude_HEADERS)) GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstRtp \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstRtp \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 4a6e670abc..1b515b24b7 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -59,7 +59,8 @@ gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstrtspinclude_HEADERS gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstrtspinclude_HEADERS)) GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstRtsp \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstRtsp \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am index 5946b87fc9..d1ad5c38f4 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am @@ -19,7 +19,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstsdp_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstsdpinclude_HEADERS)) GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstSdp \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstSdp \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index 0d90bcad85..b5ee2aae29 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -21,7 +21,8 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgsttag_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgsttainclude_HEADERS)) GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstTag \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstTag \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 93ff06f1d2..7dd93e3e4c 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -38,7 +38,8 @@ gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstvideo_@GST_MAJORMIN gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS)) GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace GstVideo \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(INTROSPECTION_SCANNER) -v --namespace GstVideo \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \