Change libtap.so to a local static library which is not installed

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/.gitignore b/.gitignore
index 5d1d9cd458875bf3756aaa3ff7d81f1c390fad43..68c7364544db2bcc9df6a661087e010964a18298 100644 (file)
--- 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 43fb2036f3c080406527327c4051e019efa325a3..83119805714186dbbe8982a371987c2a5f5fb485 100644 (file)
--- 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 723b456a4a7d697bd7dd9a5675760c826a6fb88a..0446e86ed0caa1c15d535a4eaeaeac1046879d87 100644 (file)
--- 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