[ltt-dev] [UST PATCH] Change libtap.so to a local static library which is not installed

[Yannick Brosseau]

---
 .gitignore                                 |    1 +
 tests/Makefile.am                          |    8 ++------
 tests/libustctl_function_tests/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d1d9cd..68c7364 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Makefile
 .libs/
 .deps/
 *~
+*.a
 *.la
 *.lo
 Makefile.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 43fb203..8311980 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,13 +2,9 @@ SUBDIRS = . hello hello2 basic basic_long fork simple_include snprintf test-neve
 
 dist_noinst_SCRIPTS = test_loop runtests trace_matches
 
-lib_LTLIBRARIES = libtap.la
+noinst_LIBRARIES = libtap.a
 
-libtap_la_SOURCES = \
+libtap_a_SOURCES = \
 	tap.c \
 	tap.h
 
-libtap_la_LDFLAGS = -no-undefined -version-info 0:0:0
-
-libtap_la_LIBADD = \
-	-lpthread
\ No newline at end of file
diff --git a/tests/libustctl_function_tests/Makefile.am b/tests/libustctl_function_tests/Makefile.am
index 723b456..0446e86 100644
--- a/tests/libustctl_function_tests/Makefile.am
+++ b/tests/libustctl_function_tests/Makefile.am
@@ -5,6 +5,6 @@ libustctl_function_tests_SOURCES = libustctl_function_tests.c
 libustctl_function_tests_LDADD = $(top_builddir)/libust/libust.la \
 	$(top_builddir)/libustctl/libustctl.la \
 	$(top_builddir)/libust-initializer.o \
-	$(top_builddir)/tests/libtap.la \
+	$(top_builddir)/tests/libtap.a \
 	-lpthread
 
-- 
1.7.5.1