Rename module 'wctype' to 'wctype-h'.

* modules/wctype-h: Renamed from modules/wctype.
* modules/wctype: Simplyfy to a redirection to 'wctype-h'.
* modules/wctype-h-tests: Renamed from modules/wctype-tests.
(Files, Depends-on, Makefile.am): Update.
* modules/wctype-h-c++-tests: Renamed from modules/wctype-c++-tests.
(Files, Makefile.am): Update.
* tests/test-wctype-h.c: Renamed from tests/test-wctype.c.
* tests/test-wctype-h-c++.cc: Renamed from tests/test-wctype-c++.cc.
* doc/posix-headers/wctype.texi: Update.
* doc/posix-functions/iswalnum.texi: Update.
* doc/posix-functions/iswalpha.texi: Update.
* doc/posix-functions/iswblank.texi: Update.
* doc/posix-functions/iswcntrl.texi: Update.
* doc/posix-functions/iswdigit.texi: Update.
* doc/posix-functions/iswgraph.texi: Update.
* doc/posix-functions/iswlower.texi: Update.
* doc/posix-functions/iswprint.texi: Update.
* doc/posix-functions/iswpunct.texi: Update.
* doc/posix-functions/iswspace.texi: Update.
* doc/posix-functions/iswupper.texi: Update.
* doc/posix-functions/iswxdigit.texi: Update.
* doc/posix-functions/towlower.texi: Update.
* doc/posix-functions/towupper.texi: Update.
* NEWS: Mention the change.
* modules/fnmatch (Dependencies): Add wctype-h, remove wctype.
* modules/mbchar (Dependencies): Likewise.
* modules/mbswidth (Dependencies): Likewise.
* modules/quotearg (Dependencies): Likewise.
* modules/regex (Dependencies): Likewise.
* modules/wcscasecmp (Dependencies): Likewise.
* modules/wcsncasecmp (Dependencies): Likewise.
* modules/wcwidth (Dependencies): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e2278796398f43587887b01085462ce3cf3c44b3..34885ab3e391697de46b1553ddc49fb09d3af3b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2011-02-06  Bruno Haible  <bruno@clisp.org>
+
+       Rename module 'wctype' to 'wctype-h'.
+       * modules/wctype-h: Renamed from modules/wctype.
+       * modules/wctype: Simplyfy to a redirection to 'wctype-h'.
+       * modules/wctype-h-tests: Renamed from modules/wctype-tests.
+       (Files, Depends-on, Makefile.am): Update.
+       * modules/wctype-h-c++-tests: Renamed from modules/wctype-c++-tests.
+       (Files, Makefile.am): Update.
+       * tests/test-wctype-h.c: Renamed from tests/test-wctype.c.
+       * tests/test-wctype-h-c++.cc: Renamed from tests/test-wctype-c++.cc.
+       * doc/posix-headers/wctype.texi: Update.
+       * doc/posix-functions/iswalnum.texi: Update.
+       * doc/posix-functions/iswalpha.texi: Update.
+       * doc/posix-functions/iswblank.texi: Update.
+       * doc/posix-functions/iswcntrl.texi: Update.
+       * doc/posix-functions/iswdigit.texi: Update.
+       * doc/posix-functions/iswgraph.texi: Update.
+       * doc/posix-functions/iswlower.texi: Update.
+       * doc/posix-functions/iswprint.texi: Update.
+       * doc/posix-functions/iswpunct.texi: Update.
+       * doc/posix-functions/iswspace.texi: Update.
+       * doc/posix-functions/iswupper.texi: Update.
+       * doc/posix-functions/iswxdigit.texi: Update.
+       * doc/posix-functions/towlower.texi: Update.
+       * doc/posix-functions/towupper.texi: Update.
+       * NEWS: Mention the change.
+       * modules/fnmatch (Dependencies): Add wctype-h, remove wctype.
+       * modules/mbchar (Dependencies): Likewise.
+       * modules/mbswidth (Dependencies): Likewise.
+       * modules/quotearg (Dependencies): Likewise.
+       * modules/regex (Dependencies): Likewise.
+       * modules/wcscasecmp (Dependencies): Likewise.
+       * modules/wcsncasecmp (Dependencies): Likewise.
+       * modules/wcwidth (Dependencies): Likewise.
+
 2011-02-06  Bruno Haible  <bruno@clisp.org>
 
        New module 'wcswidth'.

diff --git a/NEWS b/NEWS
index 40fa082a062a3b296a9744017c4d1deb032881cc..c130922891fc1b3dc254ddc27b3707709e33eb69 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2011-02-07  wctype          This module is renamed to wctype-h.
+
 2011-01-18  multiarch       This no longer #defines AA_APPLE_UNIVERSAL_BUILD;
                             instead, use the shell var APPLE_UNIVERSAL_BUILD.
 

diff --git a/doc/posix-functions/iswalnum.texi b/doc/posix-functions/iswalnum.texi
index 20612f4a2ba397f180eb6f9b1b0baf07400a2b1d..154999d6145fe0b541a06a7034fbc9f34997f490 100644 (file)
--- a/doc/posix-functions/iswalnum.texi
+++ b/doc/posix-functions/iswalnum.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswalnum.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswalpha.texi b/doc/posix-functions/iswalpha.texi
index 7d69c2b12d90be4ff9110b71c1f6bd53b6d70c3a..5046f3b8d175801a3f9e17d605fa609256e63577 100644 (file)
--- a/doc/posix-functions/iswalpha.texi
+++ b/doc/posix-functions/iswalpha.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswalpha.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswblank.texi b/doc/posix-functions/iswblank.texi
index 453558e0a5a916745472fef986814f2fd0209e34..057f3ad6134f220120d14121f4e18dc806f2c3e9 100644 (file)
--- a/doc/posix-functions/iswblank.texi
+++ b/doc/posix-functions/iswblank.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswblank.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswcntrl.texi b/doc/posix-functions/iswcntrl.texi
index a1f89329d7af41ee8ea8eeb76cb76349d7d9d9c0..8b0b127f9a4c4ab04cc2ebabd75ac123f6a1b0ab 100644 (file)
--- a/doc/posix-functions/iswcntrl.texi
+++ b/doc/posix-functions/iswcntrl.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswcntrl.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswdigit.texi b/doc/posix-functions/iswdigit.texi
index 74b0d2829aa96e43ee2ad024d6cfeeede5b4be20..c216949307d116c9087f27d57b9eee230a92f0fb 100644 (file)
--- a/doc/posix-functions/iswdigit.texi
+++ b/doc/posix-functions/iswdigit.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswdigit.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswgraph.texi b/doc/posix-functions/iswgraph.texi
index 00e1fdbefdb34c1a50bc68bbe461ef55a576a595..8dd966a99299c394f89f7997e9b4c3d1a5ef463b 100644 (file)
--- a/doc/posix-functions/iswgraph.texi
+++ b/doc/posix-functions/iswgraph.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswgraph.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswlower.texi b/doc/posix-functions/iswlower.texi
index ba8d545482f421363ab8b5d8b82f3d01777655bc..0b21d111ba8e3feeeee90b2d5756e6f9ae3d7571 100644 (file)
--- a/doc/posix-functions/iswlower.texi
+++ b/doc/posix-functions/iswlower.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswlower.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswprint.texi b/doc/posix-functions/iswprint.texi
index f6ade8224dbbce63a44db943d0f4aa29645b41b0..dc7236b0957b83062ffdd8f8901248fb9a1453f8 100644 (file)
--- a/doc/posix-functions/iswprint.texi
+++ b/doc/posix-functions/iswprint.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswprint.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswpunct.texi b/doc/posix-functions/iswpunct.texi
index 6d1bca0811159b28b88f01e79acf296c12d373e7..af9ea53ce7177d3c23b5a521674b502d23b672cb 100644 (file)
--- a/doc/posix-functions/iswpunct.texi
+++ b/doc/posix-functions/iswpunct.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswpunct.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswspace.texi b/doc/posix-functions/iswspace.texi
index 9a73e2fe18542da549c85f2b7efe889b2dc66adc..fed4e41f4caf5ea216b2ab82397c1884abfa35b4 100644 (file)
--- a/doc/posix-functions/iswspace.texi
+++ b/doc/posix-functions/iswspace.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswspace.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswupper.texi b/doc/posix-functions/iswupper.texi
index 99654102c77339989b2b959ee78aa1f07eeb9b50..d5183457532b1085e93e0b3fb75d156f6efb82fc 100644 (file)
--- a/doc/posix-functions/iswupper.texi
+++ b/doc/posix-functions/iswupper.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswupper.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/iswxdigit.texi b/doc/posix-functions/iswxdigit.texi
index d3105eda855ba4c95e0e7c203bbd72f26d3003e3..0fa4f788aad9001e975020ab75983cf9a2c1b088 100644 (file)
--- a/doc/posix-functions/iswxdigit.texi
+++ b/doc/posix-functions/iswxdigit.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswxdigit.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/towlower.texi b/doc/posix-functions/towlower.texi
index 2b658aaab48b004bf8b69002371a81f92acc95c4..a2282d1e58d63d59cdd333a0b5f9b2ffa4377e27 100644 (file)
--- a/doc/posix-functions/towlower.texi
+++ b/doc/posix-functions/towlower.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/towlower.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-functions/towupper.texi b/doc/posix-functions/towupper.texi
index 2a3b3b547b65066c991ad47ead26fdb694a1fc7d..5bb4a15cc858fec59de62998dadb96de5e46c060 100644 (file)
--- a/doc/posix-functions/towupper.texi
+++ b/doc/posix-functions/towupper.texi
@@ -4,7 +4,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/towupper.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/posix-headers/wctype.texi b/doc/posix-headers/wctype.texi
index dd1f9a3ac1881b03f36bdda54c8942121e2a9b21..13c50145c7e9663341885112053306c982865fe1 100644 (file)
--- a/doc/posix-headers/wctype.texi
+++ b/doc/posix-headers/wctype.texi
@@ -3,7 +3,7 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/basedefs/wctype.h.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/fnmatch b/modules/fnmatch
index 6849b4d5e37e02d2c708111d53c491f7f9168790..bf7158fb9bc688ca4d94610625e7919606f53da0 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -14,7 +14,7 @@ extensions
 alloca
 stdbool
 wchar
-wctype
+wctype-h
 memchr
 memcmp
 mbsrtowcs

diff --git a/modules/mbchar b/modules/mbchar
index b5e222ac636b9c68435d5cb24b6952ad1aedb080..d15e932e0e2dd283c9b229e26e74698060a3763f 100644 (file)
--- a/modules/mbchar
+++ b/modules/mbchar
@@ -10,7 +10,7 @@ Depends-on:
 extensions
 stdbool
 wchar
-wctype
+wctype-h
 wcwidth
 memcmp
 

diff --git a/modules/mbswidth b/modules/mbswidth
index 330748dfe0e91499e9f8111d5c4e7818b08dc988..a7301ab614a39e5eafd9e850c0793aa1c2afca21 100644 (file)
--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -10,7 +10,7 @@ m4/mbswidth.m4
 
 Depends-on:
 wchar
-wctype
+wctype-h
 mbrtowc
 mbsinit
 wcwidth

diff --git a/modules/quotearg b/modules/quotearg
index 732ce39ff09eae413a88523959a009fc66218302..f62b2c0ffdd11862f31f8a7ecf4450573c960ce6 100644 (file)
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -17,7 +17,7 @@ memcmp
 quotearg-simple
 stdbool
 wchar
-wctype
+wctype-h
 xalloc
 
 configure.ac:

diff --git a/modules/regex b/modules/regex
index cbfecdda672985b72c229b6c8a5e14cabf604541..6a8f4c25fdf27dea93ba2c879651a30c0794fa6d 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -28,7 +28,7 @@ stdint
 ssize_t
 wchar
 wcrtomb
-wctype
+wctype-h
 
 configure.ac:
 gl_REGEX

diff --git a/modules/wcscasecmp b/modules/wcscasecmp
index b5e8e69a394163e2c8bea1b0c16dff8c31e8364e..18c549c2f61e17040b428ac47a2f2196165eff12 100644 (file)
--- a/modules/wcscasecmp
+++ b/modules/wcscasecmp
@@ -8,7 +8,7 @@ m4/wcscasecmp.m4
 
 Depends-on:
 wchar
-wctype
+wctype-h
 
 configure.ac:
 gl_FUNC_WCSCASECMP

diff --git a/modules/wcsncasecmp b/modules/wcsncasecmp
index 8f4e1ad4aee5d959614083971e1348a99a1f6943..88f36198dae391fe22454a658958195b3045b5e6 100644 (file)
--- a/modules/wcsncasecmp
+++ b/modules/wcsncasecmp
@@ -8,7 +8,7 @@ m4/wcsncasecmp.m4
 
 Depends-on:
 wchar
-wctype
+wctype-h
 
 configure.ac:
 gl_FUNC_WCSNCASECMP

diff --git a/modules/wctype b/modules/wctype
index 99dbe44a55b7552c7a90f002dcd493e89799ea7d..c3c0e808ba1e6b065618b544115d8abc9d8b1174 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -2,49 +2,19 @@ Description:
 A <wctype.h> that conforms better to C99.
 
 Files:
-lib/wctype.in.h
-lib/iswblank.c
-m4/wctype_h.m4
-m4/wint_t.m4
 
 Depends-on:
-include_next
-c++defs
-warn-on-use
+wctype-h
 
 configure.ac:
-gl_WCTYPE_H
 
 Makefile.am:
-BUILT_SOURCES += wctype.h
-
-# 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.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
-       $(AM_V_GEN)rm -f $@-t $@ && \
-       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-             -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-             -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
-             -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-             -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-             -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
-             -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/wctype.in.h; \
-       } > $@-t && \
-       mv $@-t $@
-MOSTLYCLEANFILES += wctype.h wctype.h-t
 
 Include:
 <wctype.h>
 
 License:
-LGPLv2+
+LGPL
 
 Maintainer:
-all
+Bruno Haible

diff --git a/modules/wctype-c++-tests b/modules/wctype-c++-tests
deleted file mode 100644 (file)
index 3f794dd..0000000
--- a/modules/wctype-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-wctype-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-wctype-c++
-check_PROGRAMS += test-wctype-c++
-test_wctype_c___SOURCES = test-wctype-c++.cc
-test_wctype_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS)
-endif

diff --git a/modules/wctype-h b/modules/wctype-h
new file mode 100644 (file)
index 0000000..99dbe44
--- /dev/null
+++ b/modules/wctype-h
@@ -0,0 +1,50 @@
+Description:
+A <wctype.h> that conforms better to C99.
+
+Files:
+lib/wctype.in.h
+lib/iswblank.c
+m4/wctype_h.m4
+m4/wint_t.m4
+
+Depends-on:
+include_next
+c++defs
+warn-on-use
+
+configure.ac:
+gl_WCTYPE_H
+
+Makefile.am:
+BUILT_SOURCES += wctype.h
+
+# 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.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+       $(AM_V_GEN)rm -f $@-t $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+             -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
+             -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+             -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+             -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
+             -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             < $(srcdir)/wctype.in.h; \
+       } > $@-t && \
+       mv $@-t $@
+MOSTLYCLEANFILES += wctype.h wctype.h-t
+
+Include:
+<wctype.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/wctype-h-c++-tests b/modules/wctype-h-c++-tests
new file mode 100644 (file)
index 0000000..2b22df4
--- /dev/null
+++ b/modules/wctype-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-wctype-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-wctype-h-c++
+check_PROGRAMS += test-wctype-h-c++
+test_wctype_h_c___SOURCES = test-wctype-h-c++.cc
+test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS)
+endif

diff --git a/modules/wctype-h-tests b/modules/wctype-h-tests
new file mode 100644 (file)
index 0000000..5cce746
--- /dev/null
+++ b/modules/wctype-h-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-wctype-h.c
+tests/macros.h
+
+Depends-on:
+wctype-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-wctype-h
+check_PROGRAMS += test-wctype-h

diff --git a/modules/wctype-tests b/modules/wctype-tests
deleted file mode 100644 (file)
index 41b1b0d..0000000
--- a/modules/wctype-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-wctype.c
-tests/macros.h
-
-Depends-on:
-wctype-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-wctype
-check_PROGRAMS += test-wctype

diff --git a/modules/wcwidth b/modules/wcwidth
index fe410f150fcd5e68c5baa7eb27268093fcaaf62f..e4a9460e9434cb632a71fd5ce2a9f7ea77c2008c 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -10,7 +10,7 @@ m4/wint_t.m4
 Depends-on:
 extensions
 wchar
-wctype
+wctype-h
 localcharset
 streq
 uniwidth/width

diff --git a/tests/test-wctype-c++.cc b/tests/test-wctype-h-c++.cc
similarity index 100%
rename from tests/test-wctype-c++.cc
rename to tests/test-wctype-h-c++.cc

diff --git a/tests/test-wctype.c b/tests/test-wctype-h.c
similarity index 100%
rename from tests/test-wctype.c
rename to tests/test-wctype-h.c