X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e6d7f8b599626643b46e3945ab75dae91fbb031c;hb=167ff4df850ed5c954ee374db66a04b1c9a4ef34;hp=d6fa3d51e1dd7bf7066be7e4532a09e79b4feccf;hpb=d2869a264f99f0e8138fd3fa08f3121a69e75150;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index d6fa3d51..e6d7f8b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,27 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = . include doc snprintf libringbuffer liblttng-ust-comm \
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
 		liblttng-ust \
 		liblttng-ust-ctl \
-		liblttng-ust-fork \
-		tests
+		tools \
+		tests \
+		doc
 
-if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java
-endif
+# Disabled for now, because these libraries
+# rely on the dlsym(3) RTLD_NEXT GNU extension.
+# This is not implemented in Cygwin.
+#		liblttng-ust-fork
+#		liblttng-ust-libc-wrapper
+
+#disabled for 2.0
+#if BUILD_JNI_INTERFACE
+#SUBDIRS += liblttng-ust-java
+#endif
 
 #temporarily disabled
 # liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog