X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=9d362f42bc78e64b2123058ffeee285ef96de8f5;hb=1d18d519668cd559dcafa1f18113edceb2418ed0;hp=73b519090125728236bda4ae768ae1876965185b;hpb=b9c0e605c261aa81738046b7d7a2b571bf3777ed;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 73b51909..9d362f42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
+# 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 \
@@ -9,43 +13,42 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
 		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
+pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc
 
 dist_doc_DATA = \
 	ChangeLog \
-	COPYING \
 	LICENSE \
 	README.md
 
 dist_noinst_DATA = \
 	CodingStyle \
 	CONTRIBUTING.md \
-	gpl-2.0.txt \
-	lgpl-2.1.txt \
-	mit-license.txt
+	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