X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=fd9cbe949e86e74f565d32a89d0906978d70e04b;hb=6cdf29f8cd289d763fae461c618975fe43095e8b;hp=1f9ba751ef89192f77d860bc25d7bf601f07a80a;hpb=6dd969b5dd702909b8eb827e850c851053774055;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 1f9ba751..fd9cbe94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests 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