X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=6fab95641fab971faf950728300ddae5cadedc3b;hb=ca7643d600c284ebf884fd72b93f41c5edb5d2f2;hp=1f9ba751ef89192f77d860bc25d7bf601f07a80a;hpb=6dd969b5dd702909b8eb827e850c851053774055;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 1f9ba751..6fab9564 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,26 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ust
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm liblttng-ust-baddr \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-dl \
+		liblttng-ust-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		tools
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java liblttng-ust-jul
+endif
+
+SUBDIRS += tests doc
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle