From 5c1d9e54c7e7e124d95f6b08505f39914e65357a Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Thu, 7 Jul 2022 01:18:45 -0400
Subject: [PATCH] Move our fnmatch/glob implementation into gl/lib

The gl subdirectory contains our local versions of gnulib module
implementations, so move fnmatch* and glob* from lib to gl/lib.

* gl/modules/make-glob: Add a proper Files: section.
* lib/.gitignore: Delete unnecessary ignore file: lib is empty.
* .gitignore: Add lib/ as an ignored directory.
---
 .gitignore                   |  1 +
 {lib => gl/lib}/fnmatch.c    |  0
 {lib => gl/lib}/fnmatch.in.h |  0
 {lib => gl/lib}/glob.c       |  0
 {lib => gl/lib}/glob.in.h    |  0
 gl/modules/make-glob         |  7 +++++--
 lib/.gitignore               | 11 -----------
 7 files changed, 6 insertions(+), 13 deletions(-)
 rename {lib => gl/lib}/fnmatch.c (100%)
 rename {lib => gl/lib}/fnmatch.in.h (100%)
 rename {lib => gl/lib}/glob.c (100%)
 rename {lib => gl/lib}/glob.in.h (100%)
 delete mode 100644 lib/.gitignore

diff --git a/.gitignore b/.gitignore
index f548779f..ef5292f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ GTAGS
 *.rej
 
 # Configure artifacts
+/lib/
 ABOUT-NLS
 INSTALL
 Makefile
diff --git a/lib/fnmatch.c b/gl/lib/fnmatch.c
similarity index 100%
rename from lib/fnmatch.c
rename to gl/lib/fnmatch.c
diff --git a/lib/fnmatch.in.h b/gl/lib/fnmatch.in.h
similarity index 100%
rename from lib/fnmatch.in.h
rename to gl/lib/fnmatch.in.h
diff --git a/lib/glob.c b/gl/lib/glob.c
similarity index 100%
rename from lib/glob.c
rename to gl/lib/glob.c
diff --git a/lib/glob.in.h b/gl/lib/glob.in.h
similarity index 100%
rename from lib/glob.in.h
rename to gl/lib/glob.in.h
diff --git a/gl/modules/make-glob b/gl/modules/make-glob
index bf5a1d92..d9a34d33 100644
--- a/gl/modules/make-glob
+++ b/gl/modules/make-glob
@@ -2,6 +2,11 @@ Description:
 GNU make version of fnmatch()/glob() functions.  This is a holdover from
 a very old version of the globbing library.
 
+Files:
+lib/fnmatch.c
+lib/fnmatch.in.h
+lib/glob.c
+lib/glob.in.h
 
 configure.ac:
 # Check the system to see if it provides GNU glob.  If not, use our
@@ -28,7 +33,6 @@ AM_CONDITIONAL([USE_SYSTEM_GLOB], [test "$make_cv_sys_gnu_glob" = yes])
 USE_SYSTEM_GLOB="$make_cv_sys_gnu_glob"
 AC_SUBST([USE_SYSTEM_GLOB])
 
-
 Makefile.am:
 if !USE_SYSTEM_GLOB
 libgnu_a_SOURCES += fnmatch.c
@@ -60,7 +64,6 @@ endif
 
 EXTRA_DIST += fnmatch.in.h glob.in.h
 
-
 Include:
 <glob.h>
 
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index cb391c43..00000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*
-!/.gitignore
-
-!/fnmatch.c
-!/fnmatch.in.h
-/fnmatch.h
-
-!/glob.c
-!/glob.in.h
-/glob.h
-