From 89579b4317a7f7ab6ee706399bee4b8f25a12c3a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 4 Mar 2011 13:18:30 +0100 Subject: prefix sub-directories containing libraries with 'lib' ... and make sure tests work again after restructuring --- openbsc/tests/channel/Makefile.am | 16 +++++----------- openbsc/tests/db/Makefile.am | 8 +++++++- openbsc/tests/debug/Makefile.am | 5 +++-- openbsc/tests/gsm0408/Makefile.am | 5 ++++- openbsc/tests/mgcp/Makefile.am | 10 ++++++---- 5 files changed, 25 insertions(+), 19 deletions(-) (limited to 'openbsc/tests') diff --git a/openbsc/tests/channel/Makefile.am b/openbsc/tests/channel/Makefile.am index 8593b5a13..bf709ff28 100644 --- a/openbsc/tests/channel/Makefile.am +++ b/openbsc/tests/channel/Makefile.am @@ -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 diff --git a/openbsc/tests/db/Makefile.am b/openbsc/tests/db/Makefile.am index a7bed85df..a4395aefa 100644 --- a/openbsc/tests/db/Makefile.am +++ b/openbsc/tests/db/Makefile.am @@ -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 diff --git a/openbsc/tests/debug/Makefile.am b/openbsc/tests/debug/Makefile.am index 8423fd178..47437b1e8 100644 --- a/openbsc/tests/debug/Makefile.am +++ b/openbsc/tests/debug/Makefile.am @@ -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 diff --git a/openbsc/tests/gsm0408/Makefile.am b/openbsc/tests/gsm0408/Makefile.am index f98c673ea..de6feb272 100644 --- a/openbsc/tests/gsm0408/Makefile.am +++ b/openbsc/tests/gsm0408/Makefile.am @@ -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 diff --git a/openbsc/tests/mgcp/Makefile.am b/openbsc/tests/mgcp/Makefile.am index fdbe56549..472368cb3 100644 --- a/openbsc/tests/mgcp/Makefile.am +++ b/openbsc/tests/mgcp/Makefile.am @@ -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) -- cgit v1.2.3