[libgit2-glib/tintou/wip/vala-fix] Make the vapi name follow the pkgconfig name

[Corentin Noël <corentinnoel src gnome org>]

commit 8345ad1e4d52469804d3d488d8c14e198f68cbe4
Author: Corentin Noël <corentin elementary io>
Date:   Thu Jan 25 09:18:23 2018 +0100

    Make the vapi name follow the pkgconfig name

 libgit2-glib/Makefile.am |   18 +++++++++---------
 libgit2-glib/meson.build |    2 +-
 meson.build              |    1 -
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/libgit2-glib/Makefile.am b/libgit2-glib/Makefile.am
index 04f195d..bc5a840 100644
--- a/libgit2-glib/Makefile.am
+++ b/libgit2-glib/Makefile.am
@@ -247,21 +247,21 @@ if HAVE_INTROSPECTION
 if ENABLE_VAPIGEN
 include $(VAPIGEN_MAKEFILE)
 
-ggit-1.0.vapi: Ggit-1.0.gir
+libgit2-glib-1.0.vapi: Ggit-1.0.gir
 
-VAPIGEN_VAPIS = ggit-1.0.vapi
+VAPIGEN_VAPIS = libgit2-glib-1.0.vapi
 
-ggit_1_0_vapi_DEPS = gio-2.0
-ggit_1_0_vapi_METADATADIRS = $(top_srcdir)
-ggit_1_0_vapi_FILES = Ggit-1.0.gir
+libgit2_glib_1_0_vapi_DEPS = gio-2.0
+libgit2_glib_1_0_vapi_METADATADIRS = $(top_srcdir)
+libgit2_glib_1_0_vapi_FILES = Ggit-1.0.gir
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPIGEN_VAPIS) ggit-1.0.deps
+vapi_DATA = $(VAPIGEN_VAPIS) libgit2-glib-1.0.deps
 
-ggit-1.0.deps:
-       $(AM_V_GEN) echo $(ggit_1_0_vapi_DEPS) | tr ' ' '\n' > $@
+libgit2-glib-1.0.deps:
+       $(AM_V_GEN) echo $(libgit2_glib_1_0_vapi_DEPS) | tr ' ' '\n' > $@
 
-CLEANFILES += $(VAPIGEN_VAPIS) ggit-1.0.deps
+CLEANFILES += $(VAPIGEN_VAPIS) libgit2-glib-1.0.deps
 
 endif # ENABLE_VAPIGEN
 
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index efd930c..b5dc63f 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -245,7 +245,7 @@ if enable_gir
                                         install: true)
 
   if enable_vapi
-    gnome.generate_vapi(libgit2_glib_vapi_name,
+    gnome.generate_vapi(libgit2_glib_api_name,
                         sources: libgit2_glib_gir[0],
                         packages: 'gio-2.0',
                         install: true)
diff --git a/meson.build b/meson.build
index bdb843a..38e0d5a 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,6 @@ libgit2_glib_api_version = '1.0'
 libgit2_glib_api_name = '@0@-@1@'.format(meson.project_name(), libgit2_glib_api_version)
 
 libgit2_glib_ns = 'Ggit'
-libgit2_glib_vapi_name = '@0@-@1@'.format(libgit2_glib_ns.to_lower(), libgit2_glib_api_version)
 
 libgit2_glib_buildtype = get_option('buildtype')