diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2014-03-24 23:09:09 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2014-03-28 23:50:15 +0100 |
| commit | 79827d24227c7ccbc8c238fb12f8eac12182ca1c (patch) | |
| tree | 285c2dffa5632ecbda09cb89ee6395f23b855f5c | |
| parent | 20014431007a08d25c1df595fbb33d92b1bb719d (diff) | |
test/Makefile.am: Use $(GCC_CFLAGS) from configure.ac
This commit also passes AM_CFLAGS instead of AM_CPPFLAGS to the test
cases CFLAGS.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
| -rw-r--r-- | test/Makefile.am | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index b59d4a9c..e05b8727 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,6 +2,7 @@ if BUILD_TESTS AM_CPPFLAGS = -I$(top_srcdir)/src $(CHECK_CFLAGS) $(LIBEVDEV_CFLAGS) TEST_LIBS = liblitest.la $(CHECK_LIBS) $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libinput.la -lm +TEST_CFLAGS = $(GCC_CFLAGS) $(AM_CFLAGS) noinst_LTLIBRARIES = liblitest.la liblitest_la_SOURCES = \ $(top_srcdir)/src/libinput-util.h \ @@ -25,27 +26,27 @@ noinst_PROGRAMS = $(build_tests) $(run_tests) TESTS = $(run_tests) test_udev_SOURCES = udev.c -test_udev_CFLAGS = $(AM_CPPFLAGS) +test_udev_CFLAGS = $(TEST_CFLAGS) test_udev_LDADD = $(TEST_LIBS) test_udev_LDFLAGS = -static test_path_SOURCES = path.c -test_path_CFLAGS = $(AM_CPPFLAGS) +test_path_CFLAGS = $(TEST_CFLAGS) test_path_LDADD = $(TEST_LIBS) test_path_LDFLAGS = -static test_pointer_SOURCES = pointer.c -test_pointer_CFLAGS = $(AM_CPPFLAGS) +test_pointer_CFLAGS = $(TEST_CFLAGS) test_pointer_LDADD = $(TEST_LIBS) test_pointer_LDFLAGS = -static test_touch_SOURCES = touch.c -test_touch_CFLAGS = $(AM_CPPFLAGS) +test_touch_CFLAGS = $(TEST_CFLAGS) test_touch_LDADD = $(TEST_LIBS) test_touch_LDFLAGS = -static test_log_SOURCES = log.c -test_log_CFLAGS = $(AM_CPPFLAGS) +test_log_CFLAGS = $(TEST_CFLAGS) test_log_LDADD = $(TEST_LIBS) test_log_LDFLAGS = -static @@ -56,10 +57,10 @@ test_touchpad_LDFLAGS = -static # build-test only test_build_pedantic_c99_SOURCES = build-pedantic.c -test_build_pedantic_c99_CFLAGS = $(AM_CPPFLAGS) -std=c99 -pedantic -Werror +test_build_pedantic_c99_CFLAGS = $(TEST_CFLAGS) -std=c99 -pedantic -Werror test_build_std_gnuc90_SOURCES = build-pedantic.c -test_build_std_gnuc90_CFLAGS = $(AM_CPPFLAGS) -std=gnu90 -Werror +test_build_std_gnuc90_CFLAGS = $(TEST_CFLAGS) -std=gnu90 -Werror # test for linking with the minimal linker flags test_build_linker_SOURCES = build-pedantic.c |