[PATCH weston 1/2] automake: list the the builddir include before the srcdir

Emil Velikov emil.l.velikov at gmail.com
Mon Jul 4 13:57:11 UTC 2016


From: Emil Velikov <emil.velikov at collabora.com>

Otherwise we'll pick up the stale (in-tree) generated source(s) over the
fresh (out-of-tree) ones.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
It's quite a corner case, although it could save you a lot of time
debugging.
---
 Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 436bb1b..60d3bc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,8 +44,8 @@ all-local : weston.ini ivi-shell/weston.ini
 AM_CFLAGS = $(GCC_CFLAGS)
 
 AM_CPPFLAGS = 					\
-	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/libweston		\
+	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/clients		\
 	-I$(top_builddir)/tests			\
 	-I$(top_srcdir)/shared			\
@@ -842,8 +842,8 @@ module_LTLIBRARIES += desktop-shell.la
 desktop_shell_la_CPPFLAGS =			\
 	-I$(top_builddir)/protocol		\
 	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/libweston		\
+	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/desktop-shell		\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
@@ -875,8 +875,8 @@ module_LTLIBRARIES += fullscreen-shell.la
 fullscreen_shell_la_CPPFLAGS =			\
 	-I$(top_builddir)/protocol		\
 	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/libweston		\
+	-I$(top_srcdir)/libweston		\
 	-DIN_WESTON
 
 fullscreen_shell_la_LDFLAGS = -module -avoid-version
@@ -965,8 +965,8 @@ libweston_module_LTLIBRARIES += xwayland.la
 xwayland_la_CPPFLAGS =				\
 	-I$(top_builddir)/protocol		\
 	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/libweston		\
+	-I$(top_srcdir)/libweston		\
 	-I$(top_builddir)/xwayland		\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
-- 
2.8.2



More information about the wayland-devel mailing list