fixeria has uploaded this change for review.

View Change

tests/CommonLibs: clean up Makefile.am

* AM_CPPFLAGS is for preprocessor flags like '-I' or '-D',
* AM_CFLAGS/AM_CXXFLAGS is for C/C++ compiler flags like '-Wall',
* AM_LDFLAGS is for linker flags, not libraries!

Change-Id: I42713edd17a510aea8558c8b0f9cca98c46979b3
---
M tests/CommonLibs/Makefile.am
1 file changed, 32 insertions(+), 8 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/99/31799/1

diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am
index e6790e6..036cd2d 100644
--- a/tests/CommonLibs/Makefile.am
+++ b/tests/CommonLibs/Makefile.am
@@ -1,7 +1,23 @@
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall -I$(top_srcdir)/CommonLibs $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -g
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
+AM_CPPFLAGS = \
+	$(STD_DEFINES_AND_INCLUDES) \
+	-I$(top_srcdir)/CommonLibs \
+	$(NULL)
+
+AM_CXXFLAGS =
+	-Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOCTRL_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(NULL)
+
+LDADD = \
+	$(COMMON_LA) \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = BitVectorTest.ok \
              PRBSTest.ok \
@@ -20,21 +36,16 @@
 	LogTest
 
 BitVectorTest_SOURCES = BitVectorTest.cpp
-BitVectorTest_LDADD = $(COMMON_LA)
 
 PRBSTest_SOURCES = PRBSTest.cpp
 
 InterthreadTest_SOURCES = InterthreadTest.cpp
-InterthreadTest_LDADD = $(COMMON_LA)
-InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS)
+InterthreadTest_LDADD = $(LDADD) -lpthread
 
 TimevalTest_SOURCES = TimevalTest.cpp
-TimevalTest_LDADD = $(COMMON_LA)
 
 VectorTest_SOURCES = VectorTest.cpp
-VectorTest_LDADD = $(COMMON_LA)
 
 LogTest_SOURCES = LogTest.cpp
-LogTest_LDADD = $(COMMON_LA)
 
 MOSTLYCLEANFILES += testSource testDestination

To view, visit change 31799. To unsubscribe, or for help writing mail filters, visit settings.