From 8f2231aa2466963b43e228fc4b6066dd519da4d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Sun, 7 Jun 2015 17:18:39 +0100
Subject: [PATCH] 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.
---
 .gitignore | 16 +++++++++++++---
 cfg.mk     | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 885d309bd0..86574ecc99 100644
--- 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 ff2e4d22ea..329920761b 100644
--- 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
-- 
2.47.2