X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=fd9cbe949e86e74f565d32a89d0906978d70e04b;hb=02fb33819486765abe837521d9fb4ced14200dda;hp=99326afa027aff7c85b3bf190e47c50bbf86e2d6;hpb=e14a34e05f6dd7b5f1133085561313ad90b8f266;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 99326afa..fd9cbe94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust hello libmallocwrap ustd ust
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc tests \
+		libustjava libustfork
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc