X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=d6fa3d51e1dd7bf7066be7e4532a09e79b4feccf;hb=45e9e6996ae8da8d5dfffbe9aebd8e0438a84124;hp=2cab9628eb2df33a43b990ab34c4bfab984260d8;hpb=1304f3dfeb42271cebb865409bd3e010e2512aa4;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2cab9628..d6fa3d51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,17 @@
-SUBDIRS = libmarkers
+ACLOCAL_AMFLAGS = -I config
+
+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