X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=e61735d421e8cf719d5a62e93c9dd7e01900847e;hb=9ec6895c5633ed93c5acdf1e5b06f075fbd709d3;hp=f8620dfbaee8dd89c56e18f3e96fe3553739dd16;hpb=e0baa9906b1c443228605a2b29c37b4bc004c61c;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index f8620dfb..e61735d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,24 @@
-SUBDIRS = libmarkers libtracectl libtracing hello libmallocwrap
+ACLOCAL_AMFLAGS = -I config
+
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle