X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=0240558c8d44444239e98aa9ca59c5c209d2a9d7;hp=584f59b2e63102d1fb687a988899eb32746f4753;hb=c5bf436c3a42a83ca8b2c4f867d95eaabae582b2;hpb=f7ddd24e694b77d4f0bf92967120321d24243054

diff --git a/Makefile.am b/Makefile.am
index 584f59b2e..0240558c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,25 @@
-ACLOCAL_AMFLAGS = -I config
+# SPDX-License-Identifier: GPL-2.0-only
 
-SUBDIRS = src \
-		  tests \
-		  extras \
-		  include \
-		  doc
+ACLOCAL_AMFLAGS = -I m4
+
+DIST_SUBDIRS = include doc src extras tests
+
+SUBDIRS = include doc src tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
+endif
 
 dist_doc_DATA = LICENSE \
-                ChangeLog
+                ChangeLog \
+		README.adoc
 
 dist_noinst_DATA = CodingStyle
 
-EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt
+EXTRA_DIST = extras/lttng-bash_completion \
+	     LICENSES/BSD-2-Clause \
+	     LICENSES/BSD-3-Clause \
+	     LICENSES/GPL-2.0 \
+	     LICENSES/LGPL-2.1 \
+	     LICENSES/MIT \
+	     version