Fix: liblttng-ust-fork Makefile flags mismatch

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1bdedea2118f695c470d052f51b8d7bccfc76532..e61735d421e8cf719d5a62e93c9dd7e01900847e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,24 @@
-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
+
+dist_noinst_DATA = CodingStyle