diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-03-11 06:44:17 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-03-11 06:45:06 +0700 |
| commit | a8e2e5f78a88d2c70fe5b1feee667c3d2681c8fd (patch) | |
| tree | 35067de6a8bf8140f4f559107f2d3aa77f7e03b7 | |
| parent | 6160419b0309ca56353dcf04307862cbfb7dd5f8 (diff) | |
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
| -rw-r--r-- | utils/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index d81d0a62..c068ee28 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -18,13 +18,12 @@ osmo_aka_verify_SOURCES = osmo-aka-verify.c 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 @@ osmo_ns_dummy_LDADD = $(LDADD) $(TALLOC_LIBS) \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/ctrl/libosmoctrl.la \ $(NULL) -osmo_ns_dummy_CFLAGS = $(TALLOC_CFLAGS) endif endif |