From 4ad45caa75cb5a81448921ac5e94ef4d1f2f7642 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 4 Jul 2016 14:57:11 +0100 Subject: [PATCH] automake: list the the builddir include before the srcdir Otherwise we'll pick up the stale (in-tree) generated source(s) over the fresh (out-of-tree) ones. Signed-off-by: Emil Velikov Reviewed-by: Quentin Glidic --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 64a8bf4e..237de603 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 \ @@ -841,8 +841,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)"' \ @@ -874,8 +874,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 @@ -964,8 +964,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)"' \