Jan Engelhardt
f2bfe74d5e
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=1
116 lines
3.7 KiB
Diff
116 lines
3.7 KiB
Diff
From 1d95c316569c325775981aecd31b34abad029a2f Mon Sep 17 00:00:00 2001
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Mon, 21 Jul 2014 10:13:00 +0200
|
|
Subject: [PATCH] build: fixes
|
|
|
|
Require osmogsm in configure.ac, because source code depends on it.
|
|
Find and use system talloc, do not rely on OSMO's bundled copy.
|
|
Rename libmtp to libosmo-mtp, as libmtp is already used by the
|
|
Multimedia Transfer Protocol library.
|
|
---
|
|
configure.ac | 4 +++-
|
|
libosmo-mtp.pc.in | 2 +-
|
|
libosmo-sccp.pc.in | 2 +-
|
|
src/Makefile.am | 12 ++++++++----
|
|
tests/m2ua/Makefile.am | 6 +++---
|
|
tests/sccp/Makefile.am | 6 +++---
|
|
6 files changed, 19 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 98a6b1f..75d2b95 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -13,9 +13,11 @@ dnl checks for programs
|
|
AC_PROG_MAKE_SET
|
|
AC_PROG_CC
|
|
AC_PROG_INSTALL
|
|
-AC_PROG_RANLIB
|
|
+LT_INIT
|
|
|
|
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
|
|
+PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm])
|
|
+PKG_CHECK_MODULES([TALLOC], [talloc])
|
|
|
|
# The following test is taken from WebKit's webkit.m4
|
|
saved_CFLAGS="$CFLAGS"
|
|
diff --git a/libosmo-mtp.pc.in b/libosmo-mtp.pc.in
|
|
index 675d0d3..5e99dd3 100644
|
|
--- a/libosmo-mtp.pc.in
|
|
+++ b/libosmo-mtp.pc.in
|
|
@@ -6,5 +6,5 @@ includedir=@includedir@
|
|
Name: Osmo MTP Lib
|
|
Description: Osmo MTP Lib
|
|
Version: @VERSION@
|
|
-Libs: -L${libdir} -lmtp
|
|
+Libs: -L${libdir} -losmo-mtp
|
|
Cflags: -I${includedir}/
|
|
diff --git a/libosmo-sccp.pc.in b/libosmo-sccp.pc.in
|
|
index eda8d49..9dd18c1 100644
|
|
--- a/libosmo-sccp.pc.in
|
|
+++ b/libosmo-sccp.pc.in
|
|
@@ -6,5 +6,5 @@ includedir=@includedir@
|
|
Name: OpenBSC SCCP Lib
|
|
Description: OpenBSC SCCP Lib
|
|
Version: @VERSION@
|
|
-Libs: -L${libdir} -lsccp
|
|
+Libs: -L${libdir} -losmo-sccp
|
|
Cflags: -I${includedir}/
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index c7451ad..85863f8 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -2,8 +2,12 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
|
|
|
|
sccpdir = $(libdir)
|
|
-sccp_LIBRARIES = libsccp.a libmtp.a libm2ua.a
|
|
+sccp_LTLIBRARIES = libosmo-sccp.la libosmo-mtp.la libosmo-m2ua.la
|
|
+
|
|
+libosmo_sccp_la_SOURCES = sccp.c
|
|
+libosmo_mtp_la_SOURCES = mtp_pcap.c
|
|
+libosmo_m2ua_la_SOURCES = m2ua_msg.c
|
|
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
+libosmo_m2ua_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
|
|
-libsccp_a_SOURCES = sccp.c
|
|
-libmtp_a_SOURCES = mtp_pcap.c
|
|
-libm2ua_a_SOURCES = m2ua_msg.c
|
|
diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am
|
|
index 0eb8302..1d1b56f 100644
|
|
--- a/tests/m2ua/Makefile.am
|
|
+++ b/tests/m2ua/Makefile.am
|
|
@@ -1,8 +1,8 @@
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -Wall
|
|
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall ${LIBOSMOCORE_CFLAGS} ${TALLOC_CFLAGS}
|
|
+AM_CFLAGS=-Wall
|
|
|
|
EXTRA_DIST = m2ua_test.ok
|
|
|
|
noinst_PROGRAMS = m2ua_test
|
|
m2ua_test_SOURCES = m2ua_test.c
|
|
-m2ua_test_LDADD = $(top_builddir)/src/libm2ua.a $(LIBOSMOCORE_LIBS)
|
|
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-m2ua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
|
|
diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am
|
|
index 90790a3..f43d858 100644
|
|
--- a/tests/sccp/Makefile.am
|
|
+++ b/tests/sccp/Makefile.am
|
|
@@ -1,10 +1,10 @@
|
|
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
|
|
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
|
|
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${LIBOSMOCORE_CFLAGS} ${TALLOC_CFLAGS}
|
|
+AM_CFLAGS=-Wall -ggdb3
|
|
|
|
EXTRA_DIST = sccp_test.ok
|
|
|
|
noinst_PROGRAMS = sccp_test
|
|
|
|
sccp_test_SOURCES = sccp_test.c $(top_srcdir)/src/sccp.c
|
|
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
|
|
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
|
|
|
|
--
|
|
2.0.0
|
|
|