ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/dbusmenu/fix-vapi-files/+merge/25700
  proposed by: Ted Gould (ted)
  review: Approve - Conor Curran (cjcurran)
------------------------------------------------------------
revno: 100 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-05-20 13:36:17 -0500
message:
  Fix the construction of the VAPI files.
modified:
  .bzrignore
  libdbusmenu-glib/Makefile.am
  libdbusmenu-gtk/Makefile.am


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription

=== modified file '.bzrignore'
--- .bzrignore	2010-02-28 19:54:03 +0000
+++ .bzrignore	2010-05-20 16:12:29 +0000
@@ -64,7 +64,10 @@
 tests/test-glib-proxy-server
 tests/test-glib-proxy-proxy
 tests/test-glib-proxy
-libdbusmenu-glib/DbusmenuGlib-0.2.gir
-libdbusmenu-glib/DbusmenuGlib-0.2.typelib
+libdbusmenu-glib/Dbusmenu-Glib-0.2.gir
+libdbusmenu-glib/Dbusmenu-Glib-0.2.typelib
+libdbusmenu-glib/Dbusmenu-Glib-0.2.vapi
 libdbusmenu-gtk/DbusmenuGtk-0.2.gir
+libdbusmenu-gtk/DbusmenuGtk-0.2.tmp.gir
 libdbusmenu-gtk/DbusmenuGtk-0.2.typelib
+libdbusmenu-gtk/DbusmenuGtk-0.2.vapi

=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2010-03-02 16:11:23 +0000
+++ libdbusmenu-glib/Makefile.am	2010-05-20 15:30:06 +0000
@@ -99,21 +99,24 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(srcdir) \
+	$(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
 
 introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
 
-DbusmenuGlib-0.2.gir: libdbusmenu-glib.la
-DbusmenuGlib_0_2_gir_INCLUDES = \
+Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
+Dbusmenu_Glib_0_2_gir_INCLUDES = \
 	GObject-2.0
-DbusmenuGlib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
-DbusmenuGlib_0_2_gir_LIBS = libdbusmenu-glib.la
-DbusmenuGlib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
+Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
+Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
 
-INTROSPECTION_GIRS += DbusmenuGlib-0.2.gir
+INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -132,10 +135,10 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = DbusmenuGlib-0.2.vapi
+vapi_DATA = Dbusmenu-Glib-0.2.vapi
 
-DbusmenuGlib-0.2.vapi: DbusmenuGlib-0.2.gir
-	$(VALA_API_GEN) --library=DbusmenuGlib-0.2 $<
+Dbusmenu-Glib-0.2.vapi: Dbusmenu-Glib-0.2.gir
+	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $<
 
 CLEANFILES += $(vapi_DATA)
 

=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2010-03-02 16:11:23 +0000
+++ libdbusmenu-gtk/Makefile.am	2010-05-20 16:09:29 +0000
@@ -45,7 +45,10 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libdbusmenu-glib
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(srcdir) \
+	--add-include-path=$(top_builddir)/libdbusmenu-glib \
+	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 
 if HAVE_INTROSPECTION
@@ -56,7 +59,7 @@
 DbusmenuGtk_0_2_gir_INCLUDES = \
 	GObject-2.0 \
 	Gtk-2.0 \
-	DbusmenuGlib-0.2
+	Dbusmenu-Glib-0.2
 DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
 DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk.la
 DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
@@ -87,7 +90,7 @@
 		--pkg gdk-pixbuf-2.0 \
 		--pkg gtk+-2.0 \
 		--pkg atk \
-		--pkg DbusmenuGlib-0.2 \
+		--pkg Dbusmenu-Glib-0.2 \
 		--vapidir=$(top_builddir)/libdbusmenu-glib \
 		$<