fixeria has uploaded this change for review.
tests: Makefile.am: move -I flags from AM_CFLAGS to AM_CPPFLAGS
* AM_CPPFLAGS is for preprocessor flags like '-I' or '-D',
* AM_CFLAGS is for C (not C++!) compiler flags like '-Wall'.
* AM_CXXFLAGS is for C++ specific compiler flags like '-Wall'.
By having the preprocessor flags in the proper variable we make
sure that they apply to both *.c and *.cpp files.
Change-Id: I7b3504a01e3350834b35c42d8d76d5d88d84a4b9
---
M tests/CommonLibs/Makefile.am
M tests/Transceiver52M/Makefile.am
2 files changed, 35 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/40/31840/1
diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am
index e6790e6..941badb 100644
--- a/tests/CommonLibs/Makefile.am
+++ b/tests/CommonLibs/Makefile.am
@@ -1,6 +1,17 @@
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = -Wall -I$(top_srcdir)/CommonLibs $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -g
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/CommonLibs \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(NULL)
+
+AM_CXXFLAGS = \
+ -Wall -g \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOCTRL_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(NULL)
+
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
EXTRA_DIST = BitVectorTest.ok \
diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am
index 9fae41f..cb22c2a 100644
--- a/tests/Transceiver52M/Makefile.am
+++ b/tests/Transceiver52M/Makefile.am
@@ -1,6 +1,12 @@
include $(top_srcdir)/Makefile.common
-AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M -I$(top_srcdir)/Transceiver52M/arch/common $(STD_DEFINES_AND_INCLUDES) -g
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/Transceiver52M \
+ -I$(top_srcdir)/Transceiver52M/arch/common \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(NULL)
+
+AM_CFLAGS = -Wall -g
EXTRA_DIST = convolve_test.ok convolve_test_golden.h
To view, visit change 31840. To unsubscribe, or for help writing mail filters, visit settings.