Use libtool syntax in LDADD

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

diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
index e73b4d88ad52c9a8f634c6ae316e953937f12e2c..68aa02c7d024e3b2579fe404677b4cf757b38a6f 100644 (file)
--- a/liblttng-ust-libc-wrapper/Makefile.am
+++ b/liblttng-ust-libc-wrapper/Makefile.am
@@ -3,28 +3,22 @@ AM_CFLAGS += -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la \
   liblttng-ust-pthread-wrapper.la
+
 liblttng_ust_libc_wrapper_la_SOURCES = \
        lttng-ust-malloc.c \
        ust_libc.h
+
 liblttng_ust_libc_wrapper_la_LIBADD = \
-       -L$(top_builddir)/liblttng-ust/.libs \
-       -llttng-ust
+       $(top_builddir)/liblttng-ust/liblttng-ust.la \
+       $(DL_LIBS)
 
 liblttng_ust_pthread_wrapper_la_SOURCES = \
        lttng-ust-pthread.c \
        ust_pthread.h
-liblttng_ust_pthread_wrapper_la_LIBADD = \
-       -L$(top_builddir)/liblttng-ust/.libs \
-       -llttng-ust
 
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_libc_wrapper_la_LIBADD += -ldl
-liblttng_ust_pthread_wrapper_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_libc_wrapper_la_LIBADD += -lc
-liblttng_ust_pthread_wrapper_la_LIBADD += -lc
-endif
+liblttng_ust_pthread_wrapper_la_LIBADD = \
+       $(top_builddir)/liblttng-ust/liblttng-ust.la \
+       $(DL_LIBS)
 
-noinst_SCRIPTS = run
-EXTRA_DIST = run
+dist_noinst_SCRIPTS = run
+EXTRA_DIST = README