X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e231e085d9dfdb4e7a76ea2d50a5418262ea107e;hb=bd68f05335c6f9831d1da9403b0854a7df16d2ca;hp=1bdedea2118f695c470d052f51b8d7bccfc76532;hpb=fbca6b624335eef18c8d86194aeb101a720168f4;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 1bdedea2..e231e085 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,22 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc
-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
+
+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