gobject-introspection r1064 - trunk/gir

[walters svn gnome org]

Author: walters
Date: Thu Jan 22 16:17:37 2009
New Revision: 1064
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=1064&view=rev

Log:
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.

Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Jan 22 16:17:37 2009
@@ -68,7 +68,7 @@
 	    -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 @@
 	    --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 @@
 	    -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)