X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=f966498bf5bcd749c0cecd06730280e430822c8d;hb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;hp=2d6c23b6653f64c2b470dfaaa8566b85cc82247c;hpb=01377ba5ec3460a6886f3a16e52f7f956c8fb100;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2d6c23b6..f966498b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,14 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ust libinterfork
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
-bin_SCRIPTS = usttrace
+SUBDIRS = . include doc snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-java \
+		tests
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc