X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=5bb531128f932d213a199a34bb5be6d49826ce71;hb=refs%2Fheads%2Fust-app-context-2;hp=2d6c23b6653f64c2b470dfaaa8566b85cc82247c;hpb=01377ba5ec3460a6886f3a16e52f7f956c8fb100;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2d6c23b6..5bb53112 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,38 @@
-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-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		liblttng-ust-python-agent \
+		tools
+
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+if BUILD_JAVA_AGENT
+SUBDIRS += liblttng-ust-java-agent
+endif
+
+if BUILD_PYTHON_AGENT
+SUBDIRS += python-lttngust
+endif
+
+SUBDIRS += tests doc
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README.md ChangeLog
+
+dist_noinst_DATA = CodingStyle