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

diff --git a/Makefile.am b/Makefile.am
index 1f9ba751..d7d50791 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,17 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ust
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		tests
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc