Merge branch 'master' into benchmark

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 37f95a4022dcf35e6b384a1bbdedc2c5495b9bbb..5350028fb8f1eb555247f2dd0f9e73b49adff326 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,13 +19,17 @@ aclocal.m4
 autom4te.cache/
 config.h
 config.h.in
-config/
 config.log
 config.status
 stamp-h1
 libtool
 tags
 
+# m4 macros not automatically generated
+config/
+!config/epoll.m4
+!config/config_feature.m4
+
 ltt-sessiond/ltt-sessiond
 lttng/lttng
 ltt-kconsumerd/ltt-kconsumerd