daniel has uploaded this change for review.

View Change

Link tests dynamically

Remove -static linker flag and use built libs in $(top_builddir)/src/.libs
similar to libosmo-gprs.
Change-Id: I7ff720280bf66b71c21d13af4351f1d8299c658c

Change-Id: I074f243b62a516534099c88f691a28065cd763dd
---
M tests/ss7/Makefile.am
M tests/tcap/Makefile.am
M tests/vty/Makefile.am
M tests/xua/Makefile.am
4 files changed, 17 insertions(+), 14 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/34/41534/1

diff --git a/tests/ss7/Makefile.am b/tests/ss7/Makefile.am
index 236e846..bf2b9ed 100644
--- a/tests/ss7/Makefile.am
+++ b/tests/ss7/Makefile.am
@@ -1,9 +1,13 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-AM_LDFLAGS = -static -no-install
-LDADD = $(top_builddir)/src/libosmo-sigtran.la \
-	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+AM_LDFLAGS = -no-install
+LDADD = $(top_builddir)/src/.libs/libosmo-sigtran.a \
+	$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+
+if BUILD_WITH_TCAP_LOADSHARING
+LDADD += $(LIBOSMOASN1TCAP_LIBS)
+endif
 
 EXTRA_DIST = ss7_test.ok ss7_test.err
 
diff --git a/tests/tcap/Makefile.am b/tests/tcap/Makefile.am
index f53d74b..6aaf943 100644
--- a/tests/tcap/Makefile.am
+++ b/tests/tcap/Makefile.am
@@ -2,10 +2,10 @@
 AM_CFLAGS = -Wall \
 	$(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOASN1TCAP_CFLAGS) $(LIBSCTP_CFLAGS)
 
-AM_LDFLAGS = -static -no-install
+AM_LDFLAGS = -no-install
 
-LDADD = $(top_builddir)/src/libosmo-sigtran.la \
-	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBOSMOASN1TCAP_LIBS) $(LIBSCTP_LIBS)
+LDADD = $(top_builddir)/src/.libs/libosmo-sigtran.a \
+	$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBOSMOASN1TCAP_LIBS) $(LIBSCTP_LIBS)
 
 check_PROGRAMS = \
 	tcap_transaction_tracking_test \
@@ -19,7 +19,3 @@
 tcap_transaction_tracking_test_SOURCES = \
 	tcap_transaction_tracking_test.c \
 	$(NULL)
-
-tcap_transaction_tracking_test_LDADD = \
-	$(top_builddir)/src/tcap_trans_tracking.o \
-	$(LDADD)
diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am
index 707fbd4..79a56ec 100644
--- a/tests/vty/Makefile.am
+++ b/tests/vty/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-AM_LDFLAGS = -static -no-install
+AM_LDFLAGS = -no-install
 LDADD = $(top_builddir)/src/libosmo-sigtran.la \
 	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
 
diff --git a/tests/xua/Makefile.am b/tests/xua/Makefile.am
index edff329..4af6446 100644
--- a/tests/xua/Makefile.am
+++ b/tests/xua/Makefile.am
@@ -1,9 +1,12 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall $(LIBOSMONETIF_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-AM_LDFLAGS = -static -no-install
-LDADD = $(top_builddir)/src/libosmo-sigtran.la \
-	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+AM_LDFLAGS = -no-install
+LDADD = $(top_builddir)/src/.libs/libosmo-sigtran.a \
+	$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+if BUILD_WITH_TCAP_LOADSHARING
+LDADD += $(LIBOSMOASN1TCAP_LIBS)
+endif
 
 EXTRA_DIST = xua_test.ok xua_test.err
 

To view, visit change 41534. To unsubscribe, or for help writing mail filters, visit settings.