160 lines
6.9 KiB
Diff
160 lines
6.9 KiB
Diff
|
From 1c54312597f7a4c5eae2c495ef321f424913dcb9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: Thu, 2 Oct 2014 23:26:16 +0200
|
||
|
|
Subject: [PATCH] build: support external libtalloc
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 1 +
|
||
|
|
examples/Makefile.am | 26 +++++++++++++-------------
|
||
|
|
examples/channel/Makefile.am | 6 +++---
|
||
|
|
src/Makefile.am | 4 ++--
|
||
|
|
src/channel/abis/Makefile.am | 4 ++--
|
||
|
|
5 files changed, 21 insertions(+), 20 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 28dde0c..cef782e 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -43,6 +43,7 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0)
|
||
|
|
dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here
|
||
|
|
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7)
|
||
|
|
PKG_CHECK_MODULES(ORTP, ortp >= 0.15.0)
|
||
|
|
+PKG_CHECK_MODULES([TALLOC], [talloc])
|
||
|
|
|
||
|
|
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
|
||
|
|
|
||
|
|
diff --git a/examples/Makefile.am b/examples/Makefile.am
|
||
|
|
index ddfaa48..a5f4d1f 100644
|
||
|
|
--- a/examples/Makefile.am
|
||
|
|
+++ b/examples/Makefile.am
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||
|
|
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
|
||
|
|
+AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
|
||
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
||
|
|
|
||
|
|
SUBDIRS = channel
|
||
|
|
@@ -19,48 +19,48 @@ noinst_PROGRAMS = ipa-stream-client \
|
||
|
|
|
||
|
|
ipa_stream_client_SOURCES = ipa-stream-client.c
|
||
|
|
ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
ipa_stream_server_SOURCES = ipa-stream-server.c
|
||
|
|
ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c
|
||
|
|
lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
|
||
|
|
- $(LIBOSMOABIS_LIBS)
|
||
|
|
+ $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
lapd_over_datagram_network_SOURCES = lapd-over-datagram-network.c
|
||
|
|
lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
|
||
|
|
- $(LIBOSMOABIS_LIBS)
|
||
|
|
+ $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
stream_client_SOURCES = stream-client.c
|
||
|
|
stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
stream_server_SOURCES = stream-server.c
|
||
|
|
stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
rs232_read_SOURCES = rs232-read.c
|
||
|
|
-rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)
|
||
|
|
+rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
rs232_write_SOURCES = rs232-write.c
|
||
|
|
-rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)
|
||
|
|
+rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
rtp_udp_test_client_SOURCES = rtp-udp-test-client.c
|
||
|
|
rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
rtp_udp_test_server_SOURCES = rtp-udp-test-server.c
|
||
|
|
rtp_udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
osmux_test_input_SOURCES = osmux-test-input.c
|
||
|
|
osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
osmux_test_output_SOURCES = osmux-test-output.c
|
||
|
|
osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am
|
||
|
|
index c417909..2f003ce 100644
|
||
|
|
--- a/examples/channel/Makefile.am
|
||
|
|
+++ b/examples/channel/Makefile.am
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||
|
|
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
|
||
|
|
+AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
|
||
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
||
|
|
|
||
|
|
noinst_PROGRAMS = abis_ipa_stream_server \
|
||
|
|
@@ -7,8 +7,8 @@ noinst_PROGRAMS = abis_ipa_stream_server \
|
||
|
|
|
||
|
|
abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c
|
||
|
|
abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
|
||
|
|
abis_ipa_stream_client_SOURCES = abis_ipa_stream_client.c
|
||
|
|
abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
|
||
|
|
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
|
||
|
|
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
|
||
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
||
|
|
index 7fbdaf2..e0f3754 100644
|
||
|
|
--- a/src/Makefile.am
|
||
|
|
+++ b/src/Makefile.am
|
||
|
|
@@ -3,14 +3,14 @@
|
||
|
|
LIBVERSION=2:0:0
|
||
|
|
|
||
|
|
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
|
||
|
|
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||
|
|
+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
|
||
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
||
|
|
|
||
|
|
SUBDIRS = channel
|
||
|
|
|
||
|
|
lib_LTLIBRARIES = libosmonetif.la
|
||
|
|
|
||
|
|
-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
|
||
|
|
+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)
|
||
|
|
libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
|
||
|
|
|
||
|
|
libosmonetif_la_SOURCES = amr.c \
|
||
|
|
diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am
|
||
|
|
index 9ccce1d..bc066cb 100644
|
||
|
|
--- a/src/channel/abis/Makefile.am
|
||
|
|
+++ b/src/channel/abis/Makefile.am
|
||
|
|
@@ -1,9 +1,9 @@
|
||
|
|
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
|
||
|
|
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||
|
|
+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
|
||
|
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
||
|
|
|
||
|
|
noinst_LTLIBRARIES = libosmonetif-abis.la
|
||
|
|
|
||
|
|
libosmonetif_abis_la_SOURCES = ipa_stream_server.c \
|
||
|
|
ipa_stream_client.c
|
||
|
|
-libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
|
||
|
|
+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)
|
||
|
|
--
|
||
|
|
2.0.0
|
||
|
|
|