From 5b0ea10ca057ffe594c17e8f96b08c5293baa570 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Jul 2013 16:13:37 -0400 Subject: generate vapi --- autogen.sh | 14 ++++++++++---- configure.ac | 17 +++++++++++++++++ libmessaging-menu/Makefile.am | 18 ++++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index ab2f513..1abf3a7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,11 @@ -#!/bin/sh -e +#!/bin/sh -gtkdocize -autoreconf -i -f -intltoolize +PKG_NAME="indicator-messages" + +which gnome-autogen.sh || { + echo "You need gnome-common from GNOME SVN" + exit 1 +} + +USE_GNOME2_MACROS=1 \ +. gnome-autogen.sh diff --git a/configure.ac b/configure.ac index b020d30..b699b4f 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,22 @@ else fi AC_SUBST(DBUSSERVICEDIR) +########################### +# Vala API Generation +########################### + +AC_ARG_ENABLE([vala], + AC_HELP_STRING([--disable-vala], [Disable vala]), + [enable_vala=$enableval], [enable_vala=yes]) + +AS_IF([test "x$enable_vala" != "xno"],[ + AM_COND_IF([HAVE_INTROSPECTION],,[ + AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) + ]) +AC_PATH_PROG([VALA_API_GEN], [vapigen]) +]) +AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) + ############################## # Custom Junk ############################## @@ -197,5 +213,6 @@ Messaging Indicator Configuration: gtest: $enable_tests gcov: $use_gcov introspecion: $enable_introspection + Vala bindings: $enable_vala documentation: $enable_gtk_doc ]) diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am index d18538b..4840582 100644 --- a/libmessaging-menu/Makefile.am +++ b/libmessaging-menu/Makefile.am @@ -56,4 +56,22 @@ typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES = $(gir_DATA) $(typelib_DATA) + + +######################### +# VAPI Files +######################### + +if HAVE_VALA + +vapidir = $(datadir)/vala/vapi +vapi_DATA = MessagingMenu-1.0.vapi + +MessagingMenu-1.0.vapi: MessagingMenu-1.0.gir + $(VALA_API_GEN) --library=MessagingMenu-1.0 $< + +CLEANFILES += $(vapi_DATA) + +endif + endif -- cgit v1.2.3 From 1d280a9153c569e96354e75398f83390db99c68a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 12 Jul 2013 11:10:10 -0400 Subject: added gio-2.0 to vapigen --- libmessaging-menu/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am index 4840582..1042d9f 100644 --- a/libmessaging-menu/Makefile.am +++ b/libmessaging-menu/Makefile.am @@ -68,7 +68,7 @@ vapidir = $(datadir)/vala/vapi vapi_DATA = MessagingMenu-1.0.vapi MessagingMenu-1.0.vapi: MessagingMenu-1.0.gir - $(VALA_API_GEN) --library=MessagingMenu-1.0 $< + $(VALA_API_GEN) --pkg gio-2.0 --library=MessagingMenu-1.0 $< CLEANFILES += $(vapi_DATA) -- cgit v1.2.3 From 499a978bdb6920e1c59ae0d679b9049b80c64e3b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 12 Jul 2013 12:58:40 -0400 Subject: bumped build depends for gtk to match required version in configure.ac --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b002d45..f16f831 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), libdbusmenu-gtk3-dev (>= 0.5.90), libgirepository1.0-dev (>= 0.9.12), libgtest-dev, - libgtk-3-dev (>= 3.5.12), + libgtk-3-dev (>= 3.5.18), libindicator3-dev, libtelepathy-glib-dev (>= 0.9.0), valac, -- cgit v1.2.3