X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=cc923c1da4476feeca7ad2fdf62b54c3ac006155;hb=15b385c8a645128e3ed89f7f840c1441223097a4;hp=10b54cb4191805f99a9489aa6e638daaeb3c65ca;hpb=31ea1f6f0435b9e4ae91f72462fa0c2856dce8b2;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 10b54cb4..cc923c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,29 @@
-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
 
+if HAVE_DLINFO
+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
@@ -20,8 +32,21 @@ SUBDIRS += tests doc
 # liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lttng-ust.pc
+pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc
+
+dist_doc_DATA = \
+	ChangeLog \
+	COPYING \
+	LICENSE \
+	README.md
 
-dist_doc_DATA = README ChangeLog
+dist_noinst_DATA = \
+	CodingStyle \
+	CONTRIBUTING.md \
+	gpl-2.0.txt \
+	lgpl-2.1.txt \
+	mit-license.txt
 
-dist_noinst_DATA = CodingStyle
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop