ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/libindicate/vapi-and-friends into lp:libindicate.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Build the VAPI files for Conor.
-- 
https://code.launchpad.net/~ted/libindicate/vapi-and-friends/+merge/24599
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== modified file 'configure.ac'
--- configure.ac	2010-03-11 22:20:03 +0000
+++ configure.ac	2010-05-03 19:14:19 +0000
@@ -82,6 +82,12 @@
 GOBJECT_INTROSPECTION_CHECK([0.6.3])
 
 ###########################
+# Vala API Generation
+###########################
+
+AC_PATH_PROG([VALA_API_GEN], [vapigen])
+
+###########################
 # GTK Doc 
 ###########################
 

=== modified file 'libindicate-gtk/Makefile.am'
--- libindicate-gtk/Makefile.am	2010-03-11 22:07:51 +0000
+++ libindicate-gtk/Makefile.am	2010-05-03 19:14:19 +0000
@@ -80,3 +80,31 @@
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 
 endif
+
+#########################
+# VAPI Files
+#########################
+
+if HAVE_INTROSPECTION
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = Indicate-Gtk-0.2.vapi
+
+Indicate-Gtk-0.2.vapi: Indicate-Gtk-0.2.tmp.gir Makefile.am
+	$(VALA_API_GEN) --library=Indicate-Gtk-0.2 \
+		--pkg gtk+-2.0 \
+		--pkg DbusmenuGlib-0.2 \
+		--pkg Indicate-0.2 \
+		--vapidir=$(top_builddir)/libindicate \
+		$<
+
+Indicate-Gtk-0.2.tmp.gir: Indicate-Gtk-0.2.gir
+	$(SED) \
+		-e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \
+		-e "s|Atk.ImplementorIface|Atk.Implementor|g" \
+		$< > $@
+
+CLEANFILES += $(vapi_DATA) Indicate-Gtk-0.2.tmp.gir
+
+endif
+

=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2010-03-09 16:40:11 +0000
+++ libindicate/Makefile.am	2010-05-03 19:14:19 +0000
@@ -141,3 +141,24 @@
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 
 endif
+
+#########################
+# VAPI Files
+#########################
+
+if HAVE_INTROSPECTION
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = Indicate-0.2.vapi
+
+Indicate-0.2.vapi: Indicate-0.2.gir Makefile.am
+	$(VALA_API_GEN) --library=Indicate-0.2 \
+		--pkg glib-2.0 \
+		--pkg DbusmenuGlib-0.2 \
+		--vapidir=$(top_builddir)/src \
+		$<
+
+CLEANFILES += $(vapi_DATA)
+
+endif
+