summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2010-04-03 14:03:45 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-04-03 14:03:45 +0100
commit764c899215f6e61b45be92a041b92687bd2afa0b (patch)
tree28d15fb86feb522686fa443de157a404dd52e8dc
parent718edb5c14504af3cece18071b4bfe00f18c03eb (diff)
libs: point gobject-introspection scanner to .la files
Point g-ir-scanner to the .la file of our library, which hopefully makes it find the right dependencies in all cases (ie. our locally built libgstreamer and not the system-installed one). This is also how it's done in Gtk+ and how it's documented in the wiki, see http://live.gnome.org/GObjectIntrospection/AutotoolsIntegration Fixes #603710.
-rw-r--r--gst-libs/gst/app/Makefile.am2
-rw-r--r--gst-libs/gst/audio/Makefile.am2
-rw-r--r--gst-libs/gst/cdda/Makefile.am2
-rw-r--r--gst-libs/gst/fft/Makefile.am2
-rw-r--r--gst-libs/gst/interfaces/Makefile.am2
-rw-r--r--gst-libs/gst/netbuffer/Makefile.am2
-rw-r--r--gst-libs/gst/pbutils/Makefile.am2
-rw-r--r--gst-libs/gst/riff/Makefile.am2
-rw-r--r--gst-libs/gst/rtp/Makefile.am2
-rw-r--r--gst-libs/gst/rtsp/Makefile.am2
-rw-r--r--gst-libs/gst/sdp/Makefile.am2
-rw-r--r--gst-libs/gst/tag/Makefile.am2
-rw-r--r--gst-libs/gst/video/Makefile.am2
13 files changed, 13 insertions, 13 deletions
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 31e538734..291aae79b 100644
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -49,7 +49,7 @@ GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@
-I$(top_builddir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
- --library=gstapp-0.10 \
+ --library=libgstapp-0.10.la \
--include=Gst-0.10 \
--include=GstBase-0.10 \
--libtool="$(top_builddir)/libtool" \
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 9db5fb2a7..191e5ccc4 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -78,7 +78,7 @@ GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMI
--add-include-path=$(builddir)/../interfaces \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
- --library=gstaudio-0.10 \
+ --library=libgstaudio-0.10.la \
--include=Gst-0.10 \
--include=GstBase-0.10 \
--include=GstInterfaces-0.10 \
diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am
index 03f9cc6fd..414f2a243 100644
--- a/gst-libs/gst/cdda/Makefile.am
+++ b/gst-libs/gst/cdda/Makefile.am
@@ -31,7 +31,7 @@ GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINO
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
--add-include-path=$(builddir)/../tag \
- --library=gstcdda-0.10 \
+ --library=libgstcdda-0.10.la \
--include=Gst-0.10 \
--include=GstBase-0.10 \
--include=GstTag-0.10 \
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index 770f52486..9cfd0066f 100644
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -58,7 +58,7 @@ GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@
--strip-prefix=Gst \
$(gir_cincludes) \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
- --library=gstfft-0.10 \
+ --library=libgstfft-0.10.la \
--include=Gst-0.10 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 373191c4e..097776aef 100644
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -89,7 +89,7 @@ GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@G
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
- --library=gstinterfaces-0.10 \
+ --library=libgstinterfaces-0.10.la \
--include=Gst-0.10 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am
index b4d41713e..76d1fbfd0 100644
--- a/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@ -23,7 +23,7 @@ GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST
--strip-prefix=Gst \
$(gir_cincludes) \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
- --library=gstnetbuffer-0.10 \
+ --library=libgstnetbuffer-0.10.la \
--include=Gst-0.10 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 15b92fbcb..fe635e50c 100644
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -65,7 +65,7 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
- --library=gstpbutils-0.10 \
+ --library=libgstpbutils-0.10.la \
--include=Gst-0.10 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 79e871bec..c0bdb92c5 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -37,7 +37,7 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINO
--add-include-path=$(builddir)/../tag \
--add-include-path=$(builddir)/../audio \
--add-include-path=$(builddir)/../interfaces \
- --library=gstriff-0.10 \
+ --library=libgstriff-0.10.la \
--include=GstAudio-0.10 \
--include=GstTag-0.10 \
--include=Gst-0.10 \
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
index 82a15a68c..bdd57bfdf 100644
--- a/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@ -36,7 +36,7 @@ GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@
-I$(top_srcdir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
- --library=gstrtp-0.10 \
+ --library=libgstrtp-0.10.la \
--include=Gst-0.10 \
--include=GstBase-0.10 \
--libtool="$(top_builddir)/libtool" \
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 3e940a76f..7a4511e15 100644
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -69,7 +69,7 @@ GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINO
-I$(top_srcdir)/gst-libs \
--add-include-path=$(builddir)/../sdp \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
- --library=gstrtsp-0.10 \
+ --library=libgstrtsp-0.10.la \
--include=Gst-0.10 \
--include=GstSdp-0.10 \
--libtool="$(top_builddir)/libtool" \
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
index c94743f3b..ddeb7fcd9 100644
--- a/gst-libs/gst/sdp/Makefile.am
+++ b/gst-libs/gst/sdp/Makefile.am
@@ -26,7 +26,7 @@ GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@
$(gir_cincludes) \
-I$(top_srcdir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
- --library=gstsdp-0.10 \
+ --library=libgstsdp-0.10.la \
--include=Gst-0.10 \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-0.10 \
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index deaf88d77..156a5c929 100644
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -33,7 +33,7 @@ GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@
$(gir_cincludes) \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
- --library=gsttag-0.10 \
+ --library=libgsttag-0.10.la \
--include=Gst-0.10 \
--include=GstBase-0.10 \
--libtool="$(top_builddir)/libtool" \
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index cfccb2244..07e562130 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -47,7 +47,7 @@ GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMI
-I$(top_builddir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
- --library=gstvideo-0.10 \
+ --library=libgstvideo-0.10.la \
--include=Gst-0.10 \
--include=GstBase-0.10 \
--libtool="$(top_builddir)/libtool" \