X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=810761ca3b52cd46608dd5e667bc44b0f3f3b6ea;hb=6c737d0594cac0d969e1948ea1ed55c15be9cec8;hp=00dd576f0c7b87f02f8e7990a4e93a1937b8b358;hpb=b13d93c24dfd101dc7a7f8ea2567a2164f807cdc;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 00dd576f..810761ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,32 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
 		liblttng-ust \
 		liblttng-ust-ctl \
+		liblttng-ust-fd \
 		liblttng-ust-fork \
-		liblttng-ust-baddr \
-		liblttng-ust-dl \
 		liblttng-ust-libc-wrapper \
 		liblttng-ust-cyg-profile \
-		tools \
-		doc
+		tools
+
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
 
 if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java liblttng-ust-jul
+SUBDIRS += liblttng-ust-java
 endif
 
-SUBDIRS += tests
+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
 # liblttng-ust-malloc
@@ -23,6 +34,10 @@ SUBDIRS += tests
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lttng-ust.pc
 
-dist_doc_DATA = README ChangeLog
+dist_doc_DATA = README.md ChangeLog
 
 dist_noinst_DATA = CodingStyle
+
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop