Depend on libosmo-gprs-{llc,sndcp}

Change-Id: I7ba8e60f76dd784fe49e6f5d5c472d5bdfe58344

5 files changed, 11 insertions, 97 deletions

diff --git a/configure.ac b/configure.ac
index 5985cf8cc..20db8f09c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,8 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.3.0)
 PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.2.0)
 PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.5.0)
 PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOGPRSLLC, libosmo-gprs-llc)
+PKG_CHECK_MODULES(LIBOSMOGPRSSNDCP, libosmo-gprs-sndcp)
 
 # Enable/disable 3G aka IuPS + IuCS support?
 AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])],
@@ -246,10 +248,6 @@ AC_OUTPUT(
     tests/gprs/Makefile
     tests/sgsn/Makefile
     tests/gtphub/Makefile
-    tests/xid/Makefile
-    tests/sndcp_xid/Makefile
-    tests/slhc/Makefile
-    tests/v42bis/Makefile
     doc/Makefile
     doc/examples/Makefile
     doc/manuals/Makefile
diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in
index bc74688da..4abc9cbb4 100644
--- a/contrib/osmo-sgsn.spec.in
+++ b/contrib/osmo-sgsn.spec.in
@@ -43,6 +43,8 @@ BuildRequires:  pkgconfig(libosmoctrl) >= 1.7.0
 BuildRequires:  pkgconfig(libosmogb) >= 1.7.0
 BuildRequires:  pkgconfig(libosmogsm) >= 1.7.0
 BuildRequires:  pkgconfig(libosmovty) >= 1.7.0
+BuildRequires:  pkgconfig(libosmo-gprs-llc)
+BuildRequires:  pkgconfig(libosmo-gprs-sndcp)
 %{?systemd_requires}
 %if %{with_iu}
 BuildRequires:  pkgconfig(libasn1c)
diff --git a/debian/control b/debian/control
index 650e9beac..37963d84b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Build-Depends: debhelper (>=9),
                libosmo-ranap-dev (>= 1.3.0),
                libosmo-sigtran-dev (>= 1.6.0),
                libosmo-sccp-dev (>= 1.6.0),
-               osmo-gsm-manuals-dev (>= 1.3.0)
+               osmo-gsm-manuals-dev (>= 1.3.0),
+               libosmo-gprs-llc,
+               libosmo-gprs-sndcp
 Standards-Version: 3.9.8
 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn
 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn
diff --git a/debian/copyright b/debian/copyright
index cd8d7e84c..95b6c5de7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,15 +55,6 @@ Files:     .gitignore
            tests/sgsn/gprs_gb_parse.h
            tests/sgsn/Makefile.am
            tests/sgsn/sgsn_test.ok
-           tests/slhc/Makefile.am
-           tests/slhc/slhc_test.ok
-           tests/sndcp_xid/Makefile.am
-           tests/sndcp_xid/sndcp_xid_test.ok
-           tests/testsuite.at
-           tests/v42bis/Makefile.am
-           tests/v42bis/v42bis_test.ok
-           tests/xid/Makefile.am
-           tests/xid/xid_test.ok
 Copyright: __NO_COPYRIGHT_NOR_LICENSE__
 License:   __NO_COPYRIGHT_NOR_LICENSE__
 
@@ -104,10 +95,6 @@ Files:     include/osmocom/sgsn/a_reset.h
            tests/gtphub/gtphub_test.c
            tests/sgsn/gprs_gb_parse.c
            tests/sgsn/sgsn_test.c
-           tests/slhc/slhc_test.c
-           tests/sndcp_xid/sndcp_xid_test.c
-           tests/v42bis/v42bis_test.c
-           tests/xid/xid_test.c
 Copyright: 2008-2015 Holger Hans Peter Freyther <zecke@selfish.org>
            2008-2016 Harald Welte <laforge@gnumonks.org>
            2009-2015 Holger Hans Peter Freyther
@@ -221,85 +208,6 @@ License:   GPL-3.0+
  On Debian systems, the complete text of the GNU General Public License
  Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-Files:     src/gprs/v42bis.c
-Copyright: 2005-2011 Steve Underwood
-License:   LGPL-2.1
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 2.1,
- as published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- THIS IS A WORK IN PROGRESS. IT IS NOT FINISHED.
- Currently it performs the core compression and decompression functions OK.
- However, a number of the bells and whistles in V.42bis are incomplete.
- .
- ! \file
- .
- The FSF address in the above text is the old one.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-Files:     include/osmocom/sgsn/slhc.h
-Copyright: 1989 Regents of the University of California.
-License:   __UNKNOWN__
- Redistribution and use in source and binary forms are permitted
- provided that the above copyright notice and this paragraph are
- duplicated in all such forms and that any documentation,
- advertising materials, and other materials related to such
- distribution and use acknowledge that the software was developed
- by the University of California, Berkeley.  The name of the
- University may not be used to endorse or promote products derived
- from this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- .
- Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
- - Initial distribution.
- .
- modified for KA9Q Internet Software Package by
- Katie Stevens (dkstevens@ucdavis.edu)
- University of California, Davis
- Computing Services
- - 01-31-90	initial adaptation
-
-Files:     src/gprs/slhc.c
-Copyright: 1989 Regents of the University of California.
-License:   __UNKNOWN__
- Redistribution and use in source and binary forms are permitted
- provided that the above copyright notice and this paragraph are
- duplicated in all such forms and that any documentation,
- advertising materials, and other materials related to such
- distribution and use acknowledge that the software was developed
- by the University of California, Berkeley.  The name of the
- University may not be used to endorse or promote products derived
- from this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- .
- Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
- - Initial distribution.
- .
- modified for KA9Q Internet Software Package by
- Katie Stevens (dkstevens@ucdavis.edu)
- University of California, Davis
- Computing Services
- - 01-31-90	initial adaptation (from 1.19)
- PPP.05	02-15-90 [ks]
- PPP.08	05-02-90 [ks]	use PPP protocol field to signal compression
- PPP.15	09-90	 [ks]	improve mbuf handling
- PPP.16	11-02	 [karn]	substantially rewritten to use NOS facilities
-
 Files:     m4/ax_check_compile_flag.m4
 Copyright: 2008 Guido U. Draheim <guidod@gmx.de>
            2011 Maarten Bosmans <mkbosmans@gmail.com>
diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
index 93b9fa058..fc740c6a8 100644
--- a/src/sgsn/Makefile.am
+++ b/src/sgsn/Makefile.am
@@ -7,6 +7,8 @@ AM_CPPFLAGS = \
 AM_CFLAGS = \
 	-Wall \
 	-fno-strict-aliasing \
+	$(LIBOSMOGPRSSNDCP_CFLAGS) \
+	$(LIBOSMOGPRSLLC_CFLAGS) \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
@@ -27,6 +29,8 @@ AM_CFLAGS += \
 endif
 
 OSMO_LIBS = \
+	$(LIBOSMOGPRSSNDCP_LIBS) \
+	$(LIBOSMOGPRSLLC_LIBS) \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \