[Spice-devel] [PATCH] Fix build from git with srcdir != builddir

Christophe Fergeau cfergeau at redhat.com
Thu Dec 22 06:08:09 PST 2011


The --basedir argument to valac seems to be meant to help handling
this case but it doesn't seem to work with f16 valac so I appended
$(srcdir) to the vala source files.
Build is still broken with --enable-vala during .vapi generation
due to what look like a vala bug.
---
 gtk/controller/Makefile.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 2d5c5af..39c4ed0 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -11,6 +11,7 @@ AM_VALAFLAGS =							\
 	--pkg gio-2.0						\
 	--pkg spice-protocol --vapidir=$(top_srcdir)/data	\
 	--pkg custom --vapidir=$(srcdir)			\
+	--directory=$(srcdir)					\
 	-C -g							\
 	$(NULL)
 
@@ -26,8 +27,8 @@ noinst_PROGRAMS = test-controller
 BUILT_SOURCES = controller.vala.stamp
 
 libspice_controller_la_VALASOURCES =		\
-	menu.vala				\
-	controller.vala				\
+	$(srcdir)/menu.vala			\
+	$(srcdir)/controller.vala		\
 	$(NULL)
 libspice_controller_la_SOURCES =		\
 	custom.h				\
-- 
1.7.7.4



More information about the Spice-devel mailing list