[totem] plugins: Work-around srcdir != builddir for Vala
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] plugins: Work-around srcdir != builddir for Vala
- Date: Mon, 21 Nov 2016 14:07:23 +0000 (UTC)
commit 310596eaa913459e89082eaf39bd9e5fdc3e21be
Author: Bastien Nocera <hadess hadess net>
Date: Mon Nov 21 15:05:28 2016 +0100
plugins: Work-around srcdir != builddir for Vala
The vala automake rules "cd" into the srcdir to generate its C files,
completely ignoring the fact that the relative paths it's passed as
arguments won't be valid after that directory change.
Work-around it by using the absolute paths in the --girdir argument
instead.
See https://bugzilla.gnome.org/show_bug.cgi?id=774786
src/plugins/rotation/Makefile.am | 2 +-
src/plugins/sample-vala/Makefile.am | 2 +-
src/plugins/zeitgeist-dp/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/plugins/rotation/Makefile.am b/src/plugins/rotation/Makefile.am
index bca407f..b56164a 100644
--- a/src/plugins/rotation/Makefile.am
+++ b/src/plugins/rotation/Makefile.am
@@ -8,7 +8,7 @@ plugin_in_files = rotation.plugin.in
# here we are explicitly specifying gtk+-3.0 to use the vapi
# because vala still cannot parse the gir
AM_VALAFLAGS = \
- --girdir=$(top_builddir)/src \
+ --girdir=$(abs_top_builddir)/src \
--pkg Totem-1.0 --pkg libpeas-1.0 --pkg cogl-pango-1.0 --pkg gtk+-3.0 bacon-video.vapi
librotation_la_SOURCES = totem-rotation-plugin.vala
diff --git a/src/plugins/sample-vala/Makefile.am b/src/plugins/sample-vala/Makefile.am
index dba7385..a851f22 100644
--- a/src/plugins/sample-vala/Makefile.am
+++ b/src/plugins/sample-vala/Makefile.am
@@ -8,7 +8,7 @@ plugin_in_files = sample-vala.plugin.in
# here we are explicitly specifying gtk+-3.0 to use the vapi because vala still
# cannot parse the gir
AM_VALAFLAGS = \
- --girdir=$(top_srcdir)/src \
+ --girdir=$(abs_top_srcdir)/src \
--pkg Totem-1.0 --pkg libpeas-1.0 --pkg gtk+-3.0
libsample_vala_la_SOURCES = totem-sample-vala-plugin.vala
diff --git a/src/plugins/zeitgeist-dp/Makefile.am b/src/plugins/zeitgeist-dp/Makefile.am
index 2b32379..1272ba2 100644
--- a/src/plugins/zeitgeist-dp/Makefile.am
+++ b/src/plugins/zeitgeist-dp/Makefile.am
@@ -8,7 +8,7 @@ plugin_in_files = zeitgeist-dp.plugin.in
# here we are explicitly specifying gtk+-3.0 to use the vapi because vala still
# cannot parse the gir
AM_VALAFLAGS = \
- --girdir=$(top_builddir)/src \
+ --girdir=$(abs_top_builddir)/src \
--pkg Totem-1.0 --pkg Peas-1.0 --pkg gtk+-3.0 \
--pkg zeitgeist-2.0 \
bacon-video.vapi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]