X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=0a64094b756e6a09dce3ed8ad0b700de33f9ecbb;hb=35ec2526b0bd16c7ee9884fda90b8e761e75425d;hp=33be5b49a47bc2cc804571418b750271554e7c2f;hpb=55ad629d916dc8a9e0e8859bd469815dc9ec6ceb;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 33be5b49..0a64094b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
-bin_SCRIPTS = usttrace
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc \
+		libustjava libustfork tests
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc