diff options
| author | Colin Walters <walters@src.gnome.org> | 2009-01-22 16:17:37 (GMT) |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2009-01-22 16:17:37 (GMT) |
| commit | 2636aab9c44e8a301b2f4745dfbc4e56cdf7f5ee (patch) | |
| tree | 2338345ea8c1e84d4b1e4310091fde1a4c4ba6d9 | |
| parent | 0bef902c54b7a638b58526dcb04270f2056012ac (diff) | |
Use correct pkg-config arguments for each gir
We should pass e.g. --pkg gobject-2.0 for GObject, and --pkg gio-2.0
for Gio to ensure that we're getting the right flags to the scanner,
even though girepository itself depends on these libraries.
svn path=/trunk/; revision=1064
| -rw-r--r-- | gir/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index 1a25e3d..c8c0ca4 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -68,7 +68,7 @@ GObject-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile -I$(GOBJECT_INCLUDEDIR) \ -I$(GOBJECT_LIBDIR)/glib-2.0/include \ -DGOBJECT_COMPILATION \ - --pkg glib-2.0 \ + --pkg gobject-2.0 \ $(GLIB_INCLUDEDIR)/gobject/*.h BUILT_GIRSOURCES += GObject-2.0.gir @@ -94,7 +94,7 @@ GModule-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) --library=$(GMODULE_LIBRARY) \ -I$(GMODULE_INCLUDEDIR) \ -I$(GMODULE_LIBDIR)/glib-2.0/include \ - --pkg glib-2.0 \ + --pkg gmodule-2.0 \ $(GLIB_INCLUDEDIR)/gmodule.h BUILT_GIRSOURCES += GModule-2.0.gir @@ -127,8 +127,7 @@ Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(srcdir)/g -I$(GIO_INCLUDEDIR) \ -I$(GIO_LIBDIR)/glib-2.0/include \ -DGIO_COMPILATION \ - --pkg glib-2.0 \ - --pkg gobject-2.0 \ + --pkg gio-2.0 \ $(srcdir)/gio-2.0.c \ $(GLIB_INCLUDEDIR)/gio/*.h \ $(GIO_UNIX_HDRS) |