X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=00dd576f0c7b87f02f8e7990a4e93a1937b8b358;hb=6490eba0f6e5e7f5a50d4707f4b60fca0cc61e1e;hp=2d6c23b6653f64c2b470dfaaa8566b85cc82247c;hpb=01377ba5ec3460a6886f3a16e52f7f956c8fb100;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2d6c23b6..00dd576f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,28 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ust 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