[vte] build: Provide VAPI



commit 080c8b4d88ec33597e71c4b4822fc784f9bc97e4
Author: Christian Persch <chpe gnome org>
Date:   Tue Apr 24 20:53:26 2012 +0200

    build: Provide VAPI
    
    Conflicts:
        configure.ac
        src/Makefile.am

 Makefile.am     |    1 +
 configure.ac    |   15 ++++++++++++---
 src/Makefile.am |   28 ++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f50603d..4230607 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ pkgconfig_DATA = vte-$(VTE_API_VERSION).pc
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
        --disable-introspection \
+       --disable-vala \
        --disable-silent-rules \
        --with-gtk=3.0
 
diff --git a/configure.ac b/configure.ac
index 33c6665..931c916 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,9 +339,9 @@ fi
   
 AM_CONDITIONAL([ENABLE_GLADE_CATALOGUE],[test "$enable_glade_catalogue" = "yes"])
 
-# *************
-# Introspection
-# *************
+# ********
+# Bindings
+# ********
 
 # No automagic please!
 if test -z "$enable_introspection"; then
@@ -350,6 +350,13 @@ fi
 
 GOBJECT_INTROSPECTION_CHECK([0.9.0])
 
+# No automagic please!
+if test -z "$enable_vala"; then
+  enable_vala=no
+fi
+
+VAPIGEN_CHECK([0.16])
+
 ################################################################################
 
 GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
@@ -401,4 +408,6 @@ cat <<EOF | tee -a config.log
 Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION
        Installing Glade catalogue: $enable_glade_catalogue
        Debugging: $enable_debug
+       Introspection: $enable_introspection
+        Vala bindings: $enable_vala
 EOF
diff --git a/src/Makefile.am b/src/Makefile.am
index a48f92e..917254d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,6 +181,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
+include $(INTROSPECTION_MAKEFILE)
 
 Vte- VTE_API_VERSION@.gir: libvte-$(VTE_API_VERSION).la
 Vte_ VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION)
@@ -206,7 +207,31 @@ typelibdir = $(libdir)/girepository-1.0
 nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA)
-endif
+
+if ENABLE_VAPIGEN
+include $(VAPIGEN_MAKEFILE)
+
+VAPIGEN_VAPIS = Vte-$(VTE_API_VERSION).vapi
+
+Vte- VTE_API_VERSION@.vapi: Vte-$(VTE_API_VERSION).gir
+Vte_ VTE_API_VERSION_U@_vapi_DEPS = \
+       glib-2.0 \
+       gio-2.0 \
+       pango \
+       gdk-$(GTK_API_VERSION) \
+       gtk+-$(GTK_API_VERSION) \
+       $(NULL)
+Vte_ VTE_API_VERSION_U@_vapi_METADATADIRS = $(srcdir)
+Vte_ VTE_API_VERSION_U@_vapi_FILES = Vte-$(VTE_API_VERSION).gir
+
+vapidir = $(datadir)/vala/vapi
+nodist_vapi_DATA = $(VAPIGEN_VAPIS)
+
+CLEANFILES += $(nodist_vapi_DATA)
+
+endif # ENABLE_VAPIGEN
+
+endif # HAVE_INTROSPECTION
 
 # Misc unit tests and utilities
 
@@ -353,4 +378,3 @@ dist_profile_DATA = vte.sh
 .DELETE_ON_ERROR:
 
 -include $(top_srcdir)/git.mk
--include $(INTROSPECTION_MAKEFILE)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]