From: Yannick Brosseau Date: Thu, 19 May 2011 19:39:29 +0000 (-0400) Subject: Change libtap.so to a local static library which is not installed X-Git-Tag: v1.9.1~365 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=67787f501db5865f004a7de72312383aee97e05b;p=lttng-ust.git Change libtap.so to a local static library which is not installed Signed-off-by: Mathieu Desnoyers --- diff --git a/.gitignore b/.gitignore index 5d1d9cd4..68c73645 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 43fb2036..83119805 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 723b456a..0446e86e 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