prefix sub-directories containing libraries with 'lib'

... and make sure tests work again after restructuring
changes/88/3188/1
Harald Welte 12 years ago
parent 5a6b68f416
commit 89579b4317
  1. 14
      openbsc/configure.in
  2. 2
      openbsc/src/Makefile.am
  3. 7
      openbsc/src/gprs/Makefile.am
  4. 12
      openbsc/src/ipaccess/Makefile.am
  5. 0
      openbsc/src/libabis/Makefile.am
  6. 0
      openbsc/src/libabis/e1_input.c
  7. 0
      openbsc/src/libabis/e1_input_vty.c
  8. 0
      openbsc/src/libabis/input/dahdi.c
  9. 0
      openbsc/src/libabis/input/ipaccess.c
  10. 0
      openbsc/src/libabis/input/lapd.c
  11. 0
      openbsc/src/libabis/input/lapd.h
  12. 0
      openbsc/src/libabis/input/misdn.c
  13. 0
      openbsc/src/libbsc/Makefile.am
  14. 0
      openbsc/src/libbsc/abis_nm.c
  15. 0
      openbsc/src/libbsc/abis_nm_ipaccess.c
  16. 0
      openbsc/src/libbsc/abis_nm_vty.c
  17. 0
      openbsc/src/libbsc/abis_om2000.c
  18. 0
      openbsc/src/libbsc/abis_om2000_vty.c
  19. 0
      openbsc/src/libbsc/abis_rsl.c
  20. 0
      openbsc/src/libbsc/bsc_api.c
  21. 0
      openbsc/src/libbsc/bsc_init.c
  22. 0
      openbsc/src/libbsc/bsc_msc.c
  23. 0
      openbsc/src/libbsc/bsc_rll.c
  24. 0
      openbsc/src/libbsc/bsc_vty.c
  25. 2
      openbsc/src/libbsc/bts_ericsson_rbs2000.c
  26. 0
      openbsc/src/libbsc/bts_ipaccess_nanobts.c
  27. 0
      openbsc/src/libbsc/bts_siemens_bs11.c
  28. 0
      openbsc/src/libbsc/bts_unknown.c
  29. 0
      openbsc/src/libbsc/chan_alloc.c
  30. 0
      openbsc/src/libbsc/e1_config.c
  31. 0
      openbsc/src/libbsc/gsm_04_08_utils.c
  32. 0
      openbsc/src/libbsc/gsm_subscriber_base.c
  33. 0
      openbsc/src/libbsc/handover_decision.c
  34. 0
      openbsc/src/libbsc/handover_logic.c
  35. 0
      openbsc/src/libbsc/meas_proc.c
  36. 0
      openbsc/src/libbsc/meas_rep.c
  37. 0
      openbsc/src/libbsc/paging.c
  38. 0
      openbsc/src/libbsc/rest_octets.c
  39. 0
      openbsc/src/libbsc/system_information.c
  40. 0
      openbsc/src/libbsc/transaction.c
  41. 0
      openbsc/src/libcommon/Makefile.am
  42. 0
      openbsc/src/libcommon/bsc_version.c
  43. 0
      openbsc/src/libcommon/common_vty.c
  44. 0
      openbsc/src/libcommon/debug.c
  45. 0
      openbsc/src/libcommon/gsm_data.c
  46. 0
      openbsc/src/libcommon/socket.c
  47. 0
      openbsc/src/libcommon/talloc_ctx.c
  48. 0
      openbsc/src/libgb/Makefile.am
  49. 0
      openbsc/src/libgb/gprs_bssgp.c
  50. 0
      openbsc/src/libgb/gprs_bssgp_util.c
  51. 0
      openbsc/src/libgb/gprs_bssgp_vty.c
  52. 0
      openbsc/src/libgb/gprs_ns.c
  53. 0
      openbsc/src/libgb/gprs_ns_frgre.c
  54. 0
      openbsc/src/libgb/gprs_ns_vty.c
  55. 0
      openbsc/src/libmgcp/Makefile.am
  56. 0
      openbsc/src/libmgcp/mgcp_network.c
  57. 0
      openbsc/src/libmgcp/mgcp_protocol.c
  58. 0
      openbsc/src/libmgcp/mgcp_vty.c
  59. 0
      openbsc/src/libmsc/Makefile.am
  60. 0
      openbsc/src/libmsc/auth.c
  61. 0
      openbsc/src/libmsc/db.c
  62. 0
      openbsc/src/libmsc/gsm_04_08.c
  63. 0
      openbsc/src/libmsc/gsm_04_11.c
  64. 0
      openbsc/src/libmsc/gsm_04_80.c
  65. 0
      openbsc/src/libmsc/gsm_subscriber.c
  66. 0
      openbsc/src/libmsc/mncc.c
  67. 0
      openbsc/src/libmsc/mncc_builtin.c
  68. 0
      openbsc/src/libmsc/mncc_sock.c
  69. 0
      openbsc/src/libmsc/osmo_msc.c
  70. 0
      openbsc/src/libmsc/rrlp.c
  71. 0
      openbsc/src/libmsc/silent_call.c
  72. 0
      openbsc/src/libmsc/sms_queue.c
  73. 0
      openbsc/src/libmsc/token_auth.c
  74. 0
      openbsc/src/libmsc/ussd.c
  75. 0
      openbsc/src/libmsc/vty_interface_layer3.c
  76. 0
      openbsc/src/libtrau/Makefile.am
  77. 0
      openbsc/src/libtrau/rtp_proxy.c
  78. 0
      openbsc/src/libtrau/subchan_demux.c
  79. 0
      openbsc/src/libtrau/trau_frame.c
  80. 0
      openbsc/src/libtrau/trau_mux.c
  81. 0
      openbsc/src/libtrau/trau_upqueue.c
  82. 8
      openbsc/src/osmo-bsc/Makefile.am
  83. 5
      openbsc/src/osmo-bsc_mgcp/Makefile.am
  84. 8
      openbsc/src/osmo-bsc_nat/Makefile.am
  85. 8
      openbsc/src/osmo-nitb/Makefile.am
  86. 4
      openbsc/src/utils/Makefile.am
  87. 16
      openbsc/tests/channel/Makefile.am
  88. 8
      openbsc/tests/db/Makefile.am
  89. 5
      openbsc/tests/debug/Makefile.am
  90. 5
      openbsc/tests/gsm0408/Makefile.am
  91. 10
      openbsc/tests/mgcp/Makefile.am

@ -87,19 +87,19 @@ AC_OUTPUT(
include/openbsc/Makefile
include/Makefile
src/Makefile
src/trau/Makefile
src/abis/Makefile
src/bsc/Makefile
src/msc/Makefile
src/mgcp/Makefile
src/common/Makefile
src/libtrau/Makefile
src/libabis/Makefile
src/libbsc/Makefile
src/libmsc/Makefile
src/libmgcp/Makefile
src/libcommon/Makefile
src/osmo-nitb/Makefile
src/osmo-bsc/Makefile
src/osmo-bsc_nat/Makefile
src/osmo-bsc_mgcp/Makefile
src/ipaccess/Makefile
src/utils/Makefile
src/gb/Makefile
src/libgb/Makefile
src/gprs/Makefile
tests/Makefile
tests/debug/Makefile

@ -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

@ -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

@ -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

@ -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)
{

@ -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)

@ -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)

@ -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)

@ -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

@ -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

@ -3,14 +3,8 @@ AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
noinst_PROGRAMS = channel_test
channel_test_SOURCES = channel_test.c \
$(top_srcdir)/src/db.c \
$(top_srcdir)/src/gsm_subscriber_base.c \
$(top_srcdir)/src/gsm_subscriber.c \
$(top_srcdir)/src/debug.c \
$(top_srcdir)/src/gsm_data.c \
$(top_srcdir)/src/abis_nm.c \
$(top_srcdir)/src/bts_ipaccess_nanobts.c \
$(top_srcdir)/src/bts_siemens_bs11.c
channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS)
channel_test_SOURCES = channel_test.c
channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) \
$(top_builddir)/src/libcommon/libcommon.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmsc/libmsc.a

@ -5,5 +5,11 @@ AM_LDFLAGS = $(COVERAGE_LDFLAGS)
noinst_PROGRAMS = db_test
db_test_SOURCES = db_test.c
db_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) -ldl -ldbi
db_test_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 \
$(LIBOSMOCORE_LIBS) -ldl -ldbi

@ -2,5 +2,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
noinst_PROGRAMS = debug_test
debug_test_SOURCES = debug_test.c $(top_srcdir)/src/debug.c
debug_test_LDADD = $(LIBOSMOCORE_LIBS)
debug_test_SOURCES = debug_test.c
debug_test_LDADD = $(LIBOSMOCORE_LIBS) \
$(top_srcdir)/src/libcommon/libcommon.a

@ -3,4 +3,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
noinst_PROGRAMS = gsm0408_test
gsm0408_test_SOURCES = gsm0408_test.c
gsm0408_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) -ldbi
gsm0408_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(LIBOSMOCORE_LIBS) -ldbi

@ -4,7 +4,9 @@ AM_LDFLAGS = $(COVERAGE_LDFLAGS)
noinst_PROGRAMS = mgcp_test
mgcp_test_SOURCES = mgcp_test.c \
$(top_srcdir)/src/mgcp/mgcp_protocol.c \
$(top_srcdir)/src/mgcp/mgcp_network.c
mgcp_test_LDADD = $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS)
mgcp_test_SOURCES = mgcp_test.c
mgcp_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmgcp/libmgcp.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS)

Loading…
Cancel
Save