X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=00dd576f0c7b87f02f8e7990a4e93a1937b8b358;hb=86a4e97112c40b1ec823c60de8138d6bb55262fe;hp=33be5b49a47bc2cc804571418b750271554e7c2f;hpb=55ad629d916dc8a9e0e8859bd469815dc9ec6ceb;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 33be5b49..00dd576f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,28 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
-bin_SCRIPTS = usttrace
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-baddr \
+		liblttng-ust-dl \
+		liblttng-ust-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		tools \
+		doc
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java liblttng-ust-jul
+endif
+
+SUBDIRS += tests
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle