gir-repository r209 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Wed Nov 12 19:38:28 2008
New Revision: 209
URL: http://svn.gnome.org/viewvc/gir-repository?rev=209&view=rev

Log:
Fix up NautilusExtension to be just Nautilus, add GMenu

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Nov 12 19:38:28 2008
@@ -17,20 +17,14 @@
 
 # GObject Introspection, required
 PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0 >= 0.6.0])
-
 G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
 AC_SUBST(G_IR_SCANNER)
-
 G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
 AC_SUBST(G_IR_COMPILER)
-
 G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
 AC_SUBST(G_IR_GENERATE)
-
-
 GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 AC_SUBST(GIRDIR)
-
 TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 AC_SUBST(TYPELIBDIR)
 
@@ -109,9 +103,9 @@
 AM_CONDITIONAL(BUILD_BABL, $have_babl)
 
 dnl nautilus-extension
-PKG_CHECK_MODULES(NAUTILUSEXTENSION, libnautilus-extension,
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension,
 		  have_nautilusextension=true, have_nautilusextension=false)
-AM_CONDITIONAL(BUILD_NAUTILUSEXTENSION, $have_nautilusextension)
+AM_CONDITIONAL(BUILD_NAUTILUS, $have_nautilusextension)
 
 dnl gnome-keyring
 PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1,
@@ -213,6 +207,11 @@
                   have_unique=true, have_unique=false)
 AM_CONDITIONAL(BUILD_UNIQUE, $have_unique)
 
+dnl gmenu
+PKG_CHECK_MODULES(GMENU, libgnome-menu,
+		  have_gmenu=true, have_gmenu=false)
+AM_CONDITIONAL(BUILD_GMENU, $have_gmenu)
+
 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	Wed Nov 12 19:38:28 2008
@@ -693,10 +693,10 @@
 BUILT_GIRSOURCES += Unique-1.0.gir
 endif BUILD_UNIQUE
 
-if BUILD_NAUTILUSEXTENSION
-NAUTILUSEXTENSION_INCLUDEDIR=`pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
-NAUTILUSEXTENSION_LIBDIR=`pkg-config --variable=libdir libnautilus-extension`
-NautilusExtension-1.0.gir: Gtk-2.0.gir $(G_IR_SCANNER)
+if BUILD_NAUTILUS
+NAUTILUS_INCLUDEDIR=`pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
+NAUTILUS_LIBDIR=`pkg-config --variable=libdir libnautilus-extension`
+Nautilus-1.0.gir: Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Nautilus --nsversion=1.0 \
             --add-include-path=$(srcdir) --add-include-path=\
             --include=Gtk-2.0 \
@@ -704,10 +704,26 @@
             --output $@ \
             --pkg libnautilus-extension \
             --pkg gtk+-2.0 \
-            -I$(NAUTILUSEXTENSION_INCLUDEDIR) \
-            $(NAUTILUSEXTENSION_INCLUDEDIR)/*.h \
-BUILT_GIRSOURCES += NautilusExtension-1.0.gir
-endif BUILD_NAUTILUSEXTENSION
+            -I$(NAUTILUS_INCLUDEDIR) \
+            $(NAUTILUS_INCLUDEDIR)/*.h
+BUILT_GIRSOURCES += Nautilus-1.0.gir
+endif
+
+if BUILD_GMENU
+GMENU_INCLUDEDIR=`pkg-config --variable=includedir libgnome-menu`/gnome-menus
+GMENU_LIBDIR=`pkg-config --variable=libdir libgnome-menu`
+GMenu-1.0.gir: Gtk-2.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace GMenu --nsversion=2.0 \
+            --add-include-path=$(srcdir) --add-include-path=. \
+            --include=Gtk-2.0 \
+            --library=gnome-menu \
+            --output $@ \
+            --pkg libgnome-menu \
+             -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+            -I$(GMENU_INCLUDEDIR) \
+            $(GMENU_INCLUDEDIR)/*.h
+BUILT_GIRSOURCES += GMenu-1.0.gir
+endif
 
 girdir = $(GIRDIR)
 dist_gir_DATA = $(CUSTOM_GIRSOURCES)