X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e61735d421e8cf719d5a62e93c9dd7e01900847e;hb=refs%2Fheads%2Fstable-2.1;hp=1ab59487cc26af608819e12ee2fe1e3a3a7ca2f6;hpb=93d0f2eaff675059588e958e3de74a1bb7dd4028;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 1ab59487..e61735d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,24 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc share/kernelcompat.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-libc-wrapper \
+		tools \
+		tests \
+		doc
 
-include_HEADERS = share/kernelcompat.h share/usterr.h
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle