Re: cycle-check.h fix imported from coreutils

[Ralf Wildenhues]

Hello Mark, everyone,

* Mark D. Baushke wrote on Thu, Jul 06, 2006 at 07:31:43PM CEST:
> Ralf Wildenhues <address@hidden> writes:
> > * Paul Eggert wrote on Tue, Jul 04, 2006 at 09:43:44AM CEST:
> > > "Mark D. Baushke" <address@hidden> writes:
> > > 
> > > > -lib_SOURCES += cycle-check.c cycle-check.h dev-ino.h
> > > > +lib_SOURCES += cycle-check.c cycle-check.h dev-ino.h same-inode.h
> > > 
> > > Thanks for catching that; I installed it.
> > 
> > This should not be necessary:
> > $ automake      # in a test tree
> > | lib/Makefile.am:16: automatically discovered file `same-inode.h' should 
> > not be explicitly mentioned

> My problem is that if it is not in lib_SOURCES, then my 'make dist' does
> not find the same-inode.h to include it unless I add the file to
> EXTRA_DIST explicitly.

Right.  The issue is different, and I was wrong:  same-inode.h is shared
("owned") by several modules.  Only one of them, the 'same' module, has
the file listed in AC_LIBSOURCES.  So whenever that is used in
conjunction with cycle-check (or mkdir-p, FWIW), automake will warn
(I got the warning with a test that has almost all modules listed)

> It may be I have done something wrong.

Nono.  But thanks for the pointer, the CVS source tree helped me
understand this.

Begs the question whether it is useful to split the header file out into
a module of its own, maybe named 'same-inode', and have the other two
depend on it instead of listing the header explicitly?

Completely untested rough patch below, listing Jim as maintainer of that
new module.  Thoughts?  Does this need addition to MODULES.html?

Cheers,
Ralf

        * modules/same-inode: New module, comprising same-inode.h.
        * modules/cycle-check: Depend on it, don't list same-inode.h.
        * modules/mkdir-p, modules/same: Likewise.

Index: modules/cycle-check
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/cycle-check,v
retrieving revision 1.5
diff -u -r1.5 cycle-check
--- modules/cycle-check 4 Jul 2006 07:43:15 -0000       1.5
+++ modules/cycle-check 6 Jul 2006 17:57:47 -0000
@@ -4,16 +4,16 @@
 Files:
 lib/cycle-check.c
 lib/cycle-check.h
-lib/same-inode.h
 lib/dev-ino.h
 
 Depends-on:
 stdbool
+same-inode
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += cycle-check.c cycle-check.h dev-ino.h same-inode.h
+lib_SOURCES += cycle-check.c cycle-check.h dev-ino.h
 
 Include:
 "cycle-check.h"
Index: modules/mkdir-p
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/mkdir-p,v
retrieving revision 1.4
diff -u -r1.4 mkdir-p
--- modules/mkdir-p     3 Jul 2006 08:32:46 -0000       1.4
+++ modules/mkdir-p     6 Jul 2006 17:57:47 -0000
@@ -7,7 +7,6 @@
 lib/lchmod.h
 lib/mkdir-p.c
 lib/mkdir-p.h
-lib/same-inode.h
 m4/afs.m4
 m4/chdir-safer.m4
 m4/lchmod.m4
@@ -23,6 +22,7 @@
 quote
 stat-macros
 stdbool
+same-inode
 
 configure.ac:
 gl_MKDIR_PARENTS
Index: modules/same
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/same,v
retrieving revision 1.7
diff -u -r1.7 same
--- modules/same        3 Jul 2006 08:32:46 -0000       1.7
+++ modules/same        6 Jul 2006 17:57:47 -0000
@@ -5,7 +5,6 @@
 Files:
 lib/same.h
 lib/same.c
-lib/same-inode.h
 m4/same.m4
 
 Depends-on:
@@ -13,6 +12,7 @@
 error
 dirname
 stdbool
+same-inode
 
 configure.ac:
 gl_SAME
--- /dev/null   1970-01-01 00:00:01.000000000 +0200
+++ modules/same-inode  2006-07-06 19:56:38.000000000 +0200
@@ -0,0 +1,19 @@
+Description:
+Determine whether two stat buffers refer to the same file.
+
+Files:
+lib/same-inode.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering