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 <emil.velikov@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>

diff --git a/Makefile.am b/Makefile.am
index 64a8bf4..237de60 100644 (file)
--- 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)"'            \