Merge branch 'release-4.16.1'

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index b641592b9069e8222382d3bd2ca23d512753cf52..b2ebd4aa12f5ea3537171761d4a80ef5dc1ce0f9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,70 @@
 *.o
 tags
-include/loglevels.h
-loglevels.tmp
+include/GENERATED_*.h
+include/all.h.pch
+*~
 *.swp
 *.gcda
 *.gcno
-testcases/testsuite-*
-testcases/latest
-testcases/Makefile
+*.dSYM
+test.commands_parser
+test.config_parser
+testcases/MYMETA.json
+testcases/MYMETA.yml
+testcases/blib/
+testcases/pm_to_blib
+AnyEvent-I3/Makefile
+AnyEvent-I3/META.yml
+AnyEvent-I3/MYMETA.json
+AnyEvent-I3/MYMETA.yml
+AnyEvent-I3/blib/
+AnyEvent-I3/inc/
+AnyEvent-I3/pm_to_blib
 *.output
 *.tab.*
 *.yy.c
-man/i3-msg.1
-man/i3-msg.xml
-man/i3-msg.html
-man/i3-nagbar.1
-man/i3-nagbar.xml
-man/i3-nagbar.html
-man/i3-wsbar.1
-man/i3-wsbar.xml
-man/i3-wsbar.html
-man/i3-input.1
-man/i3-input.xml
-man/i3-input.html
-man/i3.1
-man/i3.xml
-man/i3.html
+man/*.1
+man/*.xml
+man/*.html
 *.tar.bz2*
 i3
 i3-input/i3-input
 i3-nagbar/i3-nagbar
 i3-msg/i3-msg
 i3-config-wizard/i3-config-wizard
-libi3/libi3.a
-docs/*.html
-docs/*.aux
-docs/*.out
+i3-dump-log/i3-dump-log
+libi3.a
 docs/*.pdf
+docs/*.html
+!/docs/refcard.html
+i3-command-parser.stamp
+i3-config-parser.stamp
+.clang_complete
+LAST_VERSION
+
+################################################################################
+# https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore
+################################################################################
+
+# http://www.gnu.org/software/automake
+
+Makefile.in
+/ar-lib
+/test-driver
+
+# http://www.gnu.org/software/autoconf
+
+/autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.h.in
+/config.guess
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h1