X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e231e085d9dfdb4e7a76ea2d50a5418262ea107e;hb=9d36f30e825135d8fbb3ba6cb31ab10aa938b135;hp=0a64094b756e6a09dce3ed8ad0b700de33f9ecbb;hpb=3131b5db161e850d2062d540c76ace23f92b6cc7;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 0a64094b..e231e085 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,22 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc \
-		libustjava libustfork tests
+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