diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 16 | ||||
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 29 |
4 files changed, 58 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 46667d9..d34f32e 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,12 @@ AC_SUBST(DBUSMENUTESTS_LIBS) GOBJECT_INTROSPECTION_CHECK([0.6.7]) ########################### +# Vala API Generation +########################### + +AC_PATH_PROG([VALA_API_GEN], [vapigen]) + +########################### # Lib versioning ########################### diff --git a/debian/changelog b/debian/changelog index 589b8fb..1ad4ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low + + * Upstream Merge + * Adding in building of VAPI files + + -- Ted Gould <ted@ubuntu.com> Mon, 01 Mar 2010 10:50:08 -0600 + libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) lucid; urgency=low * debian/libdbusmenu-glib-dev.install, diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index dc3dbe1..1264525 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -125,3 +125,19 @@ CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) endif +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = DbusmenuGlib-0.2.vapi + +DbusmenuGlib-0.2.vapi: DbusmenuGlib-0.2.gir + $(VALA_API_GEN) --library=DbusmenuGlib-0.2 $< + +CLEANFILES += $(vapi_DATA) + +endif + diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index d14b4d5..e1b16a0 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -72,3 +72,32 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) endif + +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = DbusmenuGtk-0.2.vapi + +DbusmenuGtk-0.2.vapi: DbusmenuGtk-0.2.tmp.gir Makefile.am + $(VALA_API_GEN) --library=DbusmenuGtk-0.2 \ + --pkg gdk-pixbuf-2.0 \ + --pkg gtk+-2.0 \ + --pkg atk \ + --pkg DbusmenuGlib-0.2 \ + --vapidir=$(top_builddir)/libdbusmenu-glib \ + $< + +DbusmenuGtk-0.2.tmp.gir: DbusmenuGtk-0.2.gir + $(SED) \ + -e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \ + -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ + $< > $@ + +CLEANFILES += $(vapi_DATA) DbusmenuGtk-0.2.tmp.gir + +endif + |