Commit 8345ad1e authored by Corentin Noël's avatar Corentin Noël
Browse files

Make the vapi name follow the pkgconfig name

parent c4fe8e51
......@@ -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
......
......@@ -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)
......
......@@ -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')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment