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

diff --git a/Makefile.am b/Makefile.am
index 99326afa..b9cc1e7d 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 libustctl \
+		include doc libustjava libustfork tests
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc