Depend on new stat-macros module

rather than listing lib/stat-macros.h manually.
Don't add stat-macros.h to lib_SOURCES or list it in Files: section.

8 files changed, 9 insertions, 15 deletions

diff --git a/modules/canonicalize b/modules/canonicalize
index df7171c0c5..42b50fcafe 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -4,12 +4,12 @@ Return the canonical absolute name of a given file.
 Files:
 lib/canonicalize.h
 lib/canonicalize.c
-lib/stat-macros.h
 m4/canonicalize.m4
 
 Depends-on:
 cycle-check
 path-concat
+stat-macros
 xalloc
 xgetcwd
 xreadlink
diff --git a/modules/euidaccess b/modules/euidaccess
index 8d4bb87528..9773941c88 100644
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -4,17 +4,17 @@ euidaccess() function: check effective user's permissions for a file.
 Files:
 lib/euidaccess.h
 lib/euidaccess.c
-lib/stat-macros.h
 m4/euidaccess.m4
 
 Depends-on:
 group-member
+stat-macros
 
 configure.ac:
 gl_FUNC_EUIDACCESS
 
 Makefile.am:
-lib_SOURCES += euidaccess.h stat-macros.h
+lib_SOURCES += euidaccess.h
 
 Include:
 "euidaccess.h"
@@ -24,4 +24,3 @@ LGPL
 
 Maintainer:
 Jim Meyering, glibc
-
diff --git a/modules/file-type b/modules/file-type
index fe9909e5d6..fcfc672489 100644
--- a/modules/file-type
+++ b/modules/file-type
@@ -4,11 +4,11 @@ Return a string describing the type of a file.
 Files:
 lib/file-type.h
 lib/file-type.c
-lib/stat-macros.h
 m4/file-type.m4
 
 Depends-on:
 gettext
+stat-macros
 
 configure.ac:
 gl_FILE_TYPE
diff --git a/modules/filemode b/modules/filemode
index 14567eb7b2..b45e692e7b 100644
--- a/modules/filemode
+++ b/modules/filemode
@@ -5,10 +5,10 @@ file.
 Files:
 lib/filemode.h
 lib/filemode.c
-lib/stat-macros.h
 m4/filemode.m4
 
 Depends-on:
+stat-macros
 
 configure.ac:
 gl_FILEMODE
diff --git a/modules/lchown b/modules/lchown
index df65a51a5f..81d488a2b9 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -4,17 +4,16 @@ lchown() function: change ownership of a file.
 Files:
 lib/lchown.h
 lib/lchown.c
-lib/stat-macros.h
 m4/lchown.m4
 
 Depends-on:
 chown
+stat-macros
 
 configure.ac:
 gl_FUNC_LCHOWN
 
 Makefile.am:
-lib_SOURCES += stat-macros.h
 
 Include:
 "lchown.h"
@@ -24,4 +23,3 @@ GPL
 
 Maintainer:
 Jim Meyering
-
diff --git a/modules/makepath b/modules/makepath
index 05eacdb1bd..209fc2acb2 100644
--- a/modules/makepath
+++ b/modules/makepath
@@ -4,7 +4,6 @@ Ensure that a directory path exists.
 Files:
 lib/makepath.h
 lib/makepath.c
-lib/stat-macros.h
 m4/afs.m4
 m4/makepath.m4
 
@@ -16,6 +15,7 @@ save-cwd
 dirname
 error
 quote
+stat-macros
 
 configure.ac:
 gl_MAKEPATH
diff --git a/modules/rmdir b/modules/rmdir
index 0dff3121a5..a67be2b69a 100644
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -3,16 +3,15 @@ rmdir() function: delete a directory.
 
 Files:
 lib/rmdir.c
-lib/stat-macros.h
 m4/rmdir.m4
 
 Depends-on:
+stat-macros
 
 configure.ac:
 gl_FUNC_RMDIR
 
 Makefile.am:
-lib_SOURCES += stat-macros.h
 
 Include:
 <unistd.h>
@@ -22,4 +21,3 @@ GPL
 
 Maintainer:
 Jim Meyering
-
diff --git a/modules/stat b/modules/stat
index 4923b5724d..f9425d96c0 100644
--- a/modules/stat
+++ b/modules/stat
@@ -3,17 +3,16 @@ stat() function: return information about a file, following symbolic links.
 
 Files:
 lib/stat.c
-lib/stat-macros.h
 m4/stat.m4
 
 Depends-on:
 xalloc
+stat-macros
 
 configure.ac:
 gl_FUNC_STAT
 
 Makefile.am:
-lib_SOURCES += stat-macros.h
 
 Include:
 <sys/stat.h>