Merge branch 'master' into benchmark

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index aee12709103fc2168e8d082dbe678c293d9dbb21..79d0a02c5f587c3a00748b5a5063b1ef3bc9abce 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,20 +19,25 @@ aclocal.m4
 autom4te.cache/
 config.h
 config.h.in
-config/
 config.log
 config.status
 stamp-h1
 libtool
 tags
 
-ltt-sessiond/ltt-sessiond
+# m4 macros not automatically generated
+config/
+!config/epoll.m4
+!config/config_feature.m4
+
+lttng-sessiond/lttng-sessiond
 lttng/lttng
-ltt-kconsumerd/ltt-kconsumerd
+lttng-kconsumerd/lttng-kconsumerd
+lttng-consumerd/lttng-consumerd
 
 tests/test_sessions
 tests/test_kernel_data_trace
 tests/kernel_all_events_basic
 tests/kernel_event_basic
 
-benchmark/
+benchmark/bench_sessions