X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=d6fa3d51e1dd7bf7066be7e4532a09e79b4feccf;hb=36385b6ec421b3e752ce1eaad3bcb6776f5536dd;hp=46dc86ca7ffa9dbade74c624bef5cb9e21ed64cf;hpb=6af64c431c0a521fc927fa72b9f4015397ce11d4;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 46dc86ca..d6fa3d51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,17 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . include doc snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		tests
 
-include_HEADERS = share/kernelcompat.h share/usterr.h
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc