Update static lib linking

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

diff --git a/README b/README
index 23b831978a748d7acc1cd63e16c11ad7c9082714..45521d00c6fe5c8b615aadec45021b33d6a5f83e 100644 (file)
--- a/README
+++ b/README
@@ -67,7 +67,11 @@ USAGE:
       "TRACEPOINT_DEFINE" and include the tracepoint provider.
     - Use "-I." for the compilation unit containing the tracepoint
       provider include (e.g. tp.c).
-    - Link application with "-ldl -llttng-ust".
+    - Link application with "-ldl".
+    - If building the provider directly into the application,
+      link the application with "-llttng-ust".
+    - If building a static library for the provider, link the static
+      library with "-lllttng-ust".
     - Include the tracepoint provider header into all C files using
       the provider.
     - Example:

diff --git a/tests/hello-static-lib/Makefile.am b/tests/hello-static-lib/Makefile.am
index 31b26b72ecc83991c9ad83a63e6e103ca79a4c64..0eff080cdd2bb4746299b9fd90a1d9a6bf203ce0 100644 (file)
--- a/tests/hello-static-lib/Makefile.am
+++ b/tests/hello-static-lib/Makefile.am
@@ -3,11 +3,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
 noinst_LTLIBRARIES = liblttng-ust-provider-ust-test-hello.la
 liblttng_ust_provider_ust_test_hello_la_SOURCES = \
        tp.c ust_tests_hello.h
+liblttng_ust_provider_ust_test_hello_la_LIBADD = \
+       $(top_builddir)/liblttng-ust/liblttng-ust.la
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c
-hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la \
-       liblttng-ust-provider-ust-test-hello.la
+hello_LDADD = -ldl liblttng-ust-provider-ust-test-hello.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run