X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=c907ff1b64ad306fab50e18b1495c49e905f1f54;hb=refs%2Fheads%2Fstable-2.4;hp=f966498bf5bcd749c0cecd06730280e430822c8d;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index f966498b..c907ff1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,29 @@
 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 \
+		liblttng-ust-cyg-profile \
+		tools
+
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java liblttng-ust-jul
+endif
+
+SUBDIRS += tests doc
 
 #temporarily disabled
 # liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle