From 1ae28ed41c66078b3943e667692b26f596c64279 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 11 Jan 2011 13:47:38 +0000 Subject: [PATCH] gobject-introspection: make g-ir-scanner try harder to find the right libgstreamer It's not quite clear to me why g-ir-scanner doesn't get this info from the pkg-config file, nor why libtool doesn't get it from the .la. https://bugzilla.gnome.org/show_bug.cgi?id=637549 --- libs/gst/base/Makefile.am | 1 + libs/gst/check/Makefile.am | 1 + libs/gst/controller/Makefile.am | 1 + libs/gst/dataprotocol/Makefile.am | 1 + libs/gst/net/Makefile.am | 1 + 5 files changed, 5 insertions(+) diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index 5fe3d3aef..01ed290d0 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -65,6 +65,7 @@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINO -I$(top_builddir)/libs \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ --library=libgstbase-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index b3f058163..fa3ce48a6 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -125,6 +125,7 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI -I$(top_builddir)/libs \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ --library=libgstcheck-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am index 4021a93fb..8c0a042d5 100644 --- a/libs/gst/controller/Makefile.am +++ b/libs/gst/controller/Makefile.am @@ -48,6 +48,7 @@ GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@G -I$(top_builddir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ --library=libgstcontroller-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ diff --git a/libs/gst/dataprotocol/Makefile.am b/libs/gst/dataprotocol/Makefile.am index 4d1994e70..5744cd976 100644 --- a/libs/gst/dataprotocol/Makefile.am +++ b/libs/gst/dataprotocol/Makefile.am @@ -38,6 +38,7 @@ GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotoco -I$(top_builddir) \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ --library=libgstdataprotocol-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index 5d34e45ce..65c0be375 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -41,6 +41,7 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@ -I$(top_builddir)/libs \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ --library=libgstnet-0.10.la \ --include=Gst-0.10 \ --libtool="$(top_builddir)/libtool" \ -- 2.39.2