X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2FMakefile.am;h=e510a11a2c319c0e01493d431977b74ef45f75fd;hp=5b3f7f0da586872bce4f7e04ee9fa664072f9dba;hb=9d4d2a639afc19a1bd705ea560782917ac892596;hpb=c993aa602df5d770ea1da811c4f7f643dde1ed34

diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
index 5b3f7f0d..e510a11a 100644
--- a/liblttng-ust-libc-wrapper/Makefile.am
+++ b/liblttng-ust-libc-wrapper/Makefile.am
@@ -1,20 +1,26 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fno-strict-aliasing
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CFLAGS += -fno-strict-aliasing
+
+lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la \
+  liblttng-ust-pthread-wrapper.la
 
-lib_LTLIBRARIES = liblttng-ust-libc-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
+	-llttng-ust \
+	$(DL_LIBS)
 
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_libc_wrapper_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_libc_wrapper_la_LIBADD += -lc
-endif
+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 \
+	$(DL_LIBS)
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run