Version 2.6.0-rc2

[lttng-ust.git] / Makefile.am

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