Rename liblttng-ust-malloc to liblttng-ust-libc, update to lttng-ust 2.0

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1ccfcf1497d8411b83bff40f9f90ea179a34040..01acea43e93ec854edf38f502fd59259be354def 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,18 @@
-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 \
+               tests
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc