Fix: application exit race with pthread cancel

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc2f4420f5ff6b92692159cf27cd158c9340febe..9fb955658cae7f9a03f49b4228a4b311ae235d3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,17 +5,29 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
                liblttng-ust-ctl \
                liblttng-ust-fork \
                liblttng-ust-libc-wrapper \
-               tools \
-               tests
+               liblttng-ust-cyg-profile \
+               tools
+
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
 
 if BUILD_JNI_INTERFACE
 SUBDIRS += liblttng-ust-java
 endif
 
+if BUILD_JAVA_AGENT
+SUBDIRS += liblttng-ust-java-agent
+endif
+
+SUBDIRS += tests doc
+
 #temporarily disabled
 # liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lttng-ust.pc
 
-dist_doc_DATA = README ChangeLog
+dist_doc_DATA = README.md ChangeLog
+
+dist_noinst_DATA = CodingStyle