X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=810761ca3b52cd46608dd5e667bc44b0f3f3b6ea;hb=5de7c318804a7b1edce8562d4891b4c74aac0677;hp=1ab59487cc26af608819e12ee2fe1e3a3a7ca2f6;hpb=93d0f2eaff675059588e958e3de74a1bb7dd4028;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 1ab59487..810761ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,43 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
 
-EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h
-dist_bin_SCRIPTS = usttrace
+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
 
-include_HEADERS = share/kernelcompat.h share/usterr.h
+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
+
+dist_doc_DATA = README.md ChangeLog
+
+dist_noinst_DATA = CodingStyle
+
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop