projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 718edb5)
libs: point gobject-introspection scanner to .la files
authorVincent Untz <vuntz@gnome.org>
Sat, 3 Apr 2010 13:03:45 +0000 (14:03 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 3 Apr 2010 13:03:45 +0000 (14:03 +0100)
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.

13 files changed:
gst-libs/gst/app/Makefile.am patch | blob | history
gst-libs/gst/audio/Makefile.am patch | blob | history
gst-libs/gst/cdda/Makefile.am patch | blob | history
gst-libs/gst/fft/Makefile.am patch | blob | history
gst-libs/gst/interfaces/Makefile.am patch | blob | history
gst-libs/gst/netbuffer/Makefile.am patch | blob | history
gst-libs/gst/pbutils/Makefile.am patch | blob | history
gst-libs/gst/riff/Makefile.am patch | blob | history
gst-libs/gst/rtp/Makefile.am patch | blob | history
gst-libs/gst/rtsp/Makefile.am patch | blob | history
gst-libs/gst/sdp/Makefile.am patch | blob | history
gst-libs/gst/tag/Makefile.am patch | blob | history
gst-libs/gst/video/Makefile.am patch | blob | history

diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 31e538734e28d7d80e0d57cc53509ed6a715c0cb..291aae79bf8931b3cc2378b7977f79c1ee2283a0 100644 (file)
--- 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 9db5fb2a79322040f061cdf40d24d7f37ead5dce..191e5ccc47edb4903a12e7a9b48584baf9e8efe0 100644 (file)
--- 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 03f9cc6fdeb393dd9349377a48fdba0762b274f4..414f2a243a44fadcc2da4a9ae1b547515e854645 100644 (file)
--- 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 770f5248696d3435b8e5a0a63766a60618245e3f..9cfd0066fdd5e0c6dc5e4a2cd5dbd79d04dce2d7 100644 (file)
--- 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 373191c4e96456a1ac05920ba9247ec69b96bc89..097776aef5d6454e596204797b25cca68e01a467 100644 (file)
--- 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 b4d41713e919264599829e05e4071445de9a065a..76d1fbfd0bc23005bdb2fb4e9186f692bcb5b37b 100644 (file)
--- 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 15b92fbcbf190c81bbd86680e592c0040ff21a29..fe635e50cd68b7cec33c850e797879054f68009a 100644 (file)
--- 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 79e871bec642fd0e0d4083d58b3a1495d460e837..c0bdb92c5f08e5a24cab7e214922395f8b88dfd1 100644 (file)
--- 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 82a15a68cc2486ee69074e19670fd3a2984ff8c5..bdd57bfdf08f3b0ea77ecadee3c5e597dff21498 100644 (file)
--- 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 3e940a76fd9c0ecb3b97a6bc54ad7e5267ce6954..7a4511e15981078dfeb712de66bf0259557f5e79 100644 (file)
--- 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 c94743f3b5a5ed6859c2953952a65a8fb2bff6c1..ddeb7fcd915d40e0e69e80b2ff76227395d8fdfe 100644 (file)
--- 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 deaf88d77b54208b9ebbaebf74068c55c594b7f5..156a5c929f812fef64f66ec7b5970db40d04b570 100644 (file)
--- 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 cfccb224492d05f0115a6222d1526d04af991ceb..07e5621304c273683bca9063d55ecc519e5114a6 100644 (file)
--- 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" \
Domain: Multimedia / Media Common;