Fix: liblttng-ust-fork Makefile flags mismatch

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5..e61735d421e8cf719d5a62e93c9dd7e01900847e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,24 @@
 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 \
+               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