X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=b6b7fb6d51b94e660f691c8e11fe721ea206b499;hp=c907ff1b64ad306fab50e18b1495c49e905f1f54;hb=9560f5ebf55ec70baefe6da3e3d644fc7d497b63;hpb=e2a13c66ba2097f0828f5f986f2aeb02c44cdf77

diff --git a/Makefile.am b/Makefile.am
index c907ff1b..b6b7fb6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,11 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		libcounter \
+		libmsgpack \
 		liblttng-ust \
 		liblttng-ust-ctl \
+		liblttng-ust-fd \
 		liblttng-ust-fork \
 		liblttng-ust-libc-wrapper \
 		liblttng-ust-cyg-profile \
@@ -13,7 +16,16 @@ SUBDIRS += liblttng-ust-dl
 endif
 
 if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java liblttng-ust-jul
+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
@@ -22,8 +34,21 @@ SUBDIRS += tests doc
 # liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lttng-ust.pc
-
-dist_doc_DATA = README ChangeLog
-
-dist_noinst_DATA = CodingStyle
+pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc
+
+dist_doc_DATA = \
+	ChangeLog \
+	COPYING \
+	LICENSE \
+	README.md
+
+dist_noinst_DATA = \
+	CodingStyle \
+	CONTRIBUTING.md \
+	gpl-2.0.txt \
+	lgpl-2.1.txt \
+	mit-license.txt
+
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop