pespin submitted this change.

View Change

Approvals:
  Jenkins Builder: Verified
  dexter: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, but someone else must approve

Depend on libosmo-gprs-{llc,sndcp}

These will be needed for the MS to speak SNDCP and LLC.

Change-Id: I80811f73b798151257107bc94aedabe71fee0300
---
M src/host/layer23/configure.ac
M src/host/layer23/src/common/Makefile.am
M src/host/layer23/src/misc/Makefile.am
M src/host/layer23/src/mobile/Makefile.am
M src/host/layer23/src/modem/Makefile.am
5 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac
index 81c0e65..459065c 100644
--- a/src/host/layer23/configure.ac
+++ b/src/host/layer23/configure.ac
@@ -47,6 +47,8 @@
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm)
 PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec)
 PKG_CHECK_MODULES(LIBOSMOGPRSRLCMAC, libosmo-gprs-rlcmac)
+PKG_CHECK_MODULES(LIBOSMOGPRSLLC, libosmo-gprs-llc)
+PKG_CHECK_MODULES(LIBOSMOGPRSSNDCP, libosmo-gprs-sndcp)
 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 94eeec8..60af3b8 100644
--- a/src/host/layer23/src/common/Makefile.am
+++ b/src/host/layer23/src/common/Makefile.am
@@ -8,6 +8,8 @@
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
+	$(LIBOSMOGPRSLLC_CFLAGS) \
+	$(LIBOSMOGPRSSNDCP_CFLAGS) \
 	$(LIBGPS_CFLAGS) \
 	$(NULL)
 
diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am
index 358be74..05995c3 100644
--- a/src/host/layer23/src/misc/Makefile.am
+++ b/src/host/layer23/src/misc/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
+	$(LIBOSMOGPRSLLC_CFLAGS) \
+	$(LIBOSMOGPRSSNDCP_CFLAGS) \
 	$(LIBGPS_CFLAGS) \
 	$(NULL)
 
@@ -19,6 +21,8 @@
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOCODEC_LIBS) \
 	$(LIBOSMOGPRSRLCMAC_LIBS) \
+	$(LIBOSMOGPRSLLC_LIBS) \
+	$(LIBOSMOGPRSSNDCP_LIBS) \
 	$(LIBGPS_LIBS) \
 	$(NULL)
 
diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am
index b87063b..55df667 100644
--- a/src/host/layer23/src/mobile/Makefile.am
+++ b/src/host/layer23/src/mobile/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
+	$(LIBOSMOGPRSLLC_CFLAGS) \
+	$(LIBOSMOGPRSSNDCP_CFLAGS) \
 	$(LIBOSMOCODEC_CFLAGS) \
 	$(LIBOSMOGAPK_CFLAGS) \
 	$(LIBGPS_CFLAGS) \
@@ -42,6 +44,8 @@
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOGPRSRLCMAC_LIBS) \
+	$(LIBOSMOGPRSLLC_LIBS) \
+	$(LIBOSMOGPRSSNDCP_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 3f4c261..4f369ad 100644
--- a/src/host/layer23/src/modem/Makefile.am
+++ b/src/host/layer23/src/modem/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOGPRSRLCMAC_CFLAGS) \
+	$(LIBOSMOGPRSLLC_CFLAGS) \
+	$(LIBOSMOGPRSSNDCP_CFLAGS) \
 	$(NULL)
 
 bin_PROGRAMS = modem
@@ -24,4 +26,6 @@
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOGPRSRLCMAC_LIBS) \
+	$(LIBOSMOGPRSLLC_LIBS) \
+	$(LIBOSMOGPRSSNDCP_LIBS) \
 	$(NULL)

2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

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