-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
+ACLOCAL_AMFLAGS = -I config
-EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc tests \
+ libustjava libustfork
-include_HEADERS = share/kernelcompat.h share/usterr.h
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc