fixeria has uploaded this change for review.

View Change

utils/Makefile.am: do not overwrite AM_CFLAGS

* $(TALLOC_CFLAGS) is already present in AM_CFLAGS,
* osmo-sim-test: do not redefine but append $(PCSC_CFLAGS).

Change-Id: I7b9af3a1a9493a432af89198e291f4523388751e
---
M utils/Makefile.am
1 file changed, 13 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/31845/1

diff --git a/utils/Makefile.am b/utils/Makefile.am
index d81d0a6..c068ee2 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -18,13 +18,12 @@
 
 osmo_config_merge_SOURCES = osmo-config-merge.c
 osmo_config_merge_LDADD = $(LDADD) $(TALLOC_LIBS)
-osmo_config_merge_CFLAGS = $(TALLOC_CFLAGS)
 
 if ENABLE_PCSC
 noinst_PROGRAMS += osmo-sim-test
 osmo_sim_test_SOURCES = osmo-sim-test.c
 osmo_sim_test_LDADD = $(LDADD) $(top_builddir)/src/sim/libosmosim.la $(PCSC_LIBS)
-osmo_sim_test_CFLAGS = $(PCSC_CFLAGS)
+osmo_sim_test_CFLAGS = $(AM_CFLAGS) $(PCSC_CFLAGS)
 endif
 endif
 
@@ -41,6 +40,5 @@
 			$(top_builddir)/src/vty/libosmovty.la \
 			$(top_builddir)/src/ctrl/libosmoctrl.la \
 			$(NULL)
-osmo_ns_dummy_CFLAGS = $(TALLOC_CFLAGS)
 endif
 endif

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