X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=c726b81696e26deedb923a2e176a6cde0bfd2f5d;hp=dd92eaf31e02749b2073bc72af40b996d7d3d7ad;hb=29865d1ccafc065d07e0de67b196790ed36ab396;hpb=5f118a1c28ec1a3b4ad0dc847dac9636ce69852d

diff --git a/Makefile.am b/Makefile.am
index dd92eaf3..c726b816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,23 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc share/kernelcompat.h share/localerr.h share/share.h \
-	share/usterr.h
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
 
-include_HEADERS = share/kernelcompat.h share/localerr.h share/usterr.h
+#disabled for 2.0
+#if BUILD_JNI_INTERFACE
+#SUBDIRS += liblttng-ust-java
+#endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog