Paul Eggert wrote on 2007-09-11: > I assume we should use the ".in.h" > suffix instead? I can propose a patch along those lines.
That was 3 weeks ago. Since preparing this patch is purely mechanical, I hope you don't mind if I will do it. Here is a proposed patch. (Time to learn about "git-mv"...) 2007-09-30 Bruno Haible <[EMAIL PROTECTED]> * lib/alloca.in.h: Renamed from lib/alloca_.h. * lib/argz.in.h: Renamed from lib/argz_.h. * lib/byteswap.in.h: Renamed from lib/byteswap_.h. * lib/dirent.in.h: Renamed from lib/dirent_.h. * lib/fcntl.in.h: Renamed from lib/fcntl_.h. * lib/float.in.h: Renamed from lib/float_.h. * lib/fnmatch.in.h: Renamed from lib/fnmatch_.h. * lib/getopt.in.h: Renamed from lib/getopt_.h. * lib/glob.in.h: Renamed from lib/glob_.h. * lib/iconv.in.h: Renamed from lib/iconv_.h. * lib/inttypes.in.h: Renamed from lib/inttypes_.h. * lib/locale.in.h: Renamed from lib/locale_.h. * lib/math.in.h: Renamed from lib/math_.h. * lib/netinet_in.in.h: Renamed from lib/netinet_in_.h. * lib/poll.in.h: Renamed from lib/poll_.h. * lib/search.in.h: Renamed from lib/search_.h. * lib/signal.in.h: Renamed from lib/signal_.h. * lib/stdbool.in.h: Renamed from lib/stdbool_.h. * lib/stdint.in.h: Renamed from lib/stdint_.h. * lib/stdio.in.h: Renamed from lib/stdio_.h. * lib/stdlib.in.h: Renamed from lib/stdlib_.h. * lib/string.in.h: Renamed from lib/string_.h. * lib/sys_select.in.h: Renamed from lib/sys_select_.h. * lib/sys_socket.in.h: Renamed from lib/sys_socket_.h. * lib/sys_stat.in.h: Renamed from lib/sys_stat_.h. * lib/sys_time.in.h: Renamed from lib/sys_time_.h. * lib/sysexits.in.h: Renamed from lib/sysexits_.h. * lib/time.in.h: Renamed from lib/time_.h. * lib/unistd.in.h: Renamed from lib/unistd_.h. * lib/wchar.in.h: Renamed from lib/wchar_.h. * lib/wctype.in.h: Renamed from lib/wctype_.h. * modules/alloca-opt (Files, Makefile.am): Use alloca.in.h instead of alloca_.h. * modules/argz (Files, Makefile.am): Use argz.in.h instead of argz_.h. * modules/byteswap (Files, Makefile.am): Use byteswap.in.h instead of byteswap_.h. * modules/fchdir (Files, Makefile.am): Use dirent.in.h instead of dirent_.h. * modules/fcntl (Files, Makefile.am): Use fcntl.in.h instead of fcntl_.h. * modules/float (Files, Makefile.am): Use float.in.h instead of float_.h. * modules/fnmatch (Files, Makefile.am): Use fnmatch.in.h instead of fnmatch_.h. * modules/getopt (Files, Makefile.am): Use getopt.in.h instead of getopt_.h. * modules/glob (Files, Makefile.am): Use glob.in.h instead of glob_.h. * modules/iconv_open (Files, Makefile.am): Use iconv.in.h instead of iconv_.h. * modules/inttypes (Files, Makefile.am): Use inttypes.in.h instead of inttypes_.h. * modules/locale (Files, Makefile.am): Use locale.in.h instead of locale_.h. * modules/math (Files, Makefile.am): Use math.in.h instead of math_.h. * modules/netinet_in (Files, Makefile.am): Use netinet_in.in.h instead of netinet_in_.h. Add dependency. * modules/poll (Files, Makefile.am): Use poll.in.h instead of poll_.h. * modules/search (Files, Makefile.am): Use search.in.h instead of search_.h. * modules/signal (Files, Makefile.am): Use signal.in.h instead of _signal.h. * modules/stdbool (Files, Makefile.am): Use stdbool.in.h instead of stdbool_.h. * modules/stdint (Files, Makefile.am): Use stdint.in.h instead of stdint_.h. * modules/stdio (Files, Makefile.am): Use stdio.in.h instead of stdio_.h. * modules/stdlib (Files, Makefile.am): Use stdlib.in.h instead of stdlib_.h. * modules/string (Files, Makefile.am): Use string.in.h instead of string_.h. * modules/sys_select (Files, Makefile.am): Use sys_select.in.h instead of sys_select_.h. Add dependency. * modules/sys_socket (Files, Makefile.am): Use sys_socket.in.h instead of sys_socket_.h. * modules/sys_stat (Files, Makefile.am): Use sys_stat.in.h instead of sys_stat_.h. * modules/sys_time (Files, Makefile.am): Use sys_time.in.h instead of sys_time_.h. * modules/sysexits (Files, Makefile.am): Use sysexits.in.h instead of sysexits_.h. * modules/time (Files, Makefile.am): Use time.in.h instead of time_.h. * modules/unistd (Files, Makefile.am): Use unistd.in.h instead of unistd_.h. * modules/wchar (Files, Makefile.am): Use wchar.in.h instead of wchar_.h. * modules/wctype (Files, Makefile.am): Use wctype.in.h instead of wctype_.h. * build-aux/bootstrap (slurp): Update. * doc/gnulib-tool.texi (Initial import): Update. * lib/.cppi-disable: Update. --- build-aux/bootstrap.orig 2007-09-30 12:47:51.000000000 +0200 +++ build-aux/bootstrap 2007-09-30 06:17:45.000000000 +0200 @@ -470,14 +470,14 @@ insert_sorted_if_absent $ig "$copied" # If an ignored file name ends with _.h, then also add # the name with just ".h". Many gnulib headers are generated, - # e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc. + # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc. # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed - f=`echo "$copied"|sed 's/_\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'` + f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'` insert_sorted_if_absent $ig "$f" - # For files like sys_stat_.h and sys_time_.h, record as + # For files like sys_stat.in.h and sys_time.in.h, record as # ignorable the directory we might eventually create: sys/. - f=`echo "$copied"|sed 's/sys_.*_\.h$/sys/'` + f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'` insert_sorted_if_absent $ig "$f" fi done --- config/srclist.txt.orig 2007-09-30 12:47:51.000000000 +0200 +++ config/srclist.txt 2007-09-30 06:05:39.000000000 +0200 @@ -53,7 +53,7 @@ #$LIBCSRC/argp/argp.h lib gpl #$LIBCSRC/stdlib/getsubopt.c lib gpl #$LIBCSRC/posix/getopt.c lib gpl -#$LIBCSRC/posix/getopt.h lib gpl (getopt_.h in gnulib) +#$LIBCSRC/posix/getopt.h lib gpl (getopt.in.h in gnulib) #$LIBCSRC/posix/getopt1.c lib gpl #$LIBCSRC/posix/getopt_int.h lib gpl # @@ -167,7 +167,7 @@ #$LIBCSRC/misc/getpass.c lib gpl #$LIBCSRC/misc/mkstemp.c lib gpl #$LIBCSRC/posix/fnmatch.c lib gpl -#$LIBCSRC/posix/fnmatch.h lib gpl (fnmatch_.h in gnulib) +#$LIBCSRC/posix/fnmatch.h lib gpl (fnmatch.in.h in gnulib) #$LIBCSRC/posix/fnmatch_loop.c lib gpl # # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060 --- doc/gnulib-tool.texi.orig 2007-09-30 12:47:51.000000000 +0200 +++ doc/gnulib-tool.texi 2007-09-30 06:14:15.000000000 +0200 @@ -60,7 +60,7 @@ File list: lib/dummy.c lib/strdup.c - lib/string_.h + lib/string.in.h m4/absolute-header.m4 m4/extensions.m4 m4/gnulib-common.m4 @@ -70,7 +70,7 @@ Creating directory ./m4 Copying file lib/dummy.c Copying file lib/strdup.c -Copying file lib/string_.h +Copying file lib/string.in.h Copying file m4/absolute-header.m4 Copying file m4/extensions.m4 Copying file m4/gnulib-common.m4 --- lib/.cppi-disable.orig 2007-09-30 12:47:51.000000000 +0200 +++ lib/.cppi-disable 2007-09-30 06:00:22.000000000 +0200 @@ -1,7 +1,7 @@ -alloca_.h +alloca.in.h error.h exit.h -fnmatch_.h +fnmatch.in.h fts.c fts_.h getaddrinfo.h @@ -11,7 +11,7 @@ getopt.c getopt.h getopt1.c -getopt_.h +getopt.in.h getopt_int.h getpagesize.h getpass.c @@ -30,11 +30,11 @@ regex_internal.c regex_internal.h stat-time.h -stdbool_.h -stdint_.h +stdbool.in.h +stdint.in.h strnlen1.h strtoul.c -sys_socket_.h +sys_socket.in.h time_r.h utimecmp.h vasnprintf.h --- lib/getlogin_r.c.orig 2007-09-30 12:47:51.000000000 +0200 +++ lib/getlogin_r.c 2007-09-30 06:20:08.000000000 +0200 @@ -30,7 +30,7 @@ char *getlogin (void); #endif -/* See unistd_.h for documentation. */ +/* See unistd.in.h for documentation. */ int getlogin_r (char *name, size_t size) { --- m4/byteswap.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/byteswap.m4 2007-09-30 06:01:46.000000000 +0200 @@ -1,5 +1,5 @@ -# byteswap.m4 serial 1 -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# byteswap.m4 serial 2 +dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,7 +8,7 @@ AC_DEFUN([gl_BYTESWAP], [ - dnl Prerequisites of lib/byteswap_.h. + dnl Prerequisites of lib/byteswap.in.h. AC_CHECK_HEADERS([byteswap.h], [ BYTESWAP_H='' ], [ --- m4/mempcpy.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/mempcpy.m4 2007-09-30 06:15:16.000000000 +0200 @@ -1,4 +1,4 @@ -# mempcpy.m4 serial 8 +# mempcpy.m4 serial 9 dnl Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ dnl Persuade glibc <string.h> to declare mempcpy(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The mempcpy() declaration in lib/string_.h uses 'restrict'. + dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) --- m4/signalblocking.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/signalblocking.m4 2007-09-30 06:11:34.000000000 +0200 @@ -1,4 +1,4 @@ -# signalblocking.m4 serial 5 +# signalblocking.m4 serial 6 dnl Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ fi ]) -# Prerequisites of the part of lib/signal_.h and of lib/sigprocmask.c. +# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c. AC_DEFUN([gl_PREREQ_SIGPROCMASK], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) --- m4/socklen.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/socklen.m4 2007-09-30 06:17:05.000000000 +0200 @@ -1,4 +1,4 @@ -# socklen.m4 serial 5 +# socklen.m4 serial 6 dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,7 @@ dnl have to test to find something that will work. dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find -dnl it there first. That file is included by gnulib's sys_socket_.h, which +dnl it there first. That file is included by gnulib's sys_socket.in.h, which dnl all users of this module should include. Cygwin must not include dnl ws2tcpip.h. AC_DEFUN([gl_TYPE_SOCKLEN_T], --- m4/stdint.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/stdint.m4 2007-09-30 06:12:43.000000000 +0200 @@ -1,4 +1,4 @@ -# stdint.m4 serial 28 +# stdint.m4 serial 29 dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -370,7 +370,7 @@ dnl gl_STDINT_TYPE_PROPERTIES dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t -dnl of interest to stdint_.h. +dnl of interest to stdint.in.h. AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], [ gl_STDINT_BITSIZEOF([ptrdiff_t sig_atomic_t size_t wchar_t wint_t], --- m4/stpcpy.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/stpcpy.m4 2007-09-30 06:15:21.000000000 +0200 @@ -1,4 +1,4 @@ -# stpcpy.m4 serial 5 +# stpcpy.m4 serial 6 dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ dnl Persuade glibc <string.h> to declare stpcpy(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The stpcpy() declaration in lib/string_.h uses 'restrict'. + dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) --- m4/stpncpy.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/stpncpy.m4 2007-09-30 06:15:25.000000000 +0200 @@ -1,4 +1,4 @@ -# stpncpy.m4 serial 8 +# stpncpy.m4 serial 9 dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ dnl Persuade glibc <string.h> to declare stpncpy(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The stpncpy() declaration in lib/string_.h uses 'restrict'. + dnl The stpncpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) --- m4/strsep.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/strsep.m4 2007-09-30 06:15:31.000000000 +0200 @@ -1,4 +1,4 @@ -# strsep.m4 serial 7 +# strsep.m4 serial 8 dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ dnl Persuade glibc <string.h> to declare strsep(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The strsep() declaration in lib/string_.h uses 'restrict'. + dnl The strsep() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) --- m4/strtok_r.m4.orig 2007-09-30 12:47:51.000000000 +0200 +++ m4/strtok_r.m4 2007-09-30 06:15:36.000000000 +0200 @@ -1,4 +1,4 @@ -# strtok_r.m4 serial 6 +# strtok_r.m4 serial 7 dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,7 +6,7 @@ AC_DEFUN([gl_FUNC_STRTOK_R], [ - dnl The strtok_r() declaration in lib/string_.h uses 'restrict'. + dnl The strtok_r() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) --- modules/alloca-opt.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/alloca-opt 2007-09-30 05:58:16.000000000 +0200 @@ -4,7 +4,7 @@ HAVE_ALLOCA. Files: -lib/alloca_.h +lib/alloca.in.h m4/alloca.m4 Depends-on: @@ -17,9 +17,9 @@ # 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.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/alloca_.h; \ + cat $(srcdir)/alloca.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += alloca.h alloca.h-t --- modules/argz.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/argz 2007-09-30 06:01:09.000000000 +0200 @@ -2,7 +2,7 @@ Argv style string arrays in a single null delimited char*. Files: -lib/argz_.h +lib/argz.in.h lib/argz.c m4/argz.m4 @@ -16,9 +16,9 @@ # 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.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/argz_.h; \ + cat $(srcdir)/argz.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += argz.h argz.h-t --- modules/byteswap.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/byteswap 2007-09-30 06:01:58.000000000 +0200 @@ -2,7 +2,7 @@ Swap bytes of 16, 32 and 64 bit values. Files: -lib/byteswap_.h +lib/byteswap.in.h m4/byteswap.m4 Depends-on: @@ -15,9 +15,9 @@ # We need the following in order to create <byteswap.h> when the system # doesn't have one. -byteswap.h: byteswap_.h +byteswap.h: byteswap.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/byteswap_.h; \ + cat $(srcdir)/byteswap.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += byteswap.h byteswap.h-t --- modules/fchdir.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/fchdir 2007-09-30 06:03:05.000000000 +0200 @@ -3,7 +3,7 @@ Files: lib/fchdir.c -lib/dirent_.h +lib/dirent.in.h m4/fchdir.m4 Depends-on: @@ -24,13 +24,13 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ - < $(srcdir)/dirent_.h; \ + < $(srcdir)/dirent.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += dirent.h dirent.h-t --- modules/fcntl.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/fcntl 2007-09-30 06:03:51.000000000 +0200 @@ -2,7 +2,7 @@ Like <fcntl.h>, but with non-working flags defined to 0. Files: -lib/fcntl_.h +lib/fcntl.in.h m4/fcntl_h.m4 Depends-on: @@ -17,12 +17,12 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ - < $(srcdir)/fcntl_.h; \ + < $(srcdir)/fcntl.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += fcntl.h fcntl.h-t --- modules/float.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/float 2007-09-30 06:04:26.000000000 +0200 @@ -2,7 +2,7 @@ A correct <float.h>. Files: -lib/float_.h +lib/float.in.h m4/float_h.m4 Depends-on: @@ -16,12 +16,12 @@ # We need the following in order to create <float.h> when the system # doesn't have one that works with the given compiler. -float.h: float_.h +float.h: float.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ - < $(srcdir)/float_.h; \ + < $(srcdir)/float.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += float.h float.h-t --- modules/fnmatch.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/fnmatch 2007-09-30 06:05:06.000000000 +0200 @@ -2,7 +2,7 @@ GNU fnmatch() implementation. Files: -lib/fnmatch_.h +lib/fnmatch.in.h lib/fnmatch.c lib/fnmatch_loop.c m4/mbstate_t.m4 @@ -23,9 +23,9 @@ # 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.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/fnmatch_.h; \ + cat $(srcdir)/fnmatch.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t --- modules/getopt.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/getopt 2007-09-30 06:05:52.000000000 +0200 @@ -2,7 +2,7 @@ Process command line arguments. Files: -lib/getopt_.h +lib/getopt.in.h lib/getopt.c lib/getopt1.c lib/getopt_int.h @@ -20,9 +20,9 @@ # 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.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/getopt_.h; \ + cat $(srcdir)/getopt.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += getopt.h getopt.h-t --- modules/glob.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/glob 2007-09-30 06:06:35.000000000 +0200 @@ -3,7 +3,7 @@ pattern, with GNU extensions. Files: -lib/glob_.h +lib/glob.in.h lib/glob-libc.h lib/glob.c m4/glob.m4 @@ -29,10 +29,10 @@ # 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.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ - < $(srcdir)/glob_.h; \ + < $(srcdir)/glob.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += glob.h glob.h-t --- modules/iconv_open.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/iconv_open 2007-09-30 06:06:59.000000000 +0200 @@ -2,7 +2,7 @@ Character set conversion. Files: -lib/iconv_.h +lib/iconv.in.h lib/iconv_open.c lib/iconv_open-aix.gperf lib/iconv_open-hpux.gperf @@ -25,13 +25,13 @@ # We need the following in order to create <iconv.h> when the system # doesn't have one that works with the given compiler. -iconv.h: iconv_.h +iconv.h: iconv.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ - < $(srcdir)/iconv_.h; \ + < $(srcdir)/iconv.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += iconv.h iconv.h-t --- modules/inttypes.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/inttypes 2007-09-30 06:07:35.000000000 +0200 @@ -2,7 +2,7 @@ An <inttypes.h> that nearly conforms to C99. Files: -lib/inttypes_.h +lib/inttypes.in.h m4/inttypes-pri.m4 m4/inttypes.m4 @@ -19,7 +19,7 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ @@ -38,7 +38,7 @@ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/inttypes_.h; \ + < $(srcdir)/inttypes.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t --- modules/locale.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/locale 2007-09-30 06:08:15.000000000 +0200 @@ -2,7 +2,7 @@ A <locale.h> that conforms to POSIX. Files: -lib/locale_.h +lib/locale.in.h m4/locale_h.m4 Depends-on: @@ -16,12 +16,12 @@ # We need the following in order to create <locale.h> when the system # doesn't have one that provides all definitions. -locale.h: locale_.h +locale.h: locale.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ - < $(srcdir)/locale_.h; \ + < $(srcdir)/locale.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += locale.h locale.h-t --- modules/math.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/math 2007-09-30 06:08:44.000000000 +0200 @@ -2,7 +2,7 @@ A GNU-like <math.h>. Files: -lib/math_.h +lib/math.in.h m4/math_h.m4 Depends-on: @@ -17,7 +17,7 @@ # We need the following in order to create <math.h> when the system # doesn't have one that works with the given compiler. -math.h: math_.h +math.h: math.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -45,7 +45,7 @@ -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \ -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/math_.h; \ + < $(srcdir)/math.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += math.h math.h-t --- modules/netinet_in.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/netinet_in 2007-09-30 06:09:41.000000000 +0200 @@ -2,7 +2,7 @@ A <netinet/in.h> for systems lacking it. Files: -lib/netinet_in_.h +lib/netinet_in.in.h m4/netinet_in_h.m4 Depends-on: @@ -18,14 +18,14 @@ # We need the following in order to create <netinet/in.h> when the system # doesn't have one. -netinet/in.h: +netinet/in.h: netinet_in.in.h @MKDIR_P@ netinet rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ - < $(srcdir)/netinet_in_.h; \ + < $(srcdir)/netinet_in.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t --- modules/poll.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/poll 2007-09-30 06:10:37.000000000 +0200 @@ -3,7 +3,7 @@ Files: lib/poll.c -lib/poll_.h +lib/poll.in.h m4/poll.m4 Depends-on: @@ -18,9 +18,9 @@ # We need the following in order to create <poll.h> when the system # doesn't have one. -poll.h: poll_.h +poll.h: poll.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/poll_.h; \ + cat $(srcdir)/poll.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += poll.h poll.h-t --- modules/search.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/search 2007-09-30 06:11:08.000000000 +0200 @@ -2,7 +2,7 @@ A GNU-like <search.h>. Files: -lib/search_.h +lib/search.in.h m4/search_h.m4 Depends-on: @@ -17,7 +17,7 @@ # We need the following in order to create <search.h> when the system # doesn't have one that works with the given compiler. -search.h: search_.h +search.h: search.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \ @@ -26,7 +26,7 @@ -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \ -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/search_.h; \ + < $(srcdir)/search.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += search.h search.h-t --- modules/signal.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/signal 2007-09-30 06:11:47.000000000 +0200 @@ -2,7 +2,7 @@ A GNU-like <signal.h>. Files: -lib/signal_.h +lib/signal.in.h m4/signal_h.m4 Depends-on: @@ -17,7 +17,7 @@ # We need the following in order to create <signal.h> when the system # doesn't have a complete one. -signal.h: signal_.h +signal.h: signal.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -26,7 +26,7 @@ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/signal_.h; \ + < $(srcdir)/signal.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += signal.h signal.h-t --- modules/stdbool.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/stdbool 2007-09-30 06:12:14.000000000 +0200 @@ -3,7 +3,7 @@ (Nearly: casts to bool may not work.) Files: -lib/stdbool_.h +lib/stdbool.in.h m4/stdbool.m4 Depends-on: @@ -16,10 +16,10 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h; \ + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += stdbool.h stdbool.h-t --- modules/stdint.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/stdint 2007-09-30 06:12:57.000000000 +0200 @@ -7,7 +7,7 @@ Macros are used instead of typedefs. Files: -lib/stdint_.h +lib/stdint.in.h m4/stdint.m4 m4/longlong.m4 m4/ulonglong.m4 @@ -24,7 +24,7 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ @@ -49,7 +49,7 @@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ - < $(srcdir)/stdint_.h; \ + < $(srcdir)/stdint.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += stdint.h stdint.h-t --- modules/stdio.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/stdio 2007-09-30 06:13:22.000000000 +0200 @@ -2,7 +2,7 @@ A GNU-like <stdio.h>. Files: -lib/stdio_.h +lib/stdio.in.h m4/stdio_h.m4 Depends-on: @@ -17,7 +17,7 @@ # We need the following in order to create <stdio.h> when the system # doesn't have one that works with the given compiler. -stdio.h: stdio_.h +stdio.h: stdio.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -59,7 +59,7 @@ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/stdio_.h; \ + < $(srcdir)/stdio.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += stdio.h stdio.h-t --- modules/stdlib.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/stdlib 2007-09-30 06:13:46.000000000 +0200 @@ -2,7 +2,7 @@ A GNU-like <stdlib.h>. Files: -lib/stdlib_.h +lib/stdlib.in.h m4/stdlib_h.m4 Depends-on: @@ -18,7 +18,7 @@ # We need the following in order to create <stdlib.h> when the system # doesn't have one that works with the given compiler. -stdlib.h: stdlib_.h +stdlib.h: stdlib.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -36,7 +36,7 @@ -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/stdlib_.h; \ + < $(srcdir)/stdlib.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += stdlib.h stdlib.h-t --- modules/string.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/string 2007-09-30 06:14:59.000000000 +0200 @@ -2,7 +2,7 @@ A GNU-like <string.h>. Files: -lib/string_.h +lib/string.in.h m4/string_h.m4 Depends-on: @@ -18,7 +18,7 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -70,7 +70,7 @@ -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/string_.h; \ + < $(srcdir)/string.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += string.h string.h-t --- modules/sys_select.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/sys_select 2007-09-30 06:16:10.000000000 +0200 @@ -2,7 +2,7 @@ A <sys/select.h> for systems lacking it. Files: -lib/sys_select_.h +lib/sys_select.in.h m4/sys_select_h.m4 Depends-on: @@ -18,14 +18,14 @@ # 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: sys_select.in.h @MKDIR_P@ sys rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ - < $(srcdir)/sys_select_.h; \ + < $(srcdir)/sys_select.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += sys/select.h sys/select.h-t --- modules/sys_socket.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/sys_socket 2007-09-30 06:16:59.000000000 +0200 @@ -2,7 +2,7 @@ A <sys/socket.h> for systems lacking it. Files: -lib/sys_socket_.h +lib/sys_socket.in.h m4/sys_socket_h.m4 m4/sockpfaf.m4 @@ -18,7 +18,7 @@ # 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: sys_socket_.h +sys/socket.h: sys_socket.in.h @MKDIR_P@ sys { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -26,7 +26,7 @@ -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - < $(srcdir)/sys_socket_.h; \ + < $(srcdir)/sys_socket.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t --- modules/sys_stat.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/sys_stat 2007-09-30 06:17:57.000000000 +0200 @@ -2,7 +2,7 @@ A <sys/stat.h> for systems with missing declarations. Files: -lib/sys_stat_.h +lib/sys_stat.in.h m4/sys_stat_h.m4 Depends-on: @@ -17,7 +17,7 @@ # We need the following in order to create <sys/stat.h> when the system # has one that is incomplete. -sys/stat.h: sys_stat_.h +sys/stat.h: sys_stat.in.h @MKDIR_P@ sys rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ @@ -26,7 +26,7 @@ -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \ - < $(srcdir)/sys_stat_.h; \ + < $(srcdir)/sys_stat.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t --- modules/sys_time.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/sys_time 2007-09-30 06:18:28.000000000 +0200 @@ -2,7 +2,7 @@ A <sys/time.h> that conforms better to POSIX. Files: -lib/sys_time_.h +lib/sys_time.in.h m4/sys_time_h.m4 Depends-on: @@ -17,7 +17,7 @@ # 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.in.h @MKDIR_P@ sys rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ @@ -26,7 +26,7 @@ -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ - < $(srcdir)/sys_time_.h; \ + < $(srcdir)/sys_time.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += sys/time.h sys/time.h-t --- modules/sysexits.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/sysexits 2007-09-30 06:18:56.000000000 +0200 @@ -2,7 +2,7 @@ Exit status codes for some BSD system programs. Files: -lib/sysexits_.h +lib/sysexits.in.h m4/sysexits.m4 Depends-on: @@ -16,12 +16,12 @@ # 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: sysexits_.h +sysexits.h: sysexits.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ - < $(srcdir)/sysexits_.h; \ + < $(srcdir)/sysexits.in.h; \ } > [EMAIL PROTECTED] mv -f [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += sysexits.h sysexits.h-t --- modules/time.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/time 2007-09-30 06:19:23.000000000 +0200 @@ -2,7 +2,7 @@ A more-standard <time.h>. Files: -lib/time_.h +lib/time.in.h m4/time_h.m4 Depends-on: @@ -17,7 +17,7 @@ # We need the following in order to create <time.h> when the system # doesn't have one that works with the given compiler. -time.h: time_.h +time.h: time.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -28,7 +28,7 @@ -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - < $(srcdir)/time_.h; \ + < $(srcdir)/time.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += time.h time.h-t --- modules/unistd.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/unistd 2007-09-30 06:20:18.000000000 +0200 @@ -3,7 +3,7 @@ Files: m4/unistd_h.m4 -lib/unistd_.h +lib/unistd.in.h Depends-on: include_next @@ -17,7 +17,7 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ --- modules/wchar.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/wchar 2007-09-30 06:20:41.000000000 +0200 @@ -2,7 +2,7 @@ A <wchar.h> that works around platform issues. Files: -lib/wchar_.h +lib/wchar.in.h m4/wchar.m4 Depends-on: @@ -17,7 +17,7 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -27,7 +27,7 @@ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/wchar_.h; \ + < $(srcdir)/wchar.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += wchar.h wchar.h-t --- modules/wctype.orig 2007-09-30 12:47:52.000000000 +0200 +++ modules/wctype 2007-09-30 06:21:05.000000000 +0200 @@ -2,7 +2,7 @@ A <wctype.h> that conforms better to C99. Files: -lib/wctype_.h +lib/wctype.in.h m4/wctype.m4 m4/wint_t.m4 @@ -17,7 +17,7 @@ # 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.in.h rm -f [EMAIL PROTECTED] $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ @@ -25,7 +25,7 @@ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ - < $(srcdir)/wctype_.h; \ + < $(srcdir)/wctype.in.h; \ } > [EMAIL PROTECTED] mv [EMAIL PROTECTED] $@ MOSTLYCLEANFILES += wctype.h wctype.h-t