From b56abb553100241723e818a664c015cdea2d58f4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 9 Feb 2010 22:04:09 +0100 Subject: [PATCH 1/6] liblaf0rge: Make the other targets depend on the liblaforge... Everything is linking fine here. --- tests/sccp/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am index 5a275fc2..3e350143 100644 --- a/tests/sccp/Makefile.am +++ b/tests/sccp/Makefile.am @@ -4,5 +4,5 @@ AM_CFLAGS=-Wall -ggdb3 noinst_PROGRAMS = sccp_test sccp_test_SOURCES = sccp_test.c -sccp_test_LDADD = $(top_builddir)/src/libsccp.a $(top_builddir)/src/libbsc.a +sccp_test_LDADD = $(top_builddir)/src/libsccp.a $(top_builddir)/src/libbsc.a $(top_builddir)/src/liblaf0rge1.a From 9ba1c6253af4a8aa9b312b7cc2b2d656011d2f33 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 12 Feb 2010 12:31:11 +0100 Subject: [PATCH 2/6] [sccp] Install the static sccp library and the headers --- include/sccp/Makefile.am | 3 ++- libsccp.pc.in | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 libsccp.pc.in diff --git a/include/sccp/Makefile.am b/include/sccp/Makefile.am index 42fd3104..6c8a5171 100644 --- a/include/sccp/Makefile.am +++ b/include/sccp/Makefile.am @@ -1 +1,2 @@ -noinst_HEADERS = sccp_types.h sccp.h +sccp_HEADERS = sccp_types.h sccp.h +sccpdir = $(includedir)/sccp diff --git a/libsccp.pc.in b/libsccp.pc.in new file mode 100644 index 00000000..eda8d499 --- /dev/null +++ b/libsccp.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: OpenBSC SCCP Lib +Description: OpenBSC SCCP Lib +Version: @VERSION@ +Libs: -L${libdir} -lsccp +Cflags: -I${includedir}/ From 63cd135faafd8abd94722a8b76cab3e8f634471c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 12 Feb 2010 22:44:50 +0100 Subject: [PATCH 3/6] [sccp] Make the file includable outside of OpenBSC --- include/sccp/sccp.h | 4 ++-- src/sccp/sccp.c | 7 ++++--- tests/sccp/sccp_test.c | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/sccp/sccp.h b/include/sccp/sccp.h index 3ad568c0..d7b57c61 100644 --- a/include/sccp/sccp.h +++ b/include/sccp/sccp.h @@ -27,11 +27,11 @@ #include #include - -#include +#include #include "sccp_types.h" +struct msgb; struct sccp_system; enum { diff --git a/src/sccp/sccp.c b/src/sccp/sccp.c index 522afcf7..bbf3e407 100644 --- a/src/sccp/sccp.c +++ b/src/sccp/sccp.c @@ -24,11 +24,12 @@ #include -#include - +#include #include #include -#include + +#include + static void *tall_sccp_ctx; static LLIST_HEAD(sccp_connections); diff --git a/tests/sccp/sccp_test.c b/tests/sccp/sccp_test.c index 37615e0e..91a80858 100644 --- a/tests/sccp/sccp_test.c +++ b/tests/sccp/sccp_test.c @@ -26,9 +26,11 @@ #include -#include #include #include +#include + +#include #define MIN(x, y) ((x) < (y) ? (x) : (y)) From 88d982b48cf096f5d3a78ed7d3de4ebea98acdcd Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 20 Feb 2010 16:24:02 +0100 Subject: [PATCH 4/6] split 'libosmocore' from openbsc codebase This library is intended to collect all generic/common funcitionality of all Osmocom.org projects, including OpenBSC but also OsmocomBB The library currently includes the following modules: bitvec, comp128, gsm_utils, msgb, select, signal, statistics, talloc, timer, tlv_parse, linuxlist msgb allocation error debugging had to be temporarily disabled as it depends on 'debug.c' functionality which at the moment remains in OpenBSC --- src/sccp/sccp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sccp/sccp.c b/src/sccp/sccp.c index b0de239a..9cd7c9c6 100644 --- a/src/sccp/sccp.c +++ b/src/sccp/sccp.c @@ -24,9 +24,9 @@ #include -#include +#include #include -#include +#include #include From 6886ad5f665ea9c6ac87c91a99db4808fb263e4b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 20 Feb 2010 17:29:27 +0100 Subject: [PATCH 5/6] finish openbsc / libosmocore separation * use pkg-config from openbsc to find header and library * move sms and timer tests to libosmocore itself * ensure "make distcheck" works on both packages --- tests/sccp/Makefile.am | 2 +- tests/sccp/sccp_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am index 3e350143..4152a9a5 100644 --- a/tests/sccp/Makefile.am +++ b/tests/sccp/Makefile.am @@ -4,5 +4,5 @@ AM_CFLAGS=-Wall -ggdb3 noinst_PROGRAMS = sccp_test sccp_test_SOURCES = sccp_test.c -sccp_test_LDADD = $(top_builddir)/src/libsccp.a $(top_builddir)/src/libbsc.a $(top_builddir)/src/liblaf0rge1.a +sccp_test_LDADD = $(top_builddir)/src/libsccp.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) diff --git a/tests/sccp/sccp_test.c b/tests/sccp/sccp_test.c index 562e1345..982c168b 100644 --- a/tests/sccp/sccp_test.c +++ b/tests/sccp/sccp_test.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include From 5d074c7ee21ee280ada06a8aa972b43a7d50eaf6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Feb 2010 20:10:58 +0100 Subject: [PATCH 6/6] [misc] Add LIBOSMOCORE_CFLAGS to the includes --- tests/sccp/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am index 4152a9a5..b35693e8 100644 --- a/tests/sccp/Makefile.am +++ b/tests/sccp/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) noinst_PROGRAMS = sccp_test