Rename iconv_.h to iconv.in.h.

diff --git a/ChangeLog b/ChangeLog
index 809e3be963fc169787ebf8fb5b9a373c530efdf6..96f42e49d1fa58f8200426b34de715f87948c6e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
        getopt_.h.
        * lib/glob.in.h: Renamed from lib/glob_.h.
        * modules/glob (Files, Makefile.am): Use glob.in.h instead of glob_.h.
+       * lib/iconv.in.h: Renamed from lib/iconv_.h.
+       * modules/iconv_open (Files, Makefile.am): Use iconv.in.h instead of
+       iconv_.h.
 
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/iconv.in.h b/lib/iconv.in.h
new file mode 100644 (file)
index 0000000..72bac44
--- /dev/null
+++ b/lib/iconv.in.h
@@ -0,0 +1,45 @@
+/* A GNU-like <iconv.h>.
+
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   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_ICONV_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_ICONV_H@
+
+#ifndef _GL_ICONV_H
+#define _GL_ICONV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if @REPLACE_ICONV_OPEN@
+/* An iconv_open wrapper that supports the IANA standardized encoding names
+   ("ISO-8859-1" etc.) as far as possible.  */
+# define iconv_open rpl_iconv_open
+extern iconv_t iconv_open (const char *tocode, const char *fromcode);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GL_ICONV_H */
+#endif /* _GL_ICONV_H */

diff --git a/lib/iconv_.h b/lib/iconv_.h
deleted file mode 100644 (file)
index 72bac44..0000000
--- a/lib/iconv_.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* A GNU-like <iconv.h>.
-
-   Copyright (C) 2007 Free Software Foundation, Inc.
-
-   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_ICONV_H
-
-/* The include_next requires a split double-inclusion guard.  */
-#@INCLUDE_NEXT@ @NEXT_ICONV_H@
-
-#ifndef _GL_ICONV_H
-#define _GL_ICONV_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#if @REPLACE_ICONV_OPEN@
-/* An iconv_open wrapper that supports the IANA standardized encoding names
-   ("ISO-8859-1" etc.) as far as possible.  */
-# define iconv_open rpl_iconv_open
-extern iconv_t iconv_open (const char *tocode, const char *fromcode);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GL_ICONV_H */
-#endif /* _GL_ICONV_H */

diff --git a/modules/iconv_open b/modules/iconv_open
index 1fa84125e81cf0c9a5ee075de17ebc14cc0f6e14..6dfc293e91825427ddce20e96de1100157681306 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -2,7 +2,7 @@ Description:
 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 @@ BUILT_SOURCES += $(ICONV_H)
 
 # 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 $@-t $@
        { 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; \
        } > $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += iconv.h iconv.h-t