Add/remove things from .gitignore

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10220)

diff --git a/.gitignore b/.gitignore
index 50f461533e3b69a2f1a64e7a5f4df04995880298..f035ab1975629b707fc6c49c05c5f89b0bdd01aa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /.dir-locals.el
 
 # Top level excludes
-/Makefile.orig
+/Makefile
 /MINFO
 /TABLE
 /*.pc
@@ -13,11 +13,6 @@
 /tmp.*
 /configdata.pm
 
-# *all* Makefiles
-Makefile
-# ... except in demos
-!/demos/*/Makefile
-
 # Links under apps
 /apps/CA.pl
 /apps/tsget
@@ -27,8 +22,8 @@ Makefile
 # Auto generated headers
 /crypto/buildinf.h
 /include/crypto/*_conf.h
-/openssl/include/opensslconf.h
-/util/domd
+/include/openssl/opensslconf.h
+/include/openssl/opensslv.h
 
 # error code files
 /crypto/err/openssl.txt.old
@@ -80,7 +75,6 @@ Makefile
 
 # Misc auto generated files
 /doc/man7/openssl_user_macros.pod
-/include/openssl/opensslconf.h
 /tools/c_rehash
 /tools/c_rehash.pl
 /util/shlib_wrap.sh