gir-repository r143 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Mon Oct 20 20:56:00 2008
New Revision: 143
URL: http://svn.gnome.org/viewvc/gir-repository?rev=143&view=rev

Log:
Bug 556777 - Add GUPNP


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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 20 20:56:00 2008
@@ -130,6 +130,11 @@
                   have_gssdp=true, have_gssdp=false)
 AM_CONDITIONAL(BUILD_GSSDP, $have_gssdp)
 
+dnl gupnp
+PKG_CHECK_MODULES(GUPNP, gupnp-1.0,
+                  have_gupnp=true, have_gupnp=false)
+AM_CONDITIONAL(BUILD_GUPNP, $have_gupnp)
+
 AC_CONFIG_FILES([Makefile
                  gir/Makefile
                  gir-repository-1.0.pc])

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 20 20:56:00 2008
@@ -577,7 +577,8 @@
 GSSDP_LIBDIR=`pkg-config --variable=libdir gssdp-1.0`
 Gssdp-1.0.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace Gssdp --nsversion=1.0 \
-             --include=GObject-2.0.gir \
+	     --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
 	     --library=gssdp-1.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -587,6 +588,23 @@
 BUILT_GIRSOURCES += Gssdp-1.0.gir
 endif BUILD_GSSDP
 
+GUPNP_INCLUDEDIR=`pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0
+GUPNP_LIBDIR=`pkg-config --variable=libdir gupnp-1.0`
+Gupnp-1.0.gir: libxml2-2.0.gir Gssdp-1.0.gir Soup-2.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace Gupnp --nsversion=1.0 \
+	     --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
+             --include=libxml2-2.0 \
+             --include=Gssdp-1.0 \
+             --include=Soup-2.0 \
+	     --library=gupnp-1.0 \
+	     $(NOCLOSURE) \
+             --output $@ \
+             --pkg gupnp-1.0 \
+	     -I$(GUPNP_INCLUDEDIR) \
+             $(GUPNP_INCLUDEDIR)/libgupnp/*.h
+BUILT_GIRSOURCES += Gupnp-1.0.gir
+
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)