From d1aadab21bf8755e0fb75a838dc650e73f6ee78d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 6 Sep 2006 21:58:00 +0000 Subject: [PATCH] Make generated files be read-only. * modules/alloca-opt (Makefile.am): Work also when $@ is read-only. Ensure that each generated file is now read-only. * modules/argz: Likewise. * modules/arpa_inet: Likewise. * modules/byteswap: Likewise. * modules/configmake: Likewise. * modules/fcntl: Likewise. * modules/fnmatch: Likewise. * modules/getopt: Likewise. * modules/glob: Likewise. * modules/inttypes: Likewise. * modules/netinet_in: Likewise. * modules/poll: Likewise. * modules/stdbool: Likewise. * modules/stdint: Likewise. * modules/sys_select: Likewise. * modules/sys_socket: Likewise. * modules/sys_stat: Likewise. * modules/sysexits: Likewise. * modules/localcharset: Same as above, but continue using temporary file named "t-$@" (why different?) rather than the "$@-t" used everywhere else. * modules/sysexits (Makefile.am): Replace literal occurrences of "sysexit.h" more readable, and more consistent, "$@". --- ChangeLog | 29 +++++++++++++++++++++++++++++ modules/alloca-opt | 2 ++ modules/argz | 2 ++ modules/arpa_inet | 2 ++ modules/byteswap | 2 ++ modules/configmake | 2 ++ modules/fcntl | 2 ++ modules/fnmatch | 2 ++ modules/getopt | 2 ++ modules/glob | 2 ++ modules/inttypes | 2 ++ modules/localcharset | 4 ++++ modules/netinet_in | 2 ++ modules/poll | 2 ++ modules/stdbool | 2 ++ modules/stdint | 2 ++ modules/sys_select | 2 ++ modules/sys_socket | 2 ++ modules/sys_stat | 2 ++ modules/sysexits | 6 ++++-- 20 files changed, 71 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 129879048..8a416af2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2006-09-06 Jim Meyering + + Make generated files be read-only. + * modules/alloca-opt (Makefile.am): Work also when $@ is read-only. + Ensure that each generated file is now read-only. + * modules/argz: Likewise. + * modules/arpa_inet: Likewise. + * modules/byteswap: Likewise. + * modules/configmake: Likewise. + * modules/fcntl: Likewise. + * modules/fnmatch: Likewise. + * modules/getopt: Likewise. + * modules/glob: Likewise. + * modules/inttypes: Likewise. + * modules/netinet_in: Likewise. + * modules/poll: Likewise. + * modules/stdbool: Likewise. + * modules/stdint: Likewise. + * modules/sys_select: Likewise. + * modules/sys_socket: Likewise. + * modules/sys_stat: Likewise. + * modules/sysexits: Likewise. + * modules/localcharset: Same as above, but continue using temporary + file named "t-$@" (why different?) rather than the "$@-t" used + everywhere else. + + * modules/sysexits (Makefile.am): Replace literal occurrences + of "sysexit.h" more readable, and more consistent, "$@". + 2006-09-05 Bruno Haible * modules/gc (Makefile.am): Augment lib_LDFLAGS, not lib_LIBADD. diff --git a/modules/alloca-opt b/modules/alloca-opt index 2e051d3de..dd2959df5 100644 --- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -19,7 +19,9 @@ EXTRA_DIST += alloca_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. alloca.h: alloca_.h + rm -f $@-t $@ cp $(srcdir)/alloca_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += alloca.h alloca.h-t diff --git a/modules/argz b/modules/argz index bf587c492..fe1e40d51 100644 --- a/modules/argz +++ b/modules/argz @@ -18,7 +18,9 @@ EXTRA_DIST += argz_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. argz.h: argz_.h + rm -f $@-t $@ cp $(srcdir)/argz_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += argz.h argz.h-t diff --git a/modules/arpa_inet b/modules/arpa_inet index 3ff0340a0..17a14c0df 100644 --- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -17,7 +17,9 @@ BUILT_SOURCES += $(ARPA_INET_H) # doesn't have one. arpa/inet.h: test -d arpa || mkdir arpa + rm -f $@-t $@ echo '#include ' >$@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t MOSTLYCLEANDIRS += arpa diff --git a/modules/byteswap b/modules/byteswap index 5ff0618b1..b667b9437 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -17,7 +17,9 @@ EXTRA_DIST += byteswap_.h # We need the following in order to create when the system # doesn't have one. byteswap.h: byteswap_.h + rm -f $@-t $@ cp $(srcdir)/byteswap_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += byteswap.h byteswap.h-t diff --git a/modules/configmake b/modules/configmake index 8090a33c4..c3e9b37d6 100644 --- a/modules/configmake +++ b/modules/configmake @@ -24,6 +24,7 @@ Makefile.am: # # Listed in the same order as the GNU makefile conventions. configmake.h: Makefile + rm -f $@-t $@ ( \ echo '#define PREFIX "$(prefix)"'; \ echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ @@ -49,6 +50,7 @@ configmake.h: Makefile echo '#define MANDIR "$(mandir)"'; \ echo '#define MANEXT "$(manext)"'; \ :) | sed '/""/d' >$@-t + chmod a-x $@-t mv $@-t $@ BUILT_SOURCES += configmake.h CLEANFILES += configmake.h configmake.h-t diff --git a/modules/fcntl b/modules/fcntl index 4d0c83ddc..ca1637b74 100644 --- a/modules/fcntl +++ b/modules/fcntl @@ -19,8 +19,10 @@ EXTRA_DIST += fcntl_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. fcntl.h: fcntl_.h + rm -f $@-t $@ sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \ < $(srcdir)/fcntl_.h > $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += fcntl.h fcntl.h-t diff --git a/modules/fnmatch b/modules/fnmatch index 18f278c7d..bd13b8557 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -22,7 +22,9 @@ EXTRA_DIST += fnmatch_.h fnmatch_loop.c # We need the following in order to create when the system # doesn't have one that supports the required API. fnmatch.h: fnmatch_.h + rm -f $@-t $@ cp $(srcdir)/fnmatch_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t diff --git a/modules/getopt b/modules/getopt index 55fc61a60..26e506ca5 100644 --- a/modules/getopt +++ b/modules/getopt @@ -22,7 +22,9 @@ EXTRA_DIST += getopt_.h getopt_int.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. getopt.h: getopt_.h + rm -f $@-t $@ cp $(srcdir)/getopt_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += getopt.h getopt.h-t diff --git a/modules/glob b/modules/glob index 3dcfc6587..6d6f71cab 100644 --- a/modules/glob +++ b/modules/glob @@ -30,7 +30,9 @@ EXTRA_DIST += glob_.h glob-libc.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. glob.h: glob_.h + rm -f $@-t $@ cp $(srcdir)/glob_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += glob.h glob.h-t diff --git a/modules/inttypes b/modules/inttypes index c397a4a19..5cb1e6d90 100644 --- a/modules/inttypes +++ b/modules/inttypes @@ -21,6 +21,7 @@ EXTRA_DIST += inttypes_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. inttypes.h: inttypes_.h + rm -f $@-t $@ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ @@ -31,6 +32,7 @@ inttypes.h: inttypes_.h -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ < $(srcdir)/inttypes_.h > $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t diff --git a/modules/localcharset b/modules/localcharset index d45adb762..0fccf8f88 100644 --- a/modules/localcharset +++ b/modules/localcharset @@ -59,12 +59,16 @@ uninstall-local: all-local fi charset.alias: config.charset + rm -f t-$@ $@ $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ + chmod a-x t-$@ mv t-$@ $@ SUFFIXES += .sed .sin .sin.sed: + rm -f t-$@ $@ sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ + chmod a-x t-$@ mv t-$@ $@ CLEANFILES += charset.alias ref-add.sed ref-del.sed diff --git a/modules/netinet_in b/modules/netinet_in index 47c00d0cb..9ab4a2764 100644 --- a/modules/netinet_in +++ b/modules/netinet_in @@ -17,7 +17,9 @@ BUILT_SOURCES += $(NETINET_IN_H) # doesn't have one. netinet/in.h: test -d netinet || mkdir netinet + rm -f $@-t $@ echo '#include ' >$@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t MOSTLYCLEANDIRS += netinet diff --git a/modules/poll b/modules/poll index 18a01dd6f..f4de479d9 100644 --- a/modules/poll +++ b/modules/poll @@ -18,7 +18,9 @@ EXTRA_DIST += poll_.h # We need the following in order to create when the system # doesn't have one. poll.h: poll_.h + rm -f $@-t $@ cp $(srcdir)/poll_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += poll.h poll.h-t diff --git a/modules/stdbool b/modules/stdbool index e3e06ab63..d5247fa46 100644 --- a/modules/stdbool +++ b/modules/stdbool @@ -18,7 +18,9 @@ EXTRA_DIST += stdbool_.h # We need the following in order to create when the system # doesn't have one that works. stdbool.h: stdbool_.h + rm -f $@-t $@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += stdbool.h stdbool.h-t diff --git a/modules/stdint b/modules/stdint index 73921cb8d..7ace1c069 100644 --- a/modules/stdint +++ b/modules/stdint @@ -24,6 +24,7 @@ EXTRA_DIST += stdint_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. stdint.h: stdint_.h + rm -f $@-t $@ sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \ @@ -46,6 +47,7 @@ stdint.h: stdint_.h -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ < $(srcdir)/stdint_.h > $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += stdint.h stdint.h-t diff --git a/modules/sys_select b/modules/sys_select index efe3f8899..5a3472134 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -17,7 +17,9 @@ BUILT_SOURCES += $(SYS_SELECT_H) # doesn't have one that works with the given compiler. sys/select.h: test -d sys || mkdir sys + rm -f $@-t $@ echo '#include ' >$@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += sys/select.h sys/select.h-t MOSTLYCLEANDIRS += sys diff --git a/modules/sys_socket b/modules/sys_socket index cf9b86e58..aa869548d 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -19,7 +19,9 @@ EXTRA_DIST += socket_.h # doesn't have one that works with the given compiler. sys/socket.h: socket_.h test -d sys || mkdir sys + rm -f $@-t $@ cp $(srcdir)/socket_.h $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t MOSTLYCLEANDIRS += sys diff --git a/modules/sys_stat b/modules/sys_stat index f3564e7e2..3ee745650 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -19,8 +19,10 @@ EXTRA_DIST += stat_.h # has one that is incomplete. sys/stat.h: stat_.h test -d sys || mkdir sys + rm -f $@-t $@ sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \ < $(srcdir)/stat_.h > $@-t + chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t MOSTLYCLEANDIRS += sys diff --git a/modules/sysexits b/modules/sysexits index fe59632b7..20d46bd86 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -17,8 +17,10 @@ EXTRA_DIST += sysexit_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. sysexits.h: sysexit_.h - cp $(srcdir)/sysexit_.h sysexits.h-t - mv sysexits.h-t sysexits.h + rm -f $@-t $@ + cp $(srcdir)/sysexit_.h $@-t + chmod a-x $@-t + mv $@-t $@ MOSTLYCLEANFILES += sysexits.h sysexits.h-t Include: -- 2.11.0