prefix sub-directories containing libraries with 'lib'
... and make sure tests work again after restructuring
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
index c7905ce..98a3431 100644
--- a/openbsc/src/osmo-bsc_nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -7,7 +7,9 @@
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)