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

diff --git a/Makefile.am b/Makefile.am
index 73b51909..9ab93ccd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,51 +1,29 @@
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
-		liblttng-ust \
-		liblttng-ust-ctl \
-		liblttng-ust-fd \
-		liblttng-ust-fork \
-		liblttng-ust-libc-wrapper \
-		liblttng-ust-cyg-profile \
-		tools
-
-if HAVE_DLINFO
-SUBDIRS += liblttng-ust-dl
-endif
-
-if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java
-endif
+# SPDX-License-Identifier: LGPL-2.1-only
 
-if BUILD_JAVA_AGENT
-SUBDIRS += liblttng-ust-java-agent
-endif
-
-if BUILD_PYTHON_AGENT
-SUBDIRS += python-lttngust \
-		liblttng-ust-python-agent
-endif
-
-SUBDIRS += tests doc
-
-#temporarily disabled
-# liblttng-ust-malloc
+ACLOCAL_AMFLAGS = -I m4
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lttng-ust.pc
+SUBDIRS = \
+	include \
+	src \
+	tools \
+	doc \
+	tests \
+	extras
 
 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