X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=dc88c46ea07b47ba17026b4757383c2d8e45e540;hb=refs%2Fheads%2Fstable-2.2;hp=b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5;hpb=57773204abc43ed7d4350ac0d641ddbbda1e441e;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index b9cc1e7d..dc88c46e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,25 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust libustctl \
-		include doc libustjava libustfork tests
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		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