-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