-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
+ACLOCAL_AMFLAGS = -I config
-EXTRA_DIST = doc share/kernelcompat.h share/localerr.h share/share.h \
- share/usterr.h
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+ liblttng-ust \
+ liblttng-ust-ctl \
+ liblttng-ust-fork \
+ liblttng-ust-dl \
+ liblttng-ust-libc-wrapper \
+ liblttng-ust-cyg-profile \
+ tools
-include_HEADERS = share/kernelcompat.h share/localerr.h share/usterr.h
+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 = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle