Merge remote branch 'nobled/for-krh'

clients/Makefile.am

@@ -16,8 +16,8 @@ noinst_LTLIBRARIES = libtoytoolkit.la
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_CPPFLAGS =					\
 	-DDATADIR='"$(datadir)"'		\
-	-I$(top_srcdir)/wayland			\
 	-I$(top_builddir)/wayland		\
+	-I$(top_srcdir)/wayland			\
 	$(CLIENT_CFLAGS)
 
 libtoytoolkit_la_SOURCES =			\

compositor/Makefile.am

@@ -1,12 +1,12 @@
 noinst_PROGRAMS = compositor
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
-	-I$(top_srcdir)/wayland			\
+	-DDATADIR='"$(datadir)"'		\
 	-I$(top_builddir)/wayland		\
+	-I$(top_srcdir)/wayland			\
 	$(COMPOSITOR_CFLAGS)
 
 AM_CFLAGS = $(GCC_CFLAGS)
-AM_CPPFLAGS = -DDATADIR='"$(datadir)"'
 
 compositor_LDADD =					\
 	$(top_builddir)/wayland/libwayland-server.la	\

wayland/Makefile.am

@@ -29,7 +29,7 @@ libwayland_client_la_SOURCES =			\
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = wayland-client.pc wayland-server.pc
 
-INCLUDES = $(FFI_CFLAGS)
+AM_CPPFLAGS = $(FFI_CFLAGS)
 AM_CFLAGS = $(GCC_CFLAGS)
 
 include $(top_srcdir)/wayland/scanner.mk