From f34a36b94185f377639c7c997dcdd2453fc23574 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 21 Jul 2014 10:13:00 +0200 Subject: [PATCH] build: fixes AC_PROG_LIBTOOL is the same as LT_INIT. 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 | 2 +- libosmo-mtp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +- src/Makefile.am | 20 +++++++++++++++----- tests/m2ua/Makefile.am | 2 +- tests/sccp/Makefile.am | 4 ++-- tests/ss7/Makefile.am | 2 -- tests/xua/Makefile.am | 6 ++---- 8 files changed, 23 insertions(+), 17 deletions(-) Index: libosmo-sccp-0.8.1/configure.ac =================================================================== --- libosmo-sccp-0.8.1.orig/configure.ac +++ libosmo-sccp-0.8.1/configure.ac @@ -21,7 +21,6 @@ AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_INSTALL LT_INIT -AC_PROG_LIBTOOL dnl check for pkg-config (explained in detail in libosmocore/configure.ac) AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) @@ -30,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" fi PKG_PROG_PKG_CONFIG([0.20]) +PKG_CHECK_MODULES([TALLOC], [talloc]) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in =================================================================== --- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in +++ libosmo-sccp-0.8.1/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}/ Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in =================================================================== --- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in +++ libosmo-sccp-0.8.1/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}/ Index: libosmo-sccp-0.8.1/src/Makefile.am =================================================================== --- libosmo-sccp-0.8.1.orig/src/Makefile.am +++ libosmo-sccp-0.8.1/src/Makefile.am @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp # Legacy static libs sccpdir = $(libdir) -sccp_LIBRARIES = libsccp.a libmtp.a libxua.a +sccp_LTLIBRARIES = libosmo-sccp.la libosmo-mtp.la libosmo-xua.la -libsccp_a_SOURCES = sccp.c -libmtp_a_SOURCES = mtp_pcap.c -libxua_a_SOURCES = xua_msg.c +libosmo_sccp_la_SOURCES = sccp.c +libosmo_mtp_la_SOURCES = mtp_pcap.c +libosmo_xua_la_SOURCES = xua_msg.c # ensure that the file for the static lib is built with different C # flags, working around automake complaining that xua_msg.o is built # both with libtool (below) and without (here) -libxua_a_CPPFLAGS = $(AM_CPPFLAGS) -DDUMMY -UDUMMY +libosmo_xua_la_CPPFLAGS = ${AM_CPPFLAGS} -DDUMMY -UDUMMY + +libosmo_sccp_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS) +libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION} +libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION} +libosmo_xua_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS) +libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION} # New shared lib @@ -35,3 +41,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) + +noinst_LTLIBRARIES = libosmo-sigtran-internal.la +libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES) +libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD) Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am =================================================================== --- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am +++ libosmo-sccp-0.8.1/tests/m2ua/Makefile.am @@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok noinst_PROGRAMS = m2ua_test m2ua_test_SOURCES = m2ua_test.c -m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS) +m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} Index: libosmo-sccp-0.8.1/tests/sccp/Makefile.am =================================================================== --- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am +++ libosmo-sccp-0.8.1/tests/sccp/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS} AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) EXTRA_DIST = sccp_test.ok @@ -6,5 +6,5 @@ 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} Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am =================================================================== --- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am +++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) - -AM_LDFLAGS = -static LDADD = $(top_builddir)/src/libosmo-sigtran.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) Index: libosmo-sccp-0.8.1/tests/xua/Makefile.am =================================================================== --- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am +++ libosmo-sccp-0.8.1/tests/xua/Makefile.am @@ -1,8 +1,6 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) - -AM_LDFLAGS = -static -LDADD = $(top_builddir)/src/libosmo-sigtran.la \ +LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) EXTRA_DIST = xua_test.ok xua_test.err