From 874542ca7c20631da61f02f3e466d4565cf13d9a Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 13 Mar 2023 03:32:15 +0700 Subject: [PATCH] CommonLibs: clean up and fix Makefile.am * Do not hard-code '-O3' and '-g', let the user decide on them. * Move '-lpthread' to LIBADD, it shall not be in CFLAGS. * Also add '-Wall' to AM_CFLAGS. Change-Id: Ia971fc4124b405514792e5309d42936aaebdc8c1 --- CommonLibs/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 2c449e01..4a0652d8 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -22,8 +22,8 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -AM_CXXFLAGS = -Wall -O3 -g -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -AM_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CXXFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) noinst_LTLIBRARIES = libcommon.la @@ -37,7 +37,12 @@ libcommon_la_SOURCES = \ trx_rate_ctr.cpp \ trx_vty.c \ debug.c -libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) +libcommon_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + -lpthread \ + $(NULL) noinst_HEADERS = \ BitVector.h \