pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29274 )
Change subject: Clarify RTP AMR header offset in TCH enc/dec ......................................................................
Clarify RTP AMR header offset in TCH enc/dec
The struct amr_hdr is present in libosmo-netif, which was not yet an osmo-bts dependency. While it may seem gross to depend on it only for this, the truth is that it already feels weird it's not used more in osmo-bts, so having it already include will hopefully allow cleaning up more code in osmo-bts in the future. Furthermore, Osmux support being added soon to osmo-bts will require libosmo-netif anyway, so it's a good step to add it already in here.
Change-Id: I607fdf6d627242e010fba35be1b9b0ffde820d08 --- M configure.ac M contrib/jenkins_bts_trx.sh M contrib/jenkins_lc15.sh M contrib/jenkins_oc2g.sh M contrib/jenkins_oct.sh M contrib/jenkins_oct_and_bts_trx.sh M contrib/jenkins_sysmobts.sh M contrib/osmo-bts.spec.in M debian/control M src/common/Makefile.am M src/osmo-bts-lc15/Makefile.am M src/osmo-bts-oc2g/Makefile.am M src/osmo-bts-octphy/Makefile.am M src/osmo-bts-omldummy/Makefile.am M src/osmo-bts-sysmo/Makefile.am M src/osmo-bts-trx/Makefile.am M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-virtual/Makefile.am M tests/agch/Makefile.am M tests/cipher/Makefile.am M tests/handover/Makefile.am M tests/meas/Makefile.am M tests/misc/Makefile.am M tests/paging/Makefile.am M tests/power/Makefile.am M tests/sysmobts/Makefile.am M tests/tx_power/Makefile.am 28 files changed, 62 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/29274/1
diff --git a/configure.ac b/configure.ac index 4dbdd94..aee5600 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,7 @@ PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.7.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.2.0)
AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) AC_ARG_ENABLE(sysmobts-calib, diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh index cb041a5..a98a633 100755 --- a/contrib/jenkins_bts_trx.sh +++ b/contrib/jenkins_bts_trx.sh @@ -10,6 +10,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen
osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen
cd "$deps"
diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh index c7d62c9..4454f65 100755 --- a/contrib/jenkins_lc15.sh +++ b/contrib/jenkins_lc15.sh @@ -10,6 +10,7 @@ export LD_LIBRARY_PATH="$inst/lib"
osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen
cd "$deps" osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION" diff --git a/contrib/jenkins_oc2g.sh b/contrib/jenkins_oc2g.sh index b8badce..af2f8a0 100755 --- a/contrib/jenkins_oc2g.sh +++ b/contrib/jenkins_oc2g.sh @@ -10,6 +10,7 @@ export LD_LIBRARY_PATH="$inst/lib"
osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen
cd "$deps" osmo-layer1-headers.sh oc2g "$FIRMWARE_VERSION" diff --git a/contrib/jenkins_oct.sh b/contrib/jenkins_oct.sh index bd57dd1..0984e20 100755 --- a/contrib/jenkins_oct.sh +++ b/contrib/jenkins_oct.sh @@ -10,6 +10,7 @@ export LD_LIBRARY_PATH="$inst/lib"
osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen
cd "$deps" osmo-layer1-headers.sh oct "$FIRMWARE_VERSION" diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh index ead2f56..3f4efae 100755 --- a/contrib/jenkins_oct_and_bts_trx.sh +++ b/contrib/jenkins_oct_and_bts_trx.sh @@ -10,6 +10,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen
osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen
cd "$deps"
diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh index 6376e92..2e5ab8d 100755 --- a/contrib/jenkins_sysmobts.sh +++ b/contrib/jenkins_sysmobts.sh @@ -10,6 +10,7 @@ export LD_LIBRARY_PATH="$inst/lib"
osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen
cd "$deps" osmo-layer1-headers.sh sysmo "$FIRMWARE_VERSION" diff --git a/contrib/osmo-bts.spec.in b/contrib/osmo-bts.spec.in index fe03050..2e48d2f 100644 --- a/contrib/osmo-bts.spec.in +++ b/contrib/osmo-bts.spec.in @@ -35,6 +35,7 @@ BuildRequires: pkgconfig(libosmovty) >= 1.7.0 BuildRequires: pkgconfig(libosmoabis) >= 1.3.0 BuildRequires: pkgconfig(libosmotrau) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.2.0 ### FIXME: DependencyHACK to include osmocom/gprs/protocol/gsm_04_60.h BuildRequires: pkgconfig(libosmogb) %{?systemd_requires} diff --git a/debian/control b/debian/control index ed23e75..13000a1 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ pkg-config, libosmocore-dev (>= 1.7.0), libosmo-abis-dev (>= 1.3.0), + libosmo-netif-dev (>= 1.2.0), libgps-dev, txt2man, osmo-gsm-manuals-dev (>= 1.3.0) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 35df73e..2f529a4 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -9,12 +9,14 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL)
LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOTRAU_LIBS) \ $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
if ENABLE_LC15BTS diff --git a/src/osmo-bts-lc15/Makefile.am b/src/osmo-bts-lc15/Makefile.am index a4a105a..58284e9 100644 --- a/src/osmo-bts-lc15/Makefile.am +++ b/src/osmo-bts-lc15/Makefile.am @@ -11,6 +11,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(LIBSYSTEMD_CFLAGS) \ $(NULL) @@ -23,6 +24,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
AM_CFLAGS += -DENABLE_LC15BTS diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am index 6e6078d..0da40b9 100644 --- a/src/osmo-bts-oc2g/Makefile.am +++ b/src/osmo-bts-oc2g/Makefile.am @@ -11,6 +11,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(LIBSYSTEMD_CFLAGS) \ $(ORTP_CFLAGS) \ @@ -24,6 +25,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_CFLAGS) \ $(ORTP_LIBS) \ $(NULL)
diff --git a/src/osmo-bts-octphy/Makefile.am b/src/osmo-bts-octphy/Makefile.am index fa0a63d..fb3f669 100644 --- a/src/osmo-bts-octphy/Makefile.am +++ b/src/osmo-bts-octphy/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL)
COMMON_LDADD = \ @@ -19,6 +20,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
EXTRA_DIST = l1_if.h l1_oml.h l1_utils.h octphy_hw_api.h octpkt.h diff --git a/src/osmo-bts-omldummy/Makefile.am b/src/osmo-bts-omldummy/Makefile.am index 6800883..81da29b 100644 --- a/src/osmo-bts-omldummy/Makefile.am +++ b/src/osmo-bts-omldummy/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(NULL)
@@ -18,6 +19,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ -ldl \ $(NULL)
diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index 0641433..12dea3b 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(NULL)
@@ -19,6 +20,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
EXTRA_DIST = \ diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 845c9e7..63c00fe 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -14,6 +14,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL)
LDADD = \ @@ -25,6 +26,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ -ldl \ $(NULL)
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 65f397d..9e0308b 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -35,6 +35,8 @@ #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/coding/gsm0503_amr_dtx.h>
+#include <osmocom/netif/amr.h> + #include <osmo-bts/bts.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/logging.h> @@ -155,11 +157,13 @@ if (chan_state->amr_last_dtx == AFS_ONSET) lchan_set_marker(false, lchan);
- /* we store tch_data + 2 header bytes, the amr variable set to - * 2 will allow us to skip the first 2 bytes in case we did - * receive an FACCH frame instead of a voice frame (we do not - * know this before we actually decode the frame) */ - amr = 2; + /* Store AMR payload in tch-data with an offset od 2 bytes, so + that we can easily prepend/fill the RTP AMR header (struct + amr_hdr) with osmo_amr_rtp_enc() later on. The amr variable + is used far below to account for the decoded offset in case + we receive an FACCH frame instead of a voice frame (we + do not know this before we actually decode the frame) */ + amr = sizeof(struct amr_hdr); rc = gsm0503_tch_afs_decode_dtx(tch_data + amr, *bursts_p, amr_is_cmr, chan_state->codec, chan_state->codecs, &chan_state->ul_ft, &chan_state->ul_cmr, &n_errors, &n_bits_total, &chan_state->amr_last_dtx); @@ -302,7 +306,7 @@ "not sending BFI\n", rc); return -EINVAL; } - memset(tch_data + 2, 0, rc - 2); + memset(tch_data + sizeof(struct amr_hdr), 0, rc - sizeof(struct amr_hdr)); break; default: LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi, @@ -509,8 +513,8 @@ /* the first FN 4,13,21 defines that CMI is included in frame, * the first FN 0,8,17 defines that CMR is included in frame. */ - gsm0503_tch_afs_encode(*bursts_p, msg->l2h + 2, - msgb_l2len(msg) - 2, !dl_amr_fn_is_cmi(br->fn), + gsm0503_tch_afs_encode(*bursts_p, msg->l2h + sizeof(struct amr_hdr), + msgb_l2len(msg) - sizeof(struct amr_hdr), !dl_amr_fn_is_cmi(br->fn), chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index a5f6747..17073e0 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -35,6 +35,8 @@ #include <osmocom/coding/gsm0503_coding.h> #include <osmocom/coding/gsm0503_amr_dtx.h>
+#include <osmocom/netif/amr.h> + #include <osmo-bts/bts.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/logging.h> @@ -196,7 +198,7 @@ fn_is_cmi = sched_tchh_ul_amr_cmi_map[bi->fn % 26];
/* See comment in function rx_tchf_fn() */ - amr = 2; + amr = sizeof(struct amr_hdr); rc = gsm0503_tch_ahs_decode_dtx(tch_data + amr, *bursts_p, !sched_tchh_ul_facch_map[bi->fn % 26], !fn_is_cmi, chan_state->codec, @@ -336,7 +338,7 @@ "not sending BFI\n", rc); return -EINVAL; } - memset(tch_data + 2, 0, rc - 2); + memset(tch_data + sizeof(struct amr_hdr), 0, rc - sizeof(struct amr_hdr)); break; default: LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi, @@ -436,8 +438,8 @@ /* the first FN 4,13,21 or 5,14,22 defines that CMI is included * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ - gsm0503_tch_ahs_encode(*bursts_p, msg->l2h + 2, - msgb_l2len(msg) - 2, !dl_amr_fn_is_cmi(br->fn), + gsm0503_tch_ahs_encode(*bursts_p, msg->l2h + sizeof(struct amr_hdr), + msgb_l2len(msg) - sizeof(struct amr_hdr), !dl_amr_fn_is_cmi(br->fn), chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); diff --git a/src/osmo-bts-virtual/Makefile.am b/src/osmo-bts-virtual/Makefile.am index 2b3d825..2ae53b4 100644 --- a/src/osmo-bts-virtual/Makefile.am +++ b/src/osmo-bts-virtual/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(NULL)
@@ -18,6 +19,7 @@ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ -ldl \ $(NULL)
diff --git a/tests/agch/Makefile.am b/tests/agch/Makefile.am index 2bb4144..f77341a 100644 --- a/tests/agch/Makefile.am +++ b/tests/agch/Makefile.am @@ -7,6 +7,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -15,6 +16,7 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = agch_test diff --git a/tests/cipher/Makefile.am b/tests/cipher/Makefile.am index 0650d3d..13bface 100644 --- a/tests/cipher/Makefile.am +++ b/tests/cipher/Makefile.am @@ -7,6 +7,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -15,6 +16,7 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = cipher_test diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index f850a6f..beebaed 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -13,6 +14,7 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = handover_test diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index e75481f..0af192f 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -13,6 +14,7 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOTRAU_LIBS) \ $(LIBOSMOABIS_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = meas_test diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index f3cc734..fd6ebf3 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -13,7 +14,9 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL) + check_PROGRAMS = misc_test EXTRA_DIST = misc_test.ok
diff --git a/tests/paging/Makefile.am b/tests/paging/Makefile.am index d5b090c..0c01e39 100644 --- a/tests/paging/Makefile.am +++ b/tests/paging/Makefile.am @@ -7,6 +7,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -15,6 +16,7 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = paging_test diff --git a/tests/power/Makefile.am b/tests/power/Makefile.am index 149d691..7b9ae27 100644 --- a/tests/power/Makefile.am +++ b/tests/power/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -13,6 +14,7 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = ms_power_loop_test bs_power_loop_test diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index 59d68fa..2796136 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -12,6 +12,7 @@ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -20,6 +21,7 @@ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL)
check_PROGRAMS = sysmobts_test diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am index f59f0c0..ae57a40 100644 --- a/tests/tx_power/Makefile.am +++ b/tests/tx_power/Makefile.am @@ -6,6 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ @@ -13,6 +14,7 @@ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(NULL) check_PROGRAMS = tx_power_test EXTRA_DIST = tx_power_test.ok tx_power_test.err
-
pespin