gir-repository r195 - in trunk: . gir

[kamstrup svn gnome org]

Author: kamstrup
Date: Tue Nov  4 19:45:00 2008
New Revision: 195
URL: http://svn.gnome.org/viewvc/gir-repository?rev=195&view=rev

Log:
2008-11-04  Mikkel Kamstrup Erlandsen <mikkel kamstrup gmail com>

	* gir/Makefile.am: Add libsoup-2.4 package to gupnp and use GIRDIR
	as extra includedir for g-ir-compiler. This makes g-ir-* respect
	the paths extracted from pkg-config


Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Nov  4 19:45:00 2008
@@ -634,6 +634,7 @@
 	     --library=gupnp-1.0 \
 	     $(NOCLOSURE) \
              --output $@ \
+             --pkg libsoup-2.4 \
              --pkg gupnp-1.0 \
 	     -I$(GUPNP_INCLUDEDIR) \
              $(GUPNP_INCLUDEDIR)/libgupnp/*.h
@@ -696,7 +697,7 @@
 	$(G_IR_SCANNER) --xpath-assertions=$(srcdir)/$*.xpath $*.gir
 
 %.typelib: %.gir
-	$(DEBUG) $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
+	$(DEBUG) $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=$(GIRDIR) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
 %.typelib.gdb: %.gir
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $@