X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=e61735d421e8cf719d5a62e93c9dd7e01900847e;hb=refs%2Fheads%2Fstable-2.1;hp=fd9cbe949e86e74f565d32a89d0906978d70e04b;hpb=e822f505be95ac8c30c7b535a7b48c05ed0c1293;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index fd9cbe94..e61735d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,24 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc tests \
-		libustjava libustfork
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
 #temporarily disabled
-# . libustinstr-malloc
+# liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle