[librsvg/librsvg-2.40] Fix generating Vala bindings in non-srcdir builds
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/librsvg-2.40] Fix generating Vala bindings in non-srcdir builds
- Date: Fri, 15 Dec 2017 11:52:02 +0000 (UTC)
commit 366b0d8185464c86e069e100c55fd8bd7718f7e1
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Dec 15 11:45:38 2017 +0000
Fix generating Vala bindings in non-srcdir builds
The location of the files vapigen uses must be relative to the source
and build directories, otherwise they will not be found.
This fixes the librsvg build in Continuous, which is failing with the
error:
/usr/bin/vapigen-0.40 --library librsvg-2.0 --metadatadir .. --pkg gio-2.0 --pkg cairo Rsvg-2.0.gir
Rsvg-2.0-custom.vala
error: Rsvg-2.0-custom.vala not found
Generation failed: 1 error(s), 0 warning(s)
Signed-off-by: Emmanuele Bassi <ebassi gnome org>
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f89d7ba..52b2d83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -261,8 +261,8 @@ librsvg-$(RSVG_API_VERSION).vapi: Rsvg-$(RSVG_API_VERSION).gir
VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi
librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo
-librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir)
-librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir Rsvg-$(RSVG_API_VERSION)-custom.vala
+librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(top_srcdir)
+librsvg_@RSVG_API_VERSION_U@_vapi_FILES = $(top_builddir)/Rsvg-$(RSVG_API_VERSION).gir
$(top_srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala
vapidir = $(datadir)/vala/vapi
vapi_DATA = $(VAPIGEN_VAPIS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]