X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=d6fa3d51e1dd7bf7066be7e4532a09e79b4feccf;hb=4ab44fbe7377ad603da7dccebf2e0af6b768fa91;hp=2d6c23b6653f64c2b470dfaaa8566b85cc82247c;hpb=01377ba5ec3460a6886f3a16e52f7f956c8fb100;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2d6c23b6..d6fa3d51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,17 @@
-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 doc snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		tests
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc