aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-05-26 12:31:00 +0200
committerMax <msuraev@sysmocom.de>2017-06-22 10:51:46 +0000
commiteab5f594b0a7cf50ad97b039f73beff42cc8312a (patch)
treef1a84df2dbe32ad9f574e8129312affae9208a2f
parent5a44d25ad343d6426295480f6a0a5d6dc21350cf (diff)
Enable optional static builds1.0.1
* use LT_INIT instead of AC_PROG_RANLIB * remove redundant libbsc entries The default (for both manual and .deb builds) is to use shared build (as before) - the static build is entirely optional. Based on work by Sergey Kostanbaev <sergey.kostanbaev@gmail.com> and Alexander Chemeris <Alexander.Chemeris@gmail.com>. Change-Id: Ibcd1da98302413182c85e25c4cb7d69d9e38c35a
-rw-r--r--openbsc/configure.ac2
-rw-r--r--openbsc/src/osmo-bsc/Makefile.am1
-rw-r--r--openbsc/tests/abis/Makefile.am1
3 files changed, 1 insertions, 3 deletions
diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index c6ae1597..ff51ccfc 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -16,7 +16,7 @@ dnl checks for programs
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
-AC_PROG_RANLIB
+LT_INIT
dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am
index 6f836b08..ae9410c9 100644
--- a/openbsc/src/osmo-bsc/Makefile.am
+++ b/openbsc/src/osmo-bsc/Makefile.am
@@ -43,7 +43,6 @@ osmo_bsc_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOSCCP_LIBS) \
diff --git a/openbsc/tests/abis/Makefile.am b/openbsc/tests/abis/Makefile.am
index cbc3e07b..1c5dede3 100644
--- a/openbsc/tests/abis/Makefile.am
+++ b/openbsc/tests/abis/Makefile.am
@@ -27,7 +27,6 @@ abis_test_SOURCES = \
abis_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \