X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=ea4c8f612ee4c947e71c1472052731e235e3b448;hp=57df3aedc9b3f04ad57c6530994e9a61609f2e57;hb=9d4d2a639afc19a1bd705ea560782917ac892596;hpb=a424659d23d52532edcbd642d5be62e1b9888477

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 57df3aed..ea4c8f61 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -12,20 +12,16 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	lttng-tracer-core.h \
 	jhash.h \
 	error.h
+
 liblttng_ust_tracepoint_la_LIBADD = \
 	-lurcu-bp \
 	-lpthread \
-	$(top_builddir)/snprintf/libustsnprintf.la
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(DL_LIBS)
+
 liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" $(AM_CFLAGS)
 
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_tracepoint_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_tracepoint_la_LIBADD += -lc
-endif
-
 liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-comm.c \
 	lttng-ust-abi.c \
@@ -106,13 +102,7 @@ liblttng_ust_la_LIBADD = \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	liblttng-ust-tracepoint.la \
-	liblttng-ust-runtime.la liblttng-ust-support.la
-
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_la_LIBADD += -lc
-endif
+	liblttng-ust-runtime.la liblttng-ust-support.la \
+	$(DL_LIBS)
 
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)