X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2FMakefile.am;h=12e8196623f69c4542fa0a91689a41a653906167;hb=70f9f7f95a5a36231e4a71191bcd88d582c3ca81;hp=5b3f7f0da586872bce4f7e04ee9fa664072f9dba;hpb=a2adb105d815cfbcf9bf8f870f2f72f79a319138;p=lttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
index 5b3f7f0d..12e81966 100644
--- a/liblttng-ust-libc-wrapper/Makefile.am
+++ b/liblttng-ust-libc-wrapper/Makefile.am
@@ -1,20 +1,23 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -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
+	$(top_builddir)/liblttng-ust/liblttng-ust.la \
+	$(DL_LIBS)
+
+liblttng_ust_pthread_wrapper_la_SOURCES = \
+	lttng-ust-pthread.c \
+	ust_pthread.h
 
-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_LIBADD = \
+	$(top_builddir)/liblttng-ust/liblttng-ust.la \
+	$(DL_LIBS)
 
-noinst_SCRIPTS = run
-EXTRA_DIST = run
+dist_noinst_SCRIPTS = run
+EXTRA_DIST = README