Fix: liblttng-ust-tracepoint missing symbols when using ld "no-undefined"

[lttng-ust.git] / liblttng-ust / Makefile.am

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 04b9ff3f5773344136423a0ad7476d988d7973e9..36cb9a25038f0d871f40577bf5c40afc6b4f0f3e 100644 (file)
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -12,7 +12,10 @@ liblttng_ust_tracepoint_la_SOURCES = \
        jhash.h \
        error.h
 liblttng_ust_tracepoint_la_LIBADD = \
-       -lurcu-bp
+       -lurcu-bp \
+       $(top_builddir)/snprintf/libustsnprintf.la \
+       liblttng-ust-support.la
+
 liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
 
@@ -33,7 +36,8 @@ liblttng_ust_runtime_la_SOURCES = \
        compat.h \
        wait.h \
        jhash.h \
-       error.h
+       error.h \
+       lttng-ust-uuid.h
 
 liblttng_ust_support_la_SOURCES = \
        ltt-tracer.h \
@@ -55,10 +59,16 @@ liblttng_ust_support_la_LIBADD = \
 liblttng_ust_la_LIBADD = \
        -lpthread \
        -lrt \
-       -luuid \
        -llttng-ust-tracepoint \
        $(top_builddir)/snprintf/libustsnprintf.la \
        $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
        liblttng-ust-runtime.la liblttng-ust-support.la
 
+if LTTNG_UST_BUILD_WITH_LIBUUID
+liblttng_ust_la_LIBADD += -luuid
+endif
+if LTTNG_UST_BUILD_WITH_LIBC_UUID
+liblttng_ust_la_LIBADD += -lc
+endif
+
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing