X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=810761ca3b52cd46608dd5e667bc44b0f3f3b6ea;hb=91ad51185170d7a782e11ef8e06643f4543ad1cd;hp=fd9cbe949e86e74f565d32a89d0906978d70e04b;hpb=e822f505be95ac8c30c7b535a7b48c05ed0c1293;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index fd9cbe94..810761ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,43 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc tests \
-		libustjava libustfork
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fd \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		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 \
+		liblttng-ust-python-agent
+endif
+
+SUBDIRS += tests doc
 
 #temporarily disabled
-# . libustinstr-malloc
+# liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README.md ChangeLog
+
+dist_noinst_DATA = CodingStyle
+
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop