diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-30 10:44:12 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-30 13:47:25 -0400 |
| commit | 82e08ec5f5f2440ed5be2e5ca5954ebac2eb7775 (patch) | |
| tree | 90512dfae632254505c8dcabffe376fd2bef194e /girepository | |
| parent | ebef2cf9f1c5de556afd839e0a4c13db373d4a50 (diff) | |
| download | gobject-introspection-82e08ec5f5f2440ed5be2e5ca5954ebac2eb7775.tar.gz | |
scanner: Don't link to -lgirepository when dumpingGOBJECT_INTROSPECTION_0_9_9
This helps us avoid a problematic case where in say jhbuild, using
a system (/usr/lib) glib, adding in -l girepository-1.0 will inject
-L /path/to/builddir, when we don't want that.
https://bugzilla.gnome.org/show_bug.cgi?id=630342
Diffstat (limited to 'girepository')
| -rw-r--r-- | girepository/Makefile.am | 4 | ||||
| -rw-r--r-- | girepository/gdump.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/girepository/Makefile.am b/girepository/Makefile.am index e0f2b1ba..16873220 100644 --- a/girepository/Makefile.am +++ b/girepository/Makefile.am @@ -53,7 +53,7 @@ libgirepository_1_0_la_SOURCES = \ giunioninfo.c \ givfuncinfo.c -libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) +libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) -DG_IREPOSITORY_COMPILATION libgirepository_1_0_la_LIBADD = $(GIREPO_LIBS) libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 @@ -69,3 +69,5 @@ libgirepository_parser_la_SOURCES = \ girwriter.h libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS) +gdumpdir = $(datadir)/gobject-introspection-1.0/ +gdump_DATA = gdump.c diff --git a/girepository/gdump.c b/girepository/gdump.c index 84ac3c71..166a9e72 100644 --- a/girepository/gdump.c +++ b/girepository/gdump.c @@ -24,8 +24,15 @@ #include <glib-object.h> #include <gio/gio.h> -#include "girepository.h" +/* This file is both compiled into libgirepository.so, and installed + * on the filesystem. But for the dumper, we want to avoid linking + * to libgirepository; see + * https://bugzilla.gnome.org/show_bug.cgi?id=630342 + */ +#ifdef G_IREPOSITORY_COMPILATION #include "config.h" +#include "girepository.h" +#endif #include <string.h> |