X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=c726b81696e26deedb923a2e176a6cde0bfd2f5d;hb=273973c0f59628f3dc242fdf1a41d5f275b290e2;hp=f1ccfcf1497d8411b83bff40f9f90ea179a34040;hpb=7a7dca403897749bd9517dbb94cfc144adfd64f9;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index f1ccfcf1..c726b816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,23 @@
-SUBDIRS = libmarkers libtracectl libtracing
+ACLOCAL_AMFLAGS = -I config
+
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
+
+#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