From c4a4f2dad26dad50fd0f6ffb17f49a85879e2090 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 31 Mar 2010 10:43:04 +0100 Subject: [PATCH] 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 Based on patches by Vincent Untz and Alan Knowles. Fixes #603710. --- gst/Makefile.am | 2 +- libs/gst/base/Makefile.am | 2 +- libs/gst/check/Makefile.am | 2 +- libs/gst/controller/Makefile.am | 2 +- libs/gst/dataprotocol/Makefile.am | 2 +- libs/gst/net/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gst/Makefile.am b/gst/Makefile.am index 73ca337..e127a09 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -255,7 +255,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@ -I$(top_builddir) \ -DIN_GOBJECT_INTROSPECTION=1 \ --c-include='gst/gst.h' \ - --library=gstreamer-0.10 \ + --library=libgstreamer-0.10.la \ --include=GLib-2.0 \ --include=GObject-2.0 \ --include=GModule-2.0 \ diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index d43a7a5..eade3fa 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -60,7 +60,7 @@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINO -I$(top_srcdir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ - --library=gstbase-0.10 \ + --library=libgstbase-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-0.10 \ diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index a94df7d..6655499 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -118,7 +118,7 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI -I$(top_srcdir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ - --library=gstcheck-0.10 \ + --library=libgstcheck-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-0.10 \ diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am index 2b1a1ec..03417cb 100644 --- a/libs/gst/controller/Makefile.am +++ b/libs/gst/controller/Makefile.am @@ -47,7 +47,7 @@ GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@G -I$(top_srcdir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ - --library=gstcontroller-0.10 \ + --library=libgstcontroller-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-0.10 \ diff --git a/libs/gst/dataprotocol/Makefile.am b/libs/gst/dataprotocol/Makefile.am index e170b23..b02bc09 100644 --- a/libs/gst/dataprotocol/Makefile.am +++ b/libs/gst/dataprotocol/Makefile.am @@ -37,7 +37,7 @@ GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotoco -I$(top_srcdir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ - --library=gstdataprotocol-0.10 \ + --library=libgstdataprotocol-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-0.10 \ diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index be22079..3d44cf2 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -38,7 +38,7 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@ -I$(top_srcdir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ - --library=gstnet-0.10 \ + --library=libgstnet-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-0.10 \ -- 2.7.4