[tepl] amtk: build: drop vapigen
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] amtk: build: drop vapigen
- Date: Fri, 14 Jul 2017 14:02:04 +0000 (UTC)
commit 86809fb79dc7614dc011b52fd71a4b81e6e87acd
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Jul 13 18:32:02 2017 +0200
amtk: build: drop vapigen
vapigen is confused with Amtk. If someone knows how to fix it, I would
be happy to re-include vapigen.
I've tried the VAPIGEN_GIRDIRS and VAPIGEN_VAPIDIRS options, without
success.
Also I don't know why, but the generated amtk vapi was empty.
Normally the gir is sufficient to use the libraries in Vala, AFAIK.
Makefile.am | 2 +-
amtk/Makefile.am | 26 --------------------------
configure.ac | 5 -----
tepl/Makefile.am | 26 --------------------------
4 files changed, 1 insertions(+), 58 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0d74cee..fc49cf6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = po amtk tepl tests testsuite docs
@CODE_COVERAGE_RULES@
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --enable-vala
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
pkgconfig_DATA = tepl-$(TEPL_API_VERSION).pc
DISTCLEANFILES = $(pkgconfig_DATA)
diff --git a/amtk/Makefile.am b/amtk/Makefile.am
index 1ff12d4..3b3d7b4 100644
--- a/amtk/Makefile.am
+++ b/amtk/Makefile.am
@@ -92,30 +92,4 @@ CLEANFILES += \
endif # HAVE_INTROSPECTION
-if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
-
-amtk-@TEPL_API_VERSION@.vapi: Amtk-@TEPL_API_VERSION@.gir
-
-VAPIGEN_VAPIS = amtk-@TEPL_API_VERSION@.vapi
-
-amtk_@TEPL_API_VERSION@_vapi_DEPS = gtk+-3.0
-
-amtk-@TEPL_API_VERSION@.deps:
- $(AM_V_GEN) for pkg in $(amtk_@TEPL_API_VERSION@_vapi_DEPS); do \
- echo $$pkg >> $@; \
- done
-
-amtk_@TEPL_API_VERSION@_vapi_METADATADIRS = $(srcdir)
-amtk_@TEPL_API_VERSION@_vapi_FILES = Amtk-@TEPL_API_VERSION@.gir
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = \
- amtk-@TEPL_API_VERSION@.vapi \
- amtk-@TEPL_API_VERSION@.deps
-
-CLEANFILES += $(vapi_DATA)
-
-endif # ENABLE_VAPIGEN
-
-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 8b5f10f..8f0d595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,10 +122,6 @@ AM_CONDITIONAL(INSTALLED_TESTS, test "x$enable_installed_tests" = "xyes")
AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
GOBJECT_INTROSPECTION_CHECK([1.42.0])
-# Vala
-AX_REQUIRE_DEFINED([VAPIGEN_CHECK])
-VAPIGEN_CHECK
-
# Code coverage for unit tests
AX_REQUIRE_DEFINED([AX_CODE_COVERAGE])
AX_CODE_COVERAGE
@@ -165,7 +161,6 @@ Configuration:
GVfs metadata: ${enable_gvfs_metadata}
Documentation: ${enable_gtk_doc}
GObject introspection: ${found_introspection}
- Vala: ${enable_vala}
Code coverage: ${enable_code_coverage}
Valgrind check: ${enable_valgrind}
Installed tests: ${enable_installed_tests}
diff --git a/tepl/Makefile.am b/tepl/Makefile.am
index ff7a1f5..b68feba 100644
--- a/tepl/Makefile.am
+++ b/tepl/Makefile.am
@@ -196,30 +196,4 @@ CLEANFILES += \
endif # HAVE_INTROSPECTION
-if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
-
-tepl-@TEPL_API_VERSION@.vapi: Tepl-@TEPL_API_VERSION@.gir
-
-VAPIGEN_VAPIS = tepl-@TEPL_API_VERSION@.vapi
-
-tepl_@TEPL_API_VERSION@_vapi_DEPS = gtk+-3.0 gtksourceview-3.0
-
-tepl-@TEPL_API_VERSION@.deps:
- $(AM_V_GEN) for pkg in $(tepl_@TEPL_API_VERSION@_vapi_DEPS); do \
- echo $$pkg >> $@; \
- done
-
-tepl_@TEPL_API_VERSION@_vapi_METADATADIRS = $(srcdir)
-tepl_@TEPL_API_VERSION@_vapi_FILES = Tepl-@TEPL_API_VERSION@.gir
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = \
- tepl-@TEPL_API_VERSION@.vapi \
- tepl-@TEPL_API_VERSION@.deps
-
-CLEANFILES += $(vapi_DATA)
-
-endif # ENABLE_VAPIGEN
-
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]