X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=d18aca1437e5f9b6ba97d222776e4bb46b2601b4;hb=0a9eff096ef480f16445be173badc90f5b6540d2;hp=3b6344fa6cc271517eeb24c52de6236cafb8777d;hpb=bec399405a4667411ae06bbbcbed678e42e93a30;p=lttng-tools.git

diff --git a/Makefile.am b/Makefile.am
index 3b6344fa6..d18aca143 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = common \
-		  liblttng-sessiond-comm \
-		  libkernelctl \
-		  liblttng-ht \
-		  liblttng-kconsumer \
-		  liblttng-ustconsumer \
-		  liblttng-consumer \
-		  lttng-consumerd
+DIST_SUBDIRS = include src extras doc tests
 
-if ! BUILD_CONSUMERD_ONLY
-SUBDIRS += liblttngctl \
-           lttng \
-           lttng-sessiond
+SUBDIRS = include src doc tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
 endif
 
-SUBDIRS += tests \
-           include \
-           doc
+dist_doc_DATA = LICENSE \
+                ChangeLog \
+		README.md
+
+dist_noinst_DATA = CodingStyle
+
+EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt \
+	     version