maint: sync .gitignore items with gnulib entries

* .gitignore: Add entries for potentially generated headers.
Also remove a couple of items already present in lib/.gitignore.
* cfg.mk (sc_gitignore_missing): A new syntax check rule to
identify missing .gitignore entries.
(sc_gitignore_redundant): A new syntax check rule to
identify redundant .gitignore entries.
Reported by Tomas Nordin.

diff --git a/.gitignore b/.gitignore
index 885d309bd0b082ad68f8312961d4a25895e77660..86574ecc99e1b8cba11f1827ed753947dd0ba7fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,7 @@
 /lib/.gitignore
 /lib/alloca.h
 /lib/arg-nonnull.h
-/lib/arpa
+/lib/arpa/inet.h
 /lib/binary-io.h
 /lib/c++defs.h
 /lib/charset.alias
@@ -53,7 +53,10 @@
 /lib/configmake.h
 /lib/ctype.h
 /lib/dirent.h
+/lib/errno.h
 /lib/fcntl.h
+/lib/float.h
+/lib/fnmatch.h
 /lib/getopt.h
 /lib/glthread
 /lib/iconv.h
@@ -69,17 +72,24 @@
 /lib/locale.h
 /lib/math.h
 /lib/netdb.h
+/lib/netinet/in.h
 /lib/parse-datetime.c
 /lib/printf.c
-/lib/progname.c
-/lib/progname.h
+/lib/pthread.h
 /lib/ref-add.sed
 /lib/ref-del.sed
+/lib/sched.h
+/lib/se-context.h
+/lib/se-selinux.h
 /lib/selinux
 /lib/signal.h
 /lib/spawn.h
 /lib/stamp-h1
 /lib/stdalign.h
+/lib/stdarg.h
+/lib/stdbool.h
+/lib/stddef.h
+/lib/stdint.h
 /lib/stdio.h
 /lib/stdlib.h
 /lib/string.h

diff --git a/cfg.mk b/cfg.mk
index ff2e4d22ead16dd1df54ad30b69d70ef8df7d4dc..329920761bfe4c65728a1ee3a240b53a63dd9e05 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -648,6 +648,21 @@ sc_fs-magic-compare:
            && { echo '$(ME): Constants in src/stat.c should be 4 or 8' \
                      'upper-case chars' 1>&2; exit 1; } || :
 
+# Ensure gnulib generated files are ignored
+# TODO: Perhaps augment gnulib-tool to do this in lib/.gitignore?
+sc_gitignore_missing:
+       @{ sed -n '/^\/lib\/.*\.h$$/{p;p}' .gitignore;                  \
+           find lib -name '*.in*' ! -name '*~' ! -name 'sys_*' |       \
+             sed 's|^|/|; s|_\(.*in\.h\)|/\1|; s/\.in//'; } |          \
+             sort | uniq -u | grep . && { echo '$(ME): Add above'      \
+               'entries to .gitignore' >&2; exit 1; } || :
+
+# Flag redundant entreis in .gitignore
+sc_gitignore_redundant:
+       @{ grep ^/lib .gitignore; sed 's|^|/lib|' lib/.gitignore; } |   \
+           sort | uniq -d | grep . && { echo '$(ME): Remove above'     \
+             'entries from .gitignore' >&2; exit 1; } || :
+
 # Override the default Cc: used in generating an announcement.
 announcement_Cc_ = $(translation_project_), \
   coreutils@gnu.org, coreutils-announce@gnu.org