Remove inappropriate \n from easy-ust sample

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f966498bf5bcd749c0cecd06730280e430822c8d..e231e085d9dfdb4e7a76ea2d50a5418262ea107e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,22 @@
 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
+
+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