[PATCH wayland 1/5] build: Move AM_CFLAGS and AM_CPPFLAGS to the top of Makefile.am

Derek Foreman derekf at osg.samsung.com
Wed Jun 17 13:13:48 PDT 2015


AM_CFLAGS and AM_CPPFLAGS aren't positional, so putting them at a
random place in Makefile.am can be misleading.

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 Makefile.am | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0ea300a..96ad0be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,13 @@ endif
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
+AM_CPPFLAGS =					\
+	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/src			\
+	-I$(top_builddir)/protocol
+
+AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
+
 aclocaldir = $(datadir)/aclocal
 dist_aclocal_DATA = wayland-scanner.m4
 
@@ -214,12 +221,5 @@ fixed_benchmark_LDADD = libtest-runner.la
 os_wrappers_test_SOURCES = tests/os-wrappers-test.c
 os_wrappers_test_LDADD = libtest-runner.la
 
-AM_CPPFLAGS =					\
-	-I$(top_builddir)/src			\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/protocol
-
-AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
-
 exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
 exec_fd_leak_checker_LDADD = libtest-runner.la
-- 
2.1.4



More information about the wayland-devel mailing list