X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=c726b81696e26deedb923a2e176a6cde0bfd2f5d;hb=273973c0f59628f3dc242fdf1a41d5f275b290e2;hp=f966498bf5bcd749c0cecd06730280e430822c8d;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index f966498b..c726b816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,23 @@
 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 \
-		liblttng-ust-java \
-		tests
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
+
+#disabled for 2.0
+#if BUILD_JNI_INTERFACE
+#SUBDIRS += liblttng-ust-java
+#endif
 
 #temporarily disabled
 # liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog