Merge remote branch 'nobled/for-krh'

2011-01-25 10:17:16 -05:00 · 2011-01-25 10:17:16 -05:00 · 4d6ff297c8
parent 70af98c576 0428a9a15c
commit 4d6ff297c8
3 changed files with 5 additions and 5 deletions
--- a/clients/Makefile.am
+++ b/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 =			\
--- a/compositor/Makefile.am
+++ b/compositor/Makefile.am
@ -1,12 +1,12 @@
 noinst_PROGRAMS = compositor

-INCLUDES =					\
-	-I$(top_srcdir)/wayland			\
+AM_CPPFLAGS =					\
+	-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	\
--- a/wayland/Makefile.am
+++ b/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