X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=9d362f42bc78e64b2123058ffeee285ef96de8f5;hb=106ff4dab82c51bd7bf022220bf43f15fb04f8bc;hp=e498719573db73f74395fb7e1a1e0c5bf9807890;hpb=21ddb8ec9689e02944dae9cd4e5aba1ca2ab0d5b;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index e4987195..9d362f42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +1,54 @@
-ACLOCAL_AMFLAGS = -I config
+# SPDX-License-Identifier: LGPL-2.1-only
+
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		libcounter \
+		libmsgpack \
 		liblttng-ust \
 		liblttng-ust-ctl \
+		liblttng-ust-fd \
 		liblttng-ust-fork \
 		liblttng-ust-libc-wrapper \
 		liblttng-ust-cyg-profile \
 		tools
 
-if HAVE_DLINFO
+if ENABLE_UST_DL
 SUBDIRS += liblttng-ust-dl
 endif
 
-if BUILD_JNI_INTERFACE
+if ENABLE_JNI_INTERFACE
 SUBDIRS += liblttng-ust-java
 endif
 
-if BUILD_JAVA_AGENT
+if ENABLE_JAVA_AGENT
 SUBDIRS += liblttng-ust-java-agent
 endif
 
-if BUILD_PYTHON_AGENT
+if ENABLE_PYTHON_AGENT
 SUBDIRS += python-lttngust \
 		liblttng-ust-python-agent
 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
+pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc
+
+dist_doc_DATA = \
+	ChangeLog \
+	LICENSE \
+	README.md
+
+dist_noinst_DATA = \
+	CodingStyle \
+	CONTRIBUTING.md \
+	LICENSES/BSD-2-Clause \
+	LICENSES/BSD-3-Clause \
+	LICENSES/GPL-2.0 \
+	LICENSES/GPL-3.0 \
+	LICENSES/LGPL-2.1 \
+	LICENSES/MIT
 
 check-loop:
 	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop