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 19d7482ad67b5c01df15d3917f55afe4de1ca841..36cb9a25038f0d871f40577bf5c40afc6b4f0f3e 100644 (file)
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,38 +1,74 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
-lib_LTLIBRARIES = liblttng-ust.la
+noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
-liblttng_ust_la_SOURCES = \
+lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
+
+liblttng_ust_tracepoint_la_SOURCES = \
        tracepoint.c \
-       ltt-tracer.h \
+       tracepoint-internal.h \
        ltt-tracer-core.h \
-       ltt-ring-buffer-client.h \
-       ltt-ring-buffer-client-discard.c \
-       ltt-ring-buffer-client-overwrite.c \
-       ltt-ring-buffer-metadata-client.h \
-       ltt-ring-buffer-metadata-client.c \
-       ltt-events.c \
-       ltt-probes.c \
-       lttng-ust-abi.c \
+       jhash.h \
+       error.h
+liblttng_ust_tracepoint_la_LIBADD = \
+       -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
+
+liblttng_ust_runtime_la_SOURCES = \
        lttng-ust-comm.c \
-       ust-core.c \
+       lttng-ust-abi.c \
+       ltt-probes.c \
        probes/lttng-probe-ust.c \
        probes/lttng-probe-ust.h \
        lttng-context-vtid.c \
        lttng-context-vpid.c \
        lttng-context-pthread-id.c \
        lttng-context-procname.c \
-       ltt-context.c
+       ltt-context.c \
+       ltt-events.c \
+       tracepoint-internal.h \
+       clock.h \
+       compat.h \
+       wait.h \
+       jhash.h \
+       error.h \
+       lttng-ust-uuid.h
 
-liblttng_ust_la_LDFLAGS = -no-undefined -version-info 0:0:0
+liblttng_ust_support_la_SOURCES = \
+       ltt-tracer.h \
+       ltt-tracer-core.h \
+       ust-core.c \
+       ltt-ring-buffer-client.h \
+       ltt-ring-buffer-client-discard.c \
+       ltt-ring-buffer-client-overwrite.c \
+       ltt-ring-buffer-metadata-client.h \
+       ltt-ring-buffer-metadata-client.c
+
+liblttng_ust_la_SOURCES =
+
+liblttng_ust_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
+
+liblttng_ust_support_la_LIBADD = \
+       $(top_builddir)/libringbuffer/libringbuffer.la
 
 liblttng_ust_la_LIBADD = \
        -lpthread \
        -lrt \
-       -luuid \
+       -llttng-ust-tracepoint \
        $(top_builddir)/snprintf/libustsnprintf.la \
-       $(top_builddir)/libringbuffer/libringbuffer.la \
-       $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.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
+liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing