summaryrefslogtreecommitdiff
path: root/Makefile-gir.am
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-10-20 10:42:17 -0400
committerColin Walters <walters@verbum.org>2010-11-11 17:12:53 -0500
commit19040edfd027b86ac60139557cc5dee5dbd7fc04 (patch)
tree3f9cb80eef2a20f8259d497b02a340a6162da6d0 /Makefile-gir.am
parent57ef2d4fe73c5cdf8500c5761c700638943d1c7d (diff)
downloadgobject-introspection-19040edfd027b86ac60139557cc5dee5dbd7fc04.tar.gz
dumper: Differentiate between "external" and "internal" linking
The previous commit aea515709 broke scanning for libraries not in the current directory, such as scanning Gio from gobject-introspection. In this case, it's wrong to add -L., and to move the other -L behind the library. Instead, we should just do a "normal" link using pkg-config --libs with few games. https://bugzilla.gnome.org/show_bug.cgi?id=632701
Diffstat (limited to 'Makefile-gir.am')
-rw-r--r--Makefile-gir.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 169f4623..062eb85b 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -53,6 +53,7 @@ endif
GLib_2_0_gir_LIBS = $(GLIB_LIBRARY)
GLib_2_0_gir_SCANNERFLAGS = \
+ --external-library \
--reparse-validate \
--identifier-prefix=G \
--symbol-prefix=g \
@@ -91,6 +92,7 @@ GObject-2.0.gir: GLib-2.0.gir
GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY)
GObject_2_0_gir_SCANNERFLAGS = \
+ --external-library \
--reparse-validate \
--identifier-prefix=G \
--c-include="glib-object.h" \
@@ -121,6 +123,7 @@ GModule-2.0.gir: GLib-2.0.gir
GModule_2_0_gir_LIBS = $(GMODULE_LIBRARY)
GModule_2_0_gir_SCANNERFLAGS = \
+ --external-library \
--identifier-prefix=G \
--c-include="gmodule.h" \
--add-include-path=. \
@@ -157,6 +160,7 @@ Gio-2.0.gir: GObject-2.0.gir
Gio_2_0_gir_LIBS = $(GIO_LIBRARY)
Gio_2_0_gir_SCANNERFLAGS = \
+ --external-library \
--reparse-validate \
--warn-all \
--identifier-prefix=G \