New module 'iconv-h'.

diff --git a/ChangeLog b/ChangeLog
index f6e23af67422f9c89b2181a4c08665cce776536a..be31266c6a2a5bcebdaadb047df1e4b4472a45ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-06  Bruno Haible  <bruno@clisp.org>
+
+       New module 'iconv-h'.
+       * modules/iconv-h: New file.
+       * modules/iconv_open (Files): Remove lib/iconv.in.h, m4/iconv_h.m4.
+       (Depends-on): Add iconv-h. Remove include_next, arg-nonnull.
+       (configure.ac): Remove gl_ICONV_H.
+       (Makefile.am): Remove rule for iconv.h.
+
 2010-03-06  Bruno Haible  <bruno@clisp.org>
 
        More consistent naming of *.m4 files.

diff --git a/modules/iconv-h b/modules/iconv-h
new file mode 100644 (file)
index 0000000..0a3d076
--- /dev/null
+++ b/modules/iconv-h
@@ -0,0 +1,43 @@
+Description:
+A GNU-like <iconv.h>.
+
+Files:
+lib/iconv.in.h
+m4/iconv_h.m4
+
+Depends-on:
+include_next
+arg-nonnull
+
+configure.ac:
+gl_ICONV_H
+
+Makefile.am:
+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.in.h $(ARG_NONNULL_H)
+       $(AM_V_GEN)rm -f $@-t $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
+             -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
+             -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
+             -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
+             -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+             < $(srcdir)/iconv.in.h; \
+       } > $@-t && \
+       mv $@-t $@
+MOSTLYCLEANFILES += iconv.h iconv.h-t
+
+Include:
+<iconv.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible

diff --git a/modules/iconv_open b/modules/iconv_open
index ab92f0c8b1e99dc53c10de37017c40b96744711e..7b8190fe7437b4f0e32b6529dec7b855a60999fd 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -2,49 +2,25 @@ Description:
 Character set conversion.
 
 Files:
-lib/iconv.in.h
 lib/iconv_open.c
 lib/iconv_open-aix.gperf
 lib/iconv_open-hpux.gperf
 lib/iconv_open-irix.gperf
 lib/iconv_open-osf.gperf
 lib/iconv_open-solaris.gperf
-m4/iconv_h.m4
 m4/iconv_open.m4
 
 Depends-on:
 gperf
-include_next
-arg-nonnull
+iconv-h
 iconv
 c-ctype
 c-strcase
 
 configure.ac:
-gl_ICONV_H
 gl_FUNC_ICONV_OPEN
 
 Makefile.am:
-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.in.h $(ARG_NONNULL_H)
-       $(AM_V_GEN)rm -f $@-t $@ && \
-       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
-             -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
-             -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
-             -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-             -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             < $(srcdir)/iconv.in.h; \
-       } > $@-t && \
-       mv $@-t $@
-MOSTLYCLEANFILES += iconv.h iconv.h-t
-
 iconv_open-aix.h: iconv_open-aix.gperf
        $(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
        mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h