aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src
diff options
context:
space:
mode:
Diffstat (limited to 'openbsc/src')
-rw-r--r--openbsc/src/Makefile.am2
-rw-r--r--openbsc/src/gprs/Makefile.am7
-rw-r--r--openbsc/src/ipaccess/Makefile.am12
-rw-r--r--openbsc/src/libabis/Makefile.am (renamed from openbsc/src/abis/Makefile.am)0
-rw-r--r--openbsc/src/libabis/e1_input.c (renamed from openbsc/src/abis/e1_input.c)0
-rw-r--r--openbsc/src/libabis/e1_input_vty.c (renamed from openbsc/src/abis/e1_input_vty.c)0
-rw-r--r--openbsc/src/libabis/input/dahdi.c (renamed from openbsc/src/abis/input/dahdi.c)0
-rw-r--r--openbsc/src/libabis/input/ipaccess.c (renamed from openbsc/src/abis/input/ipaccess.c)0
-rw-r--r--openbsc/src/libabis/input/lapd.c (renamed from openbsc/src/abis/input/lapd.c)0
-rw-r--r--openbsc/src/libabis/input/lapd.h (renamed from openbsc/src/abis/input/lapd.h)0
-rw-r--r--openbsc/src/libabis/input/misdn.c (renamed from openbsc/src/abis/input/misdn.c)0
-rw-r--r--openbsc/src/libbsc/Makefile.am (renamed from openbsc/src/bsc/Makefile.am)0
-rw-r--r--openbsc/src/libbsc/abis_nm.c (renamed from openbsc/src/bsc/abis_nm.c)0
-rw-r--r--openbsc/src/libbsc/abis_nm_ipaccess.c (renamed from openbsc/src/bsc/abis_nm_ipaccess.c)0
-rw-r--r--openbsc/src/libbsc/abis_nm_vty.c (renamed from openbsc/src/bsc/abis_nm_vty.c)0
-rw-r--r--openbsc/src/libbsc/abis_om2000.c (renamed from openbsc/src/bsc/abis_om2000.c)0
-rw-r--r--openbsc/src/libbsc/abis_om2000_vty.c (renamed from openbsc/src/bsc/abis_om2000_vty.c)0
-rw-r--r--openbsc/src/libbsc/abis_rsl.c (renamed from openbsc/src/bsc/abis_rsl.c)0
-rw-r--r--openbsc/src/libbsc/bsc_api.c (renamed from openbsc/src/bsc/bsc_api.c)0
-rw-r--r--openbsc/src/libbsc/bsc_init.c (renamed from openbsc/src/bsc/bsc_init.c)0
-rw-r--r--openbsc/src/libbsc/bsc_msc.c (renamed from openbsc/src/bsc/bsc_msc.c)0
-rw-r--r--openbsc/src/libbsc/bsc_rll.c (renamed from openbsc/src/bsc/bsc_rll.c)0
-rw-r--r--openbsc/src/libbsc/bsc_vty.c (renamed from openbsc/src/bsc/bsc_vty.c)0
-rw-r--r--openbsc/src/libbsc/bts_ericsson_rbs2000.c (renamed from openbsc/src/bsc/bts_ericsson_rbs2000.c)2
-rw-r--r--openbsc/src/libbsc/bts_ipaccess_nanobts.c (renamed from openbsc/src/bsc/bts_ipaccess_nanobts.c)0
-rw-r--r--openbsc/src/libbsc/bts_siemens_bs11.c (renamed from openbsc/src/bsc/bts_siemens_bs11.c)0
-rw-r--r--openbsc/src/libbsc/bts_unknown.c (renamed from openbsc/src/bsc/bts_unknown.c)0
-rw-r--r--openbsc/src/libbsc/chan_alloc.c (renamed from openbsc/src/bsc/chan_alloc.c)0
-rw-r--r--openbsc/src/libbsc/e1_config.c (renamed from openbsc/src/bsc/e1_config.c)0
-rw-r--r--openbsc/src/libbsc/gsm_04_08_utils.c (renamed from openbsc/src/bsc/gsm_04_08_utils.c)0
-rw-r--r--openbsc/src/libbsc/gsm_subscriber_base.c (renamed from openbsc/src/bsc/gsm_subscriber_base.c)0
-rw-r--r--openbsc/src/libbsc/handover_decision.c (renamed from openbsc/src/bsc/handover_decision.c)0
-rw-r--r--openbsc/src/libbsc/handover_logic.c (renamed from openbsc/src/bsc/handover_logic.c)0
-rw-r--r--openbsc/src/libbsc/meas_proc.c (renamed from openbsc/src/bsc/meas_proc.c)0
-rw-r--r--openbsc/src/libbsc/meas_rep.c (renamed from openbsc/src/bsc/meas_rep.c)0
-rw-r--r--openbsc/src/libbsc/paging.c (renamed from openbsc/src/bsc/paging.c)0
-rw-r--r--openbsc/src/libbsc/rest_octets.c (renamed from openbsc/src/bsc/rest_octets.c)0
-rw-r--r--openbsc/src/libbsc/system_information.c (renamed from openbsc/src/bsc/system_information.c)0
-rw-r--r--openbsc/src/libbsc/transaction.c (renamed from openbsc/src/bsc/transaction.c)0
-rw-r--r--openbsc/src/libcommon/Makefile.am (renamed from openbsc/src/common/Makefile.am)0
-rw-r--r--openbsc/src/libcommon/bsc_version.c (renamed from openbsc/src/common/bsc_version.c)0
-rw-r--r--openbsc/src/libcommon/common_vty.c (renamed from openbsc/src/common/common_vty.c)0
-rw-r--r--openbsc/src/libcommon/debug.c (renamed from openbsc/src/common/debug.c)0
-rw-r--r--openbsc/src/libcommon/gsm_data.c (renamed from openbsc/src/common/gsm_data.c)0
-rw-r--r--openbsc/src/libcommon/socket.c (renamed from openbsc/src/common/socket.c)0
-rw-r--r--openbsc/src/libcommon/talloc_ctx.c (renamed from openbsc/src/common/talloc_ctx.c)0
-rw-r--r--openbsc/src/libgb/Makefile.am (renamed from openbsc/src/gb/Makefile.am)0
-rw-r--r--openbsc/src/libgb/gprs_bssgp.c (renamed from openbsc/src/gb/gprs_bssgp.c)0
-rw-r--r--openbsc/src/libgb/gprs_bssgp_util.c (renamed from openbsc/src/gb/gprs_bssgp_util.c)0
-rw-r--r--openbsc/src/libgb/gprs_bssgp_vty.c (renamed from openbsc/src/gb/gprs_bssgp_vty.c)0
-rw-r--r--openbsc/src/libgb/gprs_ns.c (renamed from openbsc/src/gb/gprs_ns.c)0
-rw-r--r--openbsc/src/libgb/gprs_ns_frgre.c (renamed from openbsc/src/gb/gprs_ns_frgre.c)0
-rw-r--r--openbsc/src/libgb/gprs_ns_vty.c (renamed from openbsc/src/gb/gprs_ns_vty.c)0
-rw-r--r--openbsc/src/libmgcp/Makefile.am (renamed from openbsc/src/mgcp/Makefile.am)0
-rw-r--r--openbsc/src/libmgcp/mgcp_network.c (renamed from openbsc/src/mgcp/mgcp_network.c)0
-rw-r--r--openbsc/src/libmgcp/mgcp_protocol.c (renamed from openbsc/src/mgcp/mgcp_protocol.c)0
-rw-r--r--openbsc/src/libmgcp/mgcp_vty.c (renamed from openbsc/src/mgcp/mgcp_vty.c)0
-rw-r--r--openbsc/src/libmsc/Makefile.am (renamed from openbsc/src/msc/Makefile.am)0
-rw-r--r--openbsc/src/libmsc/auth.c (renamed from openbsc/src/msc/auth.c)0
-rw-r--r--openbsc/src/libmsc/db.c (renamed from openbsc/src/msc/db.c)0
-rw-r--r--openbsc/src/libmsc/gsm_04_08.c (renamed from openbsc/src/msc/gsm_04_08.c)0
-rw-r--r--openbsc/src/libmsc/gsm_04_11.c (renamed from openbsc/src/msc/gsm_04_11.c)0
-rw-r--r--openbsc/src/libmsc/gsm_04_80.c (renamed from openbsc/src/msc/gsm_04_80.c)0
-rw-r--r--openbsc/src/libmsc/gsm_subscriber.c (renamed from openbsc/src/msc/gsm_subscriber.c)0
-rw-r--r--openbsc/src/libmsc/mncc.c (renamed from openbsc/src/msc/mncc.c)0
-rw-r--r--openbsc/src/libmsc/mncc_builtin.c (renamed from openbsc/src/msc/mncc_builtin.c)0
-rw-r--r--openbsc/src/libmsc/mncc_sock.c (renamed from openbsc/src/msc/mncc_sock.c)0
-rw-r--r--openbsc/src/libmsc/osmo_msc.c (renamed from openbsc/src/msc/osmo_msc.c)0
-rw-r--r--openbsc/src/libmsc/rrlp.c (renamed from openbsc/src/msc/rrlp.c)0
-rw-r--r--openbsc/src/libmsc/silent_call.c (renamed from openbsc/src/msc/silent_call.c)0
-rw-r--r--openbsc/src/libmsc/sms_queue.c (renamed from openbsc/src/msc/sms_queue.c)0
-rw-r--r--openbsc/src/libmsc/token_auth.c (renamed from openbsc/src/msc/token_auth.c)0
-rw-r--r--openbsc/src/libmsc/ussd.c (renamed from openbsc/src/msc/ussd.c)0
-rw-r--r--openbsc/src/libmsc/vty_interface_layer3.c (renamed from openbsc/src/msc/vty_interface_layer3.c)0
-rw-r--r--openbsc/src/libtrau/Makefile.am (renamed from openbsc/src/trau/Makefile.am)0
-rw-r--r--openbsc/src/libtrau/rtp_proxy.c (renamed from openbsc/src/trau/rtp_proxy.c)0
-rw-r--r--openbsc/src/libtrau/subchan_demux.c (renamed from openbsc/src/trau/subchan_demux.c)0
-rw-r--r--openbsc/src/libtrau/trau_frame.c (renamed from openbsc/src/trau/trau_frame.c)0
-rw-r--r--openbsc/src/libtrau/trau_mux.c (renamed from openbsc/src/trau/trau_mux.c)0
-rw-r--r--openbsc/src/libtrau/trau_upqueue.c (renamed from openbsc/src/trau/trau_upqueue.c)0
-rw-r--r--openbsc/src/osmo-bsc/Makefile.am8
-rw-r--r--openbsc/src/osmo-bsc_mgcp/Makefile.am5
-rw-r--r--openbsc/src/osmo-bsc_nat/Makefile.am8
-rw-r--r--openbsc/src/osmo-nitb/Makefile.am8
-rw-r--r--openbsc/src/utils/Makefile.am4
85 files changed, 37 insertions, 19 deletions
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 489dc58b9..005ce6bb4 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
-SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gb gprs
+SUBDIRS = libcommon libabis libmgcp libbsc libtrau osmo-nitb osmo-bsc_mgcp utils ipaccess libgb gprs
# Conditional modules
if BUILD_NAT
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index e98111561..16c2200e5 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -11,9 +11,12 @@ bin_PROGRAMS = osmo-gbproxy
endif
osmo_gbproxy_SOURCES = gb_proxy.c gb_proxy_main.c gb_proxy_vty.c
-osmo_gbproxy_LDADD = $(top_builddir)/src/gb/libgb.a $(top_builddir)/src/common/libcommon.a
+osmo_gbproxy_LDADD = $(top_builddir)/src/libgb/libgb.a \
+ $(top_builddir)/src/libcommon/libcommon.a
osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \
sgsn_main.c sgsn_vty.c sgsn_libgtp.c \
gprs_llc.c gprs_llc_vty.c crc24.c
-osmo_sgsn_LDADD = $(top_builddir)/src/gb/libgb.a $(top_builddir)/src/common/libcommon.a -lgtp
+osmo_sgsn_LDADD = $(top_builddir)/src/libgb/libgb.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ -lgtp
diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am
index e789a0b08..144cca1ee 100644
--- a/openbsc/src/ipaccess/Makefile.am
+++ b/openbsc/src/ipaccess/Makefile.am
@@ -9,11 +9,13 @@ ipaccess_find_SOURCES = ipaccess-find.c
ipaccess_config_SOURCES = ipaccess-config.c ipaccess-firmware.c network_listen.c
# FIXME: resolve the bogus dependencies patched around here:
-ipaccess_config_LDADD = $(top_builddir)/src/bsc/libbsc.a $(top_builddir)/src/msc/libmsc.a \
- $(top_builddir)/src/abis/libabis.a $(top_builddir)/src/bsc/libbsc.a \
- $(top_builddir)/src/trau/libtrau.a \
- $(top_builddir)/src/common/libcommon.a \
+ipaccess_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libabis/libabis.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
-ldl -ldbi $(LIBCRYPT)
ipaccess_proxy_SOURCES = ipaccess-proxy.c
-ipaccess_proxy_LDADD = $(top_builddir)/src/common/libcommon.a
+ipaccess_proxy_LDADD = $(top_builddir)/src/libcommon/libcommon.a
diff --git a/openbsc/src/abis/Makefile.am b/openbsc/src/libabis/Makefile.am
index 7f5ac47cc..7f5ac47cc 100644
--- a/openbsc/src/abis/Makefile.am
+++ b/openbsc/src/libabis/Makefile.am
diff --git a/openbsc/src/abis/e1_input.c b/openbsc/src/libabis/e1_input.c
index e5dd11b94..e5dd11b94 100644
--- a/openbsc/src/abis/e1_input.c
+++ b/openbsc/src/libabis/e1_input.c
diff --git a/openbsc/src/abis/e1_input_vty.c b/openbsc/src/libabis/e1_input_vty.c
index 3909f652f..3909f652f 100644
--- a/openbsc/src/abis/e1_input_vty.c
+++ b/openbsc/src/libabis/e1_input_vty.c
diff --git a/openbsc/src/abis/input/dahdi.c b/openbsc/src/libabis/input/dahdi.c
index 2fc99f58e..2fc99f58e 100644
--- a/openbsc/src/abis/input/dahdi.c
+++ b/openbsc/src/libabis/input/dahdi.c
diff --git a/openbsc/src/abis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c
index dcf8d1a53..dcf8d1a53 100644
--- a/openbsc/src/abis/input/ipaccess.c
+++ b/openbsc/src/libabis/input/ipaccess.c
diff --git a/openbsc/src/abis/input/lapd.c b/openbsc/src/libabis/input/lapd.c
index 7bce6cc51..7bce6cc51 100644
--- a/openbsc/src/abis/input/lapd.c
+++ b/openbsc/src/libabis/input/lapd.c
diff --git a/openbsc/src/abis/input/lapd.h b/openbsc/src/libabis/input/lapd.h
index fd11edaa3..fd11edaa3 100644
--- a/openbsc/src/abis/input/lapd.h
+++ b/openbsc/src/libabis/input/lapd.h
diff --git a/openbsc/src/abis/input/misdn.c b/openbsc/src/libabis/input/misdn.c
index 459887917..459887917 100644
--- a/openbsc/src/abis/input/misdn.c
+++ b/openbsc/src/libabis/input/misdn.c
diff --git a/openbsc/src/bsc/Makefile.am b/openbsc/src/libbsc/Makefile.am
index 91be7fa62..91be7fa62 100644
--- a/openbsc/src/bsc/Makefile.am
+++ b/openbsc/src/libbsc/Makefile.am
diff --git a/openbsc/src/bsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index 45db8bac5..45db8bac5 100644
--- a/openbsc/src/bsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
diff --git a/openbsc/src/bsc/abis_nm_ipaccess.c b/openbsc/src/libbsc/abis_nm_ipaccess.c
index 754efe28d..754efe28d 100644
--- a/openbsc/src/bsc/abis_nm_ipaccess.c
+++ b/openbsc/src/libbsc/abis_nm_ipaccess.c
diff --git a/openbsc/src/bsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c
index 996a85749..996a85749 100644
--- a/openbsc/src/bsc/abis_nm_vty.c
+++ b/openbsc/src/libbsc/abis_nm_vty.c
diff --git a/openbsc/src/bsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index e7a5f8386..e7a5f8386 100644
--- a/openbsc/src/bsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
diff --git a/openbsc/src/bsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c
index 5949c869c..5949c869c 100644
--- a/openbsc/src/bsc/abis_om2000_vty.c
+++ b/openbsc/src/libbsc/abis_om2000_vty.c
diff --git a/openbsc/src/bsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 07a7dc68c..07a7dc68c 100644
--- a/openbsc/src/bsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
diff --git a/openbsc/src/bsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c
index 0f09aecd3..0f09aecd3 100644
--- a/openbsc/src/bsc/bsc_api.c
+++ b/openbsc/src/libbsc/bsc_api.c
diff --git a/openbsc/src/bsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 752056c37..752056c37 100644
--- a/openbsc/src/bsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
diff --git a/openbsc/src/bsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c
index 508697ab1..508697ab1 100644
--- a/openbsc/src/bsc/bsc_msc.c
+++ b/openbsc/src/libbsc/bsc_msc.c
diff --git a/openbsc/src/bsc/bsc_rll.c b/openbsc/src/libbsc/bsc_rll.c
index 722f3fafc..722f3fafc 100644
--- a/openbsc/src/bsc/bsc_rll.c
+++ b/openbsc/src/libbsc/bsc_rll.c
diff --git a/openbsc/src/bsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index ed45afd4d..ed45afd4d 100644
--- a/openbsc/src/bsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
diff --git a/openbsc/src/bsc/bts_ericsson_rbs2000.c b/openbsc/src/libbsc/bts_ericsson_rbs2000.c
index def42b544..27d5ce6f7 100644
--- a/openbsc/src/bsc/bts_ericsson_rbs2000.c
+++ b/openbsc/src/libbsc/bts_ericsson_rbs2000.c
@@ -29,7 +29,7 @@
#include <openbsc/e1_input.h>
#include <openbsc/signal.h>
-#include "../abis/input/lapd.h"
+#include "../libabis/input/lapd.h"
static void bootstrap_om_bts(struct gsm_bts *bts)
{
diff --git a/openbsc/src/bsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c
index 25dc0c8a2..25dc0c8a2 100644
--- a/openbsc/src/bsc/bts_ipaccess_nanobts.c
+++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c
diff --git a/openbsc/src/bsc/bts_siemens_bs11.c b/openbsc/src/libbsc/bts_siemens_bs11.c
index 5a5f88306..5a5f88306 100644
--- a/openbsc/src/bsc/bts_siemens_bs11.c
+++ b/openbsc/src/libbsc/bts_siemens_bs11.c
diff --git a/openbsc/src/bsc/bts_unknown.c b/openbsc/src/libbsc/bts_unknown.c
index f95459959..f95459959 100644
--- a/openbsc/src/bsc/bts_unknown.c
+++ b/openbsc/src/libbsc/bts_unknown.c
diff --git a/openbsc/src/bsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c
index 167381b37..167381b37 100644
--- a/openbsc/src/bsc/chan_alloc.c
+++ b/openbsc/src/libbsc/chan_alloc.c
diff --git a/openbsc/src/bsc/e1_config.c b/openbsc/src/libbsc/e1_config.c
index 958839dcc..958839dcc 100644
--- a/openbsc/src/bsc/e1_config.c
+++ b/openbsc/src/libbsc/e1_config.c
diff --git a/openbsc/src/bsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c
index 6d12cc08e..6d12cc08e 100644
--- a/openbsc/src/bsc/gsm_04_08_utils.c
+++ b/openbsc/src/libbsc/gsm_04_08_utils.c
diff --git a/openbsc/src/bsc/gsm_subscriber_base.c b/openbsc/src/libbsc/gsm_subscriber_base.c
index caf84e7bb..caf84e7bb 100644
--- a/openbsc/src/bsc/gsm_subscriber_base.c
+++ b/openbsc/src/libbsc/gsm_subscriber_base.c
diff --git a/openbsc/src/bsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c
index d3f843afb..d3f843afb 100644
--- a/openbsc/src/bsc/handover_decision.c
+++ b/openbsc/src/libbsc/handover_decision.c
diff --git a/openbsc/src/bsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c
index c2e3f8c72..c2e3f8c72 100644
--- a/openbsc/src/bsc/handover_logic.c
+++ b/openbsc/src/libbsc/handover_logic.c
diff --git a/openbsc/src/bsc/meas_proc.c b/openbsc/src/libbsc/meas_proc.c
index ade1f2e0c..ade1f2e0c 100644
--- a/openbsc/src/bsc/meas_proc.c
+++ b/openbsc/src/libbsc/meas_proc.c
diff --git a/openbsc/src/bsc/meas_rep.c b/openbsc/src/libbsc/meas_rep.c
index 788a9baed..788a9baed 100644
--- a/openbsc/src/bsc/meas_rep.c
+++ b/openbsc/src/libbsc/meas_rep.c
diff --git a/openbsc/src/bsc/paging.c b/openbsc/src/libbsc/paging.c
index 650254575..650254575 100644
--- a/openbsc/src/bsc/paging.c
+++ b/openbsc/src/libbsc/paging.c
diff --git a/openbsc/src/bsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c
index 084f14498..084f14498 100644
--- a/openbsc/src/bsc/rest_octets.c
+++ b/openbsc/src/libbsc/rest_octets.c
diff --git a/openbsc/src/bsc/system_information.c b/openbsc/src/libbsc/system_information.c
index 8a99c565e..8a99c565e 100644
--- a/openbsc/src/bsc/system_information.c
+++ b/openbsc/src/libbsc/system_information.c
diff --git a/openbsc/src/bsc/transaction.c b/openbsc/src/libbsc/transaction.c
index 9b4af1aac..9b4af1aac 100644
--- a/openbsc/src/bsc/transaction.c
+++ b/openbsc/src/libbsc/transaction.c
diff --git a/openbsc/src/common/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 2895452ea..2895452ea 100644
--- a/openbsc/src/common/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
diff --git a/openbsc/src/common/bsc_version.c b/openbsc/src/libcommon/bsc_version.c
index cc1e76449..cc1e76449 100644
--- a/openbsc/src/common/bsc_version.c
+++ b/openbsc/src/libcommon/bsc_version.c
diff --git a/openbsc/src/common/common_vty.c b/openbsc/src/libcommon/common_vty.c
index 84375a22d..84375a22d 100644
--- a/openbsc/src/common/common_vty.c
+++ b/openbsc/src/libcommon/common_vty.c
diff --git a/openbsc/src/common/debug.c b/openbsc/src/libcommon/debug.c
index ea5db49e5..ea5db49e5 100644
--- a/openbsc/src/common/debug.c
+++ b/openbsc/src/libcommon/debug.c
diff --git a/openbsc/src/common/gsm_data.c b/openbsc/src/libcommon/gsm_data.c
index f181fd162..f181fd162 100644
--- a/openbsc/src/common/gsm_data.c
+++ b/openbsc/src/libcommon/gsm_data.c
diff --git a/openbsc/src/common/socket.c b/openbsc/src/libcommon/socket.c
index 47778e746..47778e746 100644
--- a/openbsc/src/common/socket.c
+++ b/openbsc/src/libcommon/socket.c
diff --git a/openbsc/src/common/talloc_ctx.c b/openbsc/src/libcommon/talloc_ctx.c
index 8e7ec230f..8e7ec230f 100644
--- a/openbsc/src/common/talloc_ctx.c
+++ b/openbsc/src/libcommon/talloc_ctx.c
diff --git a/openbsc/src/gb/Makefile.am b/openbsc/src/libgb/Makefile.am
index b48b17791..b48b17791 100644
--- a/openbsc/src/gb/Makefile.am
+++ b/openbsc/src/libgb/Makefile.am
diff --git a/openbsc/src/gb/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c
index eca34b989..eca34b989 100644
--- a/openbsc/src/gb/gprs_bssgp.c
+++ b/openbsc/src/libgb/gprs_bssgp.c
diff --git a/openbsc/src/gb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c
index f8e3b5699..f8e3b5699 100644
--- a/openbsc/src/gb/gprs_bssgp_util.c
+++ b/openbsc/src/libgb/gprs_bssgp_util.c
diff --git a/openbsc/src/gb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c
index 9ebd09004..9ebd09004 100644
--- a/openbsc/src/gb/gprs_bssgp_vty.c
+++ b/openbsc/src/libgb/gprs_bssgp_vty.c
diff --git a/openbsc/src/gb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c
index 5a8e35860..5a8e35860 100644
--- a/openbsc/src/gb/gprs_ns.c
+++ b/openbsc/src/libgb/gprs_ns.c
diff --git a/openbsc/src/gb/gprs_ns_frgre.c b/openbsc/src/libgb/gprs_ns_frgre.c
index 106f410e6..106f410e6 100644
--- a/openbsc/src/gb/gprs_ns_frgre.c
+++ b/openbsc/src/libgb/gprs_ns_frgre.c
diff --git a/openbsc/src/gb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c
index 39277fc71..39277fc71 100644
--- a/openbsc/src/gb/gprs_ns_vty.c
+++ b/openbsc/src/libgb/gprs_ns_vty.c
diff --git a/openbsc/src/mgcp/Makefile.am b/openbsc/src/libmgcp/Makefile.am
index b1d1d158a..b1d1d158a 100644
--- a/openbsc/src/mgcp/Makefile.am
+++ b/openbsc/src/libmgcp/Makefile.am
diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c
index 51c08d151..51c08d151 100644
--- a/openbsc/src/mgcp/mgcp_network.c
+++ b/openbsc/src/libmgcp/mgcp_network.c
diff --git a/openbsc/src/mgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index ba290dd90..ba290dd90 100644
--- a/openbsc/src/mgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
diff --git a/openbsc/src/mgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c
index c299a98cc..c299a98cc 100644
--- a/openbsc/src/mgcp/mgcp_vty.c
+++ b/openbsc/src/libmgcp/mgcp_vty.c
diff --git a/openbsc/src/msc/Makefile.am b/openbsc/src/libmsc/Makefile.am
index 7d895c394..7d895c394 100644
--- a/openbsc/src/msc/Makefile.am
+++ b/openbsc/src/libmsc/Makefile.am
diff --git a/openbsc/src/msc/auth.c b/openbsc/src/libmsc/auth.c
index e09bde5f3..e09bde5f3 100644
--- a/openbsc/src/msc/auth.c
+++ b/openbsc/src/libmsc/auth.c
diff --git a/openbsc/src/msc/db.c b/openbsc/src/libmsc/db.c
index 95a7d36fb..95a7d36fb 100644
--- a/openbsc/src/msc/db.c
+++ b/openbsc/src/libmsc/db.c
diff --git a/openbsc/src/msc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 2b61aa9b0..2b61aa9b0 100644
--- a/openbsc/src/msc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
diff --git a/openbsc/src/msc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 812e758cd..812e758cd 100644
--- a/openbsc/src/msc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
diff --git a/openbsc/src/msc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c
index 494c319fe..494c319fe 100644
--- a/openbsc/src/msc/gsm_04_80.c
+++ b/openbsc/src/libmsc/gsm_04_80.c
diff --git a/openbsc/src/msc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c
index db61f25aa..db61f25aa 100644
--- a/openbsc/src/msc/gsm_subscriber.c
+++ b/openbsc/src/libmsc/gsm_subscriber.c
diff --git a/openbsc/src/msc/mncc.c b/openbsc/src/libmsc/mncc.c
index 3630b91b4..3630b91b4 100644
--- a/openbsc/src/msc/mncc.c
+++ b/openbsc/src/libmsc/mncc.c
diff --git a/openbsc/src/msc/mncc_builtin.c b/openbsc/src/libmsc/mncc_builtin.c
index 0226b2748..0226b2748 100644
--- a/openbsc/src/msc/mncc_builtin.c
+++ b/openbsc/src/libmsc/mncc_builtin.c
diff --git a/openbsc/src/msc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c
index 2eef7c86e..2eef7c86e 100644
--- a/openbsc/src/msc/mncc_sock.c
+++ b/openbsc/src/libmsc/mncc_sock.c
diff --git a/openbsc/src/msc/osmo_msc.c b/openbsc/src/libmsc/osmo_msc.c
index 8c86dcc8e..8c86dcc8e 100644
--- a/openbsc/src/msc/osmo_msc.c
+++ b/openbsc/src/libmsc/osmo_msc.c
diff --git a/openbsc/src/msc/rrlp.c b/openbsc/src/libmsc/rrlp.c
index ae5ca478e..ae5ca478e 100644
--- a/openbsc/src/msc/rrlp.c
+++ b/openbsc/src/libmsc/rrlp.c
diff --git a/openbsc/src/msc/silent_call.c b/openbsc/src/libmsc/silent_call.c
index 64ebdfdb9..64ebdfdb9 100644
--- a/openbsc/src/msc/silent_call.c
+++ b/openbsc/src/libmsc/silent_call.c
diff --git a/openbsc/src/msc/sms_queue.c b/openbsc/src/libmsc/sms_queue.c
index 079755d22..079755d22 100644
--- a/openbsc/src/msc/sms_queue.c
+++ b/openbsc/src/libmsc/sms_queue.c
diff --git a/openbsc/src/msc/token_auth.c b/openbsc/src/libmsc/token_auth.c
index 3404dd4ee..3404dd4ee 100644
--- a/openbsc/src/msc/token_auth.c
+++ b/openbsc/src/libmsc/token_auth.c
diff --git a/openbsc/src/msc/ussd.c b/openbsc/src/libmsc/ussd.c
index 72f26bd36..72f26bd36 100644
--- a/openbsc/src/msc/ussd.c
+++ b/openbsc/src/libmsc/ussd.c
diff --git a/openbsc/src/msc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c
index a38d15bbb..a38d15bbb 100644
--- a/openbsc/src/msc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
diff --git a/openbsc/src/trau/Makefile.am b/openbsc/src/libtrau/Makefile.am
index 01ed251d8..01ed251d8 100644
--- a/openbsc/src/trau/Makefile.am
+++ b/openbsc/src/libtrau/Makefile.am
diff --git a/openbsc/src/trau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c
index eefc0e1d6..eefc0e1d6 100644
--- a/openbsc/src/trau/rtp_proxy.c
+++ b/openbsc/src/libtrau/rtp_proxy.c
diff --git a/openbsc/src/trau/subchan_demux.c b/openbsc/src/libtrau/subchan_demux.c
index 6bcf279fe..6bcf279fe 100644
--- a/openbsc/src/trau/subchan_demux.c
+++ b/openbsc/src/libtrau/subchan_demux.c
diff --git a/openbsc/src/trau/trau_frame.c b/openbsc/src/libtrau/trau_frame.c
index d4d6447cc..d4d6447cc 100644
--- a/openbsc/src/trau/trau_frame.c
+++ b/openbsc/src/libtrau/trau_frame.c
diff --git a/openbsc/src/trau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c
index 712e22d85..712e22d85 100644
--- a/openbsc/src/trau/trau_mux.c
+++ b/openbsc/src/libtrau/trau_mux.c
diff --git a/openbsc/src/trau/trau_upqueue.c b/openbsc/src/libtrau/trau_upqueue.c
index f8edaf0ff..f8edaf0ff 100644
--- a/openbsc/src/trau/trau_upqueue.c
+++ b/openbsc/src/libtrau/trau_upqueue.c
diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am
index 735d440a1..95b9ef4f1 100644
--- a/openbsc/src/osmo-bsc/Makefile.am
+++ b/openbsc/src/osmo-bsc/Makefile.am
@@ -9,6 +9,10 @@ osmo_bsc_SOURCES = osmo_bsc_main.c osmo_bsc_rf.c osmo_bsc_vty.c osmo_bsc_api.c \
osmo_bsc_grace.c osmo_bsc_msc.c osmo_bsc_sccp.c \
osmo_bsc_filter.c osmo_bsc_bssap.c osmo_bsc_audio.c
# once again since TRAU uses CC symbol :(
-osmo_bsc_LDADD = ../bsc/libbsc.a ../msc/libmsc.a ../bsc/libbsc.a \
- ../abis/libabis.a ../trau/libtrau.a ../common/libcommon.a \
+osmo_bsc_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libabis/libabis.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOSCCP_LIBS)
diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am
index 0dc410348..32cc81300 100644
--- a/openbsc/src/osmo-bsc_mgcp/Makefile.am
+++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am
@@ -5,5 +5,6 @@ AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
bin_PROGRAMS = bsc_mgcp
bsc_mgcp_SOURCES = mgcp_main.c
-bsc_mgcp_LDADD = $(top_builddir)/src/common/libcommon.a $(top_builddir)/src/mgcp/libmgcp.a \
- $(LIBOSMOVTY_LIBS)
+bsc_mgcp_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(LIBOSMOVTY_LIBS)
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
index c7905ce3a..98a343108 100644
--- a/openbsc/src/osmo-bsc_nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -7,7 +7,9 @@ bin_PROGRAMS = osmo-bsc_nat
osmo_bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
bsc_nat_vty.c bsc_sccp.c bsc_ussd.c
-osmo_bsc_nat_LDADD = $(top_builddir)/src/common/libcommon.a \
- $(top_builddir)/src/mgcp/libmgcp.a $(top_builddir)/src/bsc/libbsc.a \
- $(top_builddir)/src/abis/libabis.a $(top_builddir)/src/trau/libtrau.a \
+osmo_bsc_nat_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libabis/libabis.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
-lrt $(LIBOSMOSCCP_LIBS)
diff --git a/openbsc/src/osmo-nitb/Makefile.am b/openbsc/src/osmo-nitb/Makefile.am
index 55822e906..44cb0239f 100644
--- a/openbsc/src/osmo-nitb/Makefile.am
+++ b/openbsc/src/osmo-nitb/Makefile.am
@@ -6,5 +6,9 @@ bin_PROGRAMS = osmo-nitb
osmo_nitb_SOURCES = bsc_hack.c
osmo_nitb_LDADD = -ldl -ldbi $(LIBCRYPT) $(LIBOSMOVTY_LIBS) \
- ../bsc/libbsc.a ../msc/libmsc.a ../bsc/libbsc.a ../trau/libtrau.a ../abis/libabis.a \
- ../common/libcommon.a
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libabis/libabis.a \
+ $(top_builddir)/src/libcommon/libcommon.a
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
index 2847c6ad8..2351f8a46 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -5,6 +5,8 @@ AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
bin_PROGRAMS = bs11_config isdnsync
bs11_config_SOURCES = bs11_config.c rs232.c
-bs11_config_LDADD = ../common/libcommon.a ../abis/libabis.a ../bsc/libbsc.a
+bs11_config_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libabis/libabis.a \
+ $(top_builddir)/src/libbsc/libbsc.a
isdnsync_SOURCES = isdnsync.c