Re: enforcing the use of string.h related modules

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 1/31/2007 10:00 PM:
> 
> Also, I noticed that the dependency of
> string.h: string_h
> is not strong enough - fixing your typo changed configure from declaring 
> GNULIB_strcase to GNULIB_STRCASE, but did not regenerate string.h, so I had 
> to 
> manually remove it.  The problem is that I am not sure what else changes; 
> adding a dependency on config.status doesn't seem to be the right thing to 
> do.  
> At any rate, it is more than just the string module that is affected by this 
> missing dependency - all of the generated headers have the same problem.

Does this look correct to apply?  The configmake module already had a
dependence on Makefile, and this looks to be the only way to be sure that
changes in the module definition of the Makefile.am snippets are picked up
in an incremental build.

2007-02-01  Eric Blake  <address@hidden>

        * modules/arpa_inet (Makefile.am): Use MKDIR_P to avoid races.
        * modules/netinet_in (Makefile.am): Likewise.
        * modules/alloca-opt (Makefile.am): Also let Makefile changes
        regenerate the header.
        * modules/argz (Makefile.am): Likewise.
        * modules/arpa_inet (Makefile.am): Likewise.
        * modules/byteswap (Makefile.am): Likewise.
        * modules/fchdir (Makefile.am): Likewise.
        * modules/fcntl (Makefile.am): Likewise.
        * modules/fnmatch (Makefile.am): Likewise.
        * modules/getopt (Makefile.am): Likewise.
        * modules/glob (Makefile.am): Likewise.
        * modules/inttypes (Makefile.am): Likewise.
        * modules/netinet_in (Makefile.am): Likewise.
        * modules/poll (Makefile.am): Likewise.
        * modules/stdbool (Makefile.am): Likewise.
        * modules/stdint (Makefile.am): Likewise.
        * modules/string (Makefile.am): Likewise.
        * modules/sys_select (Makefile.am): Likewise.
        * modules/sys_socket (Makefile.am): Likewise.
        * modules/sys_stat (Makefile.am): Likewise.
        * modules/sys_time (Makefile.am): Likewise.
        * modules/sysexits (Makefile.am): Likewise.
        * modules/unistd (Makefile.am): Likewise.
        * modules/wchar (Makefile.am): Likewise.
        * modules/wctype (Makefile.am): Likewise.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFwfVF84KuGfSFAYARAsdAAJ9a1TzNDkcwuWixbnDEwl2EJzFuDwCeKVBr
rap6SKZVWoVVTm7WPQI6pIk=
=esgN
-----END PGP SIGNATURE-----

Index: modules/alloca-opt
===================================================================
RCS file: /sources/gnulib/gnulib/modules/alloca-opt,v
retrieving revision 1.7
diff -u -p -r1.7 alloca-opt
--- modules/alloca-opt  13 Oct 2006 12:40:23 -0000      1.7
+++ modules/alloca-opt  1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(ALLOCA_H)
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
+alloca.h: alloca_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/alloca_.h; \
        } > address@hidden
Index: modules/argz
===================================================================
RCS file: /sources/gnulib/gnulib/modules/argz,v
retrieving revision 1.10
diff -u -p -r1.10 argz
--- modules/argz        13 Oct 2006 12:40:23 -0000      1.10
+++ modules/argz        1 Feb 2007 14:10:10 -0000
@@ -16,7 +16,7 @@ BUILT_SOURCES += $(ARGZ_H)
 
 # We need the following in order to create <argz.h> when the system
 # doesn't have one that works with the given compiler.
-argz.h: argz_.h
+argz.h: argz_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/argz_.h; \
        } > address@hidden
Index: modules/arpa_inet
===================================================================
RCS file: /sources/gnulib/gnulib/modules/arpa_inet,v
retrieving revision 1.5
diff -u -p -r1.5 arpa_inet
--- modules/arpa_inet   7 Oct 2006 14:54:51 -0000       1.5
+++ modules/arpa_inet   1 Feb 2007 14:10:10 -0000
@@ -12,11 +12,12 @@ gl_HEADER_ARPA_INET
 
 Makefile.am:
 BUILT_SOURCES += $(ARPA_INET_H)
+AC_PROG_MKDIR_P
 
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
-arpa/inet.h:
-       test -d arpa || mkdir arpa
+arpa/inet.h: Makefile
+       @MKDIR_P@ arpa
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          echo '#include <sys/socket.h>'; \
Index: modules/byteswap
===================================================================
RCS file: /sources/gnulib/gnulib/modules/byteswap,v
retrieving revision 1.8
diff -u -p -r1.8 byteswap
--- modules/byteswap    13 Oct 2006 12:40:23 -0000      1.8
+++ modules/byteswap    1 Feb 2007 14:10:10 -0000
@@ -15,7 +15,7 @@ BUILT_SOURCES += $(BYTESWAP_H)
 
 # We need the following in order to create <byteswap.h> when the system
 # doesn't have one.
-byteswap.h: byteswap_.h
+byteswap.h: byteswap_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/byteswap_.h; \
        } > address@hidden
Index: modules/fchdir
===================================================================
RCS file: /sources/gnulib/gnulib/modules/fchdir,v
retrieving revision 1.3
diff -u -p -r1.3 fchdir
--- modules/fchdir      28 Jan 2007 16:10:39 -0000      1.3
+++ modules/fchdir      1 Feb 2007 14:10:10 -0000
@@ -22,7 +22,7 @@ BUILT_SOURCES += $(DIRENT_H)
 
 # We need the following in order to create <dirent.h> when the system
 # doesn't have one that works with the given compiler.
-dirent.h: dirent_.h
+dirent.h: dirent_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''ABSOLUTE_DIRENT_H''@|$(ABSOLUTE_DIRENT_H)|g' \
Index: modules/fcntl
===================================================================
RCS file: /sources/gnulib/gnulib/modules/fcntl,v
retrieving revision 1.7
diff -u -p -r1.7 fcntl
--- modules/fcntl       26 Dec 2006 18:42:09 -0000      1.7
+++ modules/fcntl       1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(FCNTL_H)
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl_.h
+fcntl.h: fcntl_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
Index: modules/fnmatch
===================================================================
RCS file: /sources/gnulib/gnulib/modules/fnmatch,v
retrieving revision 1.17
diff -u -p -r1.17 fnmatch
--- modules/fnmatch     16 Jan 2007 16:31:23 -0000      1.17
+++ modules/fnmatch     1 Feb 2007 14:10:10 -0000
@@ -22,7 +22,7 @@ BUILT_SOURCES += $(FNMATCH_H)
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-fnmatch.h: fnmatch_.h
+fnmatch.h: fnmatch_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/fnmatch_.h; \
        } > address@hidden
Index: modules/getopt
===================================================================
RCS file: /sources/gnulib/gnulib/modules/getopt,v
retrieving revision 1.16
diff -u -p -r1.16 getopt
--- modules/getopt      13 Oct 2006 12:40:23 -0000      1.16
+++ modules/getopt      1 Feb 2007 14:10:10 -0000
@@ -20,7 +20,7 @@ BUILT_SOURCES += $(GETOPT_H)
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt_.h
+getopt.h: getopt_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/getopt_.h; \
        } > address@hidden
Index: modules/glob
===================================================================
RCS file: /sources/gnulib/gnulib/modules/glob,v
retrieving revision 1.14
diff -u -p -r1.14 glob
--- modules/glob        27 Oct 2006 20:46:43 -0000      1.14
+++ modules/glob        1 Feb 2007 14:10:10 -0000
@@ -28,7 +28,7 @@ BUILT_SOURCES += $(GLOB_H)
 
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
-glob.h: glob_.h
+glob.h: glob_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/glob_.h; \
        } > address@hidden
Index: modules/inttypes
===================================================================
RCS file: /sources/gnulib/gnulib/modules/inttypes,v
retrieving revision 1.17
diff -u -p -r1.17 inttypes
--- modules/inttypes    26 Dec 2006 18:42:09 -0000      1.17
+++ modules/inttypes    1 Feb 2007 14:10:10 -0000
@@ -18,7 +18,7 @@ BUILT_SOURCES += $(INTTYPES_H)
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
-inttypes.h: inttypes_.h
+inttypes.h: inttypes_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
Index: modules/netinet_in
===================================================================
RCS file: /sources/gnulib/gnulib/modules/netinet_in,v
retrieving revision 1.5
diff -u -p -r1.5 netinet_in
--- modules/netinet_in  7 Oct 2006 14:54:51 -0000       1.5
+++ modules/netinet_in  1 Feb 2007 14:10:10 -0000
@@ -9,14 +9,15 @@ sys_socket
 
 configure.ac:
 gl_HEADER_NETINET_IN
+AC_PROG_MKDIR_P
 
 Makefile.am:
 BUILT_SOURCES += $(NETINET_IN_H)
 
 # We need the following in order to create <netinet/in.h> when the system
 # doesn't have one.
-netinet/in.h:
-       test -d netinet || mkdir netinet
+netinet/in.h: Makefile
+       @MKDIR_P@ netinet
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          echo '#include <sys/socket.h>'; \
Index: modules/poll
===================================================================
RCS file: /sources/gnulib/gnulib/modules/poll,v
retrieving revision 1.15
diff -u -p -r1.15 poll
--- modules/poll        20 Jan 2007 08:32:33 -0000      1.15
+++ modules/poll        1 Feb 2007 14:10:10 -0000
@@ -18,7 +18,7 @@ BUILT_SOURCES += $(POLL_H)
 
 # We need the following in order to create <poll.h> when the system
 # doesn't have one.
-poll.h: poll_.h
+poll.h: poll_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/poll_.h; \
        } > address@hidden
Index: modules/stdbool
===================================================================
RCS file: /sources/gnulib/gnulib/modules/stdbool,v
retrieving revision 1.16
diff -u -p -r1.16 stdbool
--- modules/stdbool     13 Oct 2006 12:40:23 -0000      1.16
+++ modules/stdbool     1 Feb 2007 14:10:10 -0000
@@ -16,7 +16,7 @@ BUILT_SOURCES += $(STDBOOL_H)
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
-stdbool.h: stdbool_.h
+stdbool.h: stdbool_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h; \
Index: modules/stdint
===================================================================
RCS file: /sources/gnulib/gnulib/modules/stdint,v
retrieving revision 1.19
diff -u -p -r1.19 stdint
--- modules/stdint      16 Jan 2007 16:31:23 -0000      1.19
+++ modules/stdint      1 Feb 2007 14:10:10 -0000
@@ -24,7 +24,7 @@ BUILT_SOURCES += $(STDINT_H)
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-stdint.h: stdint_.h
+stdint.h: stdint_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
Index: modules/string
===================================================================
RCS file: /sources/gnulib/gnulib/modules/string,v
retrieving revision 1.4
diff -u -p -r1.4 string
--- modules/string      1 Feb 2007 05:01:17 -0000       1.4
+++ modules/string      1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += string.h
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string_.h
+string.h: string_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''ABSOLUTE_STRING_H''@|$(ABSOLUTE_STRING_H)|g' \
Index: modules/sys_select
===================================================================
RCS file: /sources/gnulib/gnulib/modules/sys_select,v
retrieving revision 1.7
diff -u -p -r1.7 sys_select
--- modules/sys_select  22 Jan 2007 23:07:42 -0000      1.7
+++ modules/sys_select  1 Feb 2007 14:10:10 -0000
@@ -16,7 +16,7 @@ BUILT_SOURCES += $(SYS_SELECT_H)
 
 # We need the following in order to create <sys/select.h> when the system
 # doesn't have one that works with the given compiler.
-sys/select.h:
+sys/select.h: Makefile
        @MKDIR_P@ sys
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
Index: modules/sys_socket
===================================================================
RCS file: /sources/gnulib/gnulib/modules/sys_socket,v
retrieving revision 1.11
diff -u -p -r1.11 sys_socket
--- modules/sys_socket  22 Jan 2007 23:07:42 -0000      1.11
+++ modules/sys_socket  1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
-sys/socket.h: socket_.h
+sys/socket.h: socket_.h Makefile
        @MKDIR_P@ sys
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/socket_.h; \
Index: modules/sys_stat
===================================================================
RCS file: /sources/gnulib/gnulib/modules/sys_stat,v
retrieving revision 1.12
diff -u -p -r1.12 sys_stat
--- modules/sys_stat    22 Jan 2007 23:07:42 -0000      1.12
+++ modules/sys_stat    1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(SYS_STAT_H)
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: stat_.h
+sys/stat.h: stat_.h Makefile
        @MKDIR_P@ sys
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
Index: modules/sys_time
===================================================================
RCS file: /sources/gnulib/gnulib/modules/sys_time,v
retrieving revision 1.6
diff -u -p -r1.6 sys_time
--- modules/sys_time    28 Jan 2007 20:14:37 -0000      1.6
+++ modules/sys_time    1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(SYS_TIME_H)
 
 # We need the following in order to create <sys/time.h> when the system
 # doesn't have one that works with the given compiler.
-sys/time.h: sys_time_.h
+sys/time.h: sys_time_.h Makefile
        @MKDIR_P@ sys
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
Index: modules/sysexits
===================================================================
RCS file: /sources/gnulib/gnulib/modules/sysexits,v
retrieving revision 1.11
diff -u -p -r1.11 sysexits
--- modules/sysexits    13 Oct 2006 12:40:23 -0000      1.11
+++ modules/sysexits    1 Feb 2007 14:10:10 -0000
@@ -15,7 +15,7 @@ BUILT_SOURCES += $(SYSEXITS_H)
 
 # We need the following in order to create <sysexits.h> when the system
 # doesn't have one that works with the given compiler.
-sysexits.h: sysexit_.h
+sysexits.h: sysexit_.h Makefile
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/sysexit_.h; \
        } > address@hidden
Index: modules/unistd
===================================================================
RCS file: /sources/gnulib/gnulib/modules/unistd,v
retrieving revision 1.6
diff -u -p -r1.6 unistd
--- modules/unistd      14 Jan 2007 20:31:35 -0000      1.6
+++ modules/unistd      1 Feb 2007 14:10:10 -0000
@@ -16,7 +16,7 @@ BUILT_SOURCES += $(UNISTD_H)
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd_.h
+unistd.h: unistd_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''ABSOLUTE_UNISTD_H''@|$(ABSOLUTE_UNISTD_H)|g' \
Index: modules/wchar
===================================================================
RCS file: /sources/gnulib/gnulib/modules/wchar,v
retrieving revision 1.1
diff -u -p -r1.1 wchar
--- modules/wchar       13 Jan 2007 05:23:37 -0000      1.1
+++ modules/wchar       1 Feb 2007 14:10:10 -0000
@@ -16,7 +16,7 @@ BUILT_SOURCES += $(WCHAR_H)
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar_.h
+wchar.h: wchar_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''ABSOLUTE_WCHAR_H''@|$(ABSOLUTE_WCHAR_H)|g' \
Index: modules/wctype
===================================================================
RCS file: /sources/gnulib/gnulib/modules/wctype,v
retrieving revision 1.5
diff -u -p -r1.5 wctype
--- modules/wctype      10 Jan 2007 22:25:04 -0000      1.5
+++ modules/wctype      1 Feb 2007 14:10:10 -0000
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(WCTYPE_H)
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype_.h
+wctype.h: wctype_.h Makefile
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \