Rename glob_.h to glob.in.h.

diff --git a/ChangeLog b/ChangeLog
index 1de03ba886f304ca9b46f4f73ee0845f84fbba3f..809e3be963fc169787ebf8fb5b9a373c530efdf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,11 @@
        * lib/fnmatch.in.h: Renamed from lib/fnmatch_.h.
        * modules/fnmatch (Files, Makefile.am): Use fnmatch.in.h instead of
        fnmatch_.h.
+       * lib/getopt.in.h: Renamed from lib/getopt_.h.
+       * modules/getopt (Files, Makefile.am): Use getopt.in.h instead of
+       getopt_.h.
+       * lib/glob.in.h: Renamed from lib/glob_.h.
+       * modules/glob (Files, Makefile.am): Use glob.in.h instead of glob_.h.
 
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/glob.in.h b/lib/glob.in.h
new file mode 100644 (file)
index 0000000..0589817
--- /dev/null
+++ b/lib/glob.in.h
@@ -0,0 +1,60 @@
+/* glob.h -- Find a path matching a pattern.
+
+   Copyright (C) 2005-2007 Free Software Foundation, Inc.
+
+   Written by Derek Price <derek@ximbiot.com> & Paul Eggert <eggert@CS.UCLA.EDU>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _GL_GLOB_H
+#define _GL_GLOB_H
+
+#if @HAVE_SYS_CDEFS_H@
+# include <sys/cdefs.h>
+#endif
+
+#include <stddef.h>
+
+/* On some systems, such as AIX 5.1, <sys/stat.h> does a "#define stat stat64".
+   Make sure this definition is seen before glob-libc.h defines types that
+   rely on 'struct stat'.  */
+#include <sys/stat.h>
+
+#ifndef __BEGIN_DECLS
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+#ifndef __THROW
+# define __THROW
+#endif
+
+#ifndef __size_t
+# define __size_t      size_t
+#endif
+#ifndef __USE_GNU
+# define __USE_GNU    1
+#endif
+
+
+#define glob rpl_glob
+#define globfree rpl_globfree
+#define glob_pattern_p rpl_glob_pattern_p
+
+#define __GLOB_GNULIB 1
+
+/* Now the standard GNU C Library header should work.  */
+#include "glob-libc.h"
+
+#endif /* _GL_GLOB_H */

diff --git a/lib/glob_.h b/lib/glob_.h
deleted file mode 100644 (file)
index 451b111..0000000
--- a/lib/glob_.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* glob_.h -- Find a path matching a pattern.
-
-   Copyright (C) 2005-2007 Free Software Foundation, Inc.
-
-   Written by Derek Price <derek@ximbiot.com> & Paul Eggert <eggert@CS.UCLA.EDU>
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _GL_GLOB_H
-#define _GL_GLOB_H
-
-#if @HAVE_SYS_CDEFS_H@
-# include <sys/cdefs.h>
-#endif
-
-#include <stddef.h>
-
-/* On some systems, such as AIX 5.1, <sys/stat.h> does a "#define stat stat64".
-   Make sure this definition is seen before glob-libc.h defines types that
-   rely on 'struct stat'.  */
-#include <sys/stat.h>
-
-#ifndef __BEGIN_DECLS
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-#ifndef __THROW
-# define __THROW
-#endif
-
-#ifndef __size_t
-# define __size_t      size_t
-#endif
-#ifndef __USE_GNU
-# define __USE_GNU    1
-#endif
-
-
-#define glob rpl_glob
-#define globfree rpl_globfree
-#define glob_pattern_p rpl_glob_pattern_p
-
-#define __GLOB_GNULIB 1
-
-/* Now the standard GNU C Library header should work.  */
-#include "glob-libc.h"
-
-#endif /* _GL_GLOB_H */

diff --git a/modules/glob b/modules/glob
index 31173e0732e990aa56366473e18e70a88ef5739c..aee245f942e4a654e43436d3807e7b7d18106baa 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -3,7 +3,7 @@ glob() function: Search for files and directories with paths matching a
 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 @@ 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.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; \
        } > $@-t
        mv -f $@-t $@
 MOSTLYCLEANFILES += glob.h glob.h-t