layer23: make all apps depend on libosmo-gprs-rlcmac

This will be needed for the modem application, and is also used
in a follow-up commit adding support for parsing SI13 Rest Octets.

Change-Id: I8e0f826c9b2a886f94624176e34e7d197e93d25f
Related: OS#5500

6 files changed, 9 insertions, 0 deletions

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 16a0a6eb..c65387e2 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -24,6 +24,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
 osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
+osmo-build-dep.sh libosmo-gprs
 osmo-build-dep.sh gapk
 
 set +x
diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac
index 9c11dbdc..053cf58a 100644
--- a/src/host/layer23/configure.ac
+++ b/src/host/layer23/configure.ac
@@ -44,6 +44,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm)
 PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec)
+PKG_CHECK_MODULES(LIBOSMOGPRSRLCMAC, libosmo-gprs-rlcmac)
 AC_CHECK_LIB(gps, gps_waiting, LIBGPS_CFLAGS=" -D_HAVE_GPSD" LIBGPS_LIBS=" -lgps ",,)
 AC_SUBST([LIBGPS_CFLAGS])
 AC_SUBST([LIBGPS_LIBS])
diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am
index 6705ef97..185bf044 100644
--- a/src/host/layer23/src/common/Makefile.am
+++ b/src/host/layer23/src/common/Makefile.am
@@ -7,6 +7,7 @@ AM_CFLAGS = \
 	-Wall \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
 	$(LIBGPS_CFLAGS) \
 	$(NULL)
 
diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am
index ad48bda3..230c04fb 100644
--- a/src/host/layer23/src/misc/Makefile.am
+++ b/src/host/layer23/src/misc/Makefile.am
@@ -7,6 +7,7 @@ AM_CFLAGS = \
 	-Wall \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
 	$(LIBGPS_CFLAGS) \
 	$(NULL)
 
@@ -15,6 +16,7 @@ LDADD = \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOCODEC_LIBS) \
+	$(LIBOSMOGPRSRLCMAC_LIBS) \
 	$(LIBGPS_LIBS) \
 	$(NULL)
 
diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am
index b7b25e38..a83e082c 100644
--- a/src/host/layer23/src/mobile/Makefile.am
+++ b/src/host/layer23/src/mobile/Makefile.am
@@ -8,6 +8,7 @@ AM_CFLAGS = \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
 	$(LIBOSMOCODEC_CFLAGS) \
 	$(LIBOSMOGAPK_CFLAGS) \
 	$(LIBGPS_CFLAGS) \
@@ -43,6 +44,7 @@ mobile_LDADD = \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOGPRSRLCMAC_LIBS) \
 	$(LIBOSMOCODEC_LIBS) \
 	$(LIBOSMOGAPK_LIBS) \
 	$(LIBGPS_LIBS) \
diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am
index a29cc628..4fb3c118 100644
--- a/src/host/layer23/src/modem/Makefile.am
+++ b/src/host/layer23/src/modem/Makefile.am
@@ -8,6 +8,7 @@ AM_CFLAGS = \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
 	$(NULL)
 
 bin_PROGRAMS = modem
@@ -18,4 +19,5 @@ modem_LDADD = \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOGPRSRLCMAC_LIBS) \
 	$(NULL)