[libchamplain] Don't version-control or distribute generated vapi files



commit 95fe18877728a5cb918e198997e7fb597d766c2d
Author: Jiří Techet <techet gmail com>
Date:   Fri Feb 8 19:11:10 2019 +0100

    Don't version-control or distribute generated vapi files

 .gitignore                            |   1 +
 README.md                             |   4 +-
 champlain-gtk/Makefile.am             |   8 +-
 champlain-gtk/champlain-gtk-0.12.vapi |  14 -
 champlain/Makefile.am                 |   8 +-
 champlain/champlain-0.12.vapi         | 841 ----------------------------------
 6 files changed, 11 insertions(+), 865 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ceb2fc..debbf40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ autom4te.cache
 *.la
 *.stamp
 *.gir
+*.vapi
 *.typelib
 *.gi
 *~
diff --git a/README.md b/README.md
index 82745e6..865054e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ libchamplain - a map widget
 libchamplain is a Gtk widget displaying zoomable and pannable maps that can be
 loaded from various network sources. It supports overlay layers, markers, and
 custom elements displayed on top of the maps. The library is written in C but
-other language mappings are also available thanks to GObject-introspection.
+other language mappings are also available thanks to GObject-Introspection.
 
-libchamplain requires:
+libchamplain depends on the following libraries:
 * [glib](https://gitlab.gnome.org/GNOME/glib)
 * [gtk](https://gitlab.gnome.org/GNOME/gtk)
 * [clutter](https://gitlab.gnome.org/GNOME/clutter)
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 9a00120..707d3b3 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -104,13 +104,13 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
 endif
 
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi
-EXTRA_DIST += champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi
 
 if ENABLE_VALA
 
-CLEANFILES += $(dist_vapi_DATA)
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi
+
+CLEANFILES += $(vapi_DATA)
 
 champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi:    GtkChamplain-@CHAMPLAIN_API_VERSION@.gir
        $(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ 
--vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg 
cogl-pango-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain 
$(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 448e34a..7381cd6 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -199,13 +199,13 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
 endif
 
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = champlain-@CHAMPLAIN_API_VERSION@.vapi
-EXTRA_DIST += champlain-@CHAMPLAIN_API_VERSION@.vapi
 
 if ENABLE_VALA
 
-CLEANFILES += $(dist_vapi_DATA)
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = champlain-@CHAMPLAIN_API_VERSION@.vapi
+
+CLEANFILES += $(vapi_DATA)
 
 champlain-@CHAMPLAIN_API_VERSION@.vapi:        Champlain-@CHAMPLAIN_API_VERSION@.gir
        $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg 
cogl-pango-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )


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