X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=9fb955658cae7f9a03f49b4228a4b311ae235d3d;hb=87edc3384d84e55d7dd736c71f1885ef7b735ad3;hp=00dd576f0c7b87f02f8e7990a4e93a1937b8b358;hpb=b13d93c24dfd101dc7a7f8ea2567a2164f807cdc;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 00dd576f..9fb95565 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,18 +4,23 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
 		liblttng-ust \
 		liblttng-ust-ctl \
 		liblttng-ust-fork \
-		liblttng-ust-baddr \
-		liblttng-ust-dl \
 		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
@@ -23,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