Pass the Java app context information using two separate arrays

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1bdedea2118f695c470d052f51b8d7bccfc76532..5bb531128f932d213a199a34bb5be6d49826ce71 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,38 @@
-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 \
+               liblttng-ust-cyg-profile \
+               liblttng-ust-python-agent \
+               tools
+
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
+
+if BUILD_JAVA_AGENT
+SUBDIRS += liblttng-ust-java-agent
+endif
+
+if BUILD_PYTHON_AGENT
+SUBDIRS += python-lttngust
+endif
+
+SUBDIRS += tests doc
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README.md ChangeLog
+
+dist_noinst_DATA = CodingStyle