Move libconsumer under common/consumer/

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b744596b1905eecf307aef95254280b2945458d3..7b2a23f0da3c7b529f8d10451b9f60e506b6cec2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,15 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = common \
-                 liblttng-sessiond-comm \
-                 libkernelctl \
-                 liblttng-kconsumer \
-                 liblttng-ustconsumer \
-                 liblttng-consumer \
-                 lttng-consumerd
+SUBDIRS = include \
+                 src \
+                 tests \
+                 extras \
+                 doc
 
-if ! BUILD_CONSUMERD_ONLY
-SUBDIRS += liblttngctl \
-           lttng \
-           lttng-sessiond
-endif
+dist_doc_DATA = LICENSE \
+                ChangeLog \
+               README.md
 
-SUBDIRS += tests \
-           include \
-           doc
+dist_noinst_DATA = CodingStyle
+
+EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt