Fix: Fix self-assign warning on struct ustfork_clone_info init

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f966498bf5bcd749c0cecd06730280e430822c8d..c726b81696e26deedb923a2e176a6cde0bfd2f5d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,23 @@
 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
+
+#disabled for 2.0
+#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