From e5933b7ccca264b6e0a4fa206d7402119ad6defe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:21:51 -0600 Subject: Looking for vapigen --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 46667d9..d34f32e 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,12 @@ AC_SUBST(DBUSMENUTESTS_LIBS) GOBJECT_INTROSPECTION_CHECK([0.6.7]) +########################### +# Vala API Generation +########################### + +AC_PATH_PROG([VALA_API_GEN], [vapigen]) + ########################### # Lib versioning ########################### -- cgit v1.2.3 From 1c3e46d6c67bf175fa2354e327488e74486294fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:28:25 -0600 Subject: Adding in VAPI generation --- libdbusmenu-glib/Makefile.am | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 + -- cgit v1.2.3 From 23736426a5804d2d17825c01dc661dd4dbb66dc3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:35:21 -0600 Subject: Generating the VAPI files --- libdbusmenu-gtk/Makefile.am | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index d14b4d5..b18d33c 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) + +endif + -- cgit v1.2.3 From 9e56feb947b96367299207cc1eef3761d96e0287 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:39:38 -0600 Subject: Adding the temp file to the clean stuff --- libdbusmenu-gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b18d33c..e1b16a0 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -97,7 +97,7 @@ DbusmenuGtk-0.2.tmp.gir: DbusmenuGtk-0.2.gir -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ $< > $@ -CLEANFILES += $(vapi_DATA) +CLEANFILES += $(vapi_DATA) DbusmenuGtk-0.2.tmp.gir endif -- cgit v1.2.3