X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=cc923c1da4476feeca7ad2fdf62b54c3ac006155;hp=98a38810caecd5db109b15f6702209f2674b0e03;hb=de713d8a77cbd77e60f58537b0fc222f98fde395;hpb=336cc1ed530f632f3cb6197cfb43063dc8df92dd

diff --git a/Makefile.am b/Makefile.am
index 98a38810..cc923c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,52 @@
-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-libc \
-		tests
+		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
 # 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_noinst_DATA = \
+	CodingStyle \
+	CONTRIBUTING.md \
+	gpl-2.0.txt \
+	lgpl-2.1.txt \
+	mit-license.txt
 
-dist_doc_DATA = README ChangeLog
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop