build: Move AM_CFLAGS and AM_CPPFLAGS to the top of Makefile.am

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@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Derek Foreman 2015-06-17 15:13:48 -05:00 committed by Pekka Paalanen
parent 1faeb7ff48
commit e06f88cf91

View file

@ -4,6 +4,13 @@ endif
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 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 aclocaldir = $(datadir)/aclocal
dist_aclocal_DATA = wayland-scanner.m4 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_SOURCES = tests/os-wrappers-test.c
os_wrappers_test_LDADD = libtest-runner.la 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_SOURCES = tests/exec-fd-leak-checker.c
exec_fd_leak_checker_LDADD = libtest-runner.la exec_fd_leak_checker_LDADD = libtest-runner.la