Reorganize modules utf8-ucs4-unsafe, utf16-ucs4-unsafe, utf8-ucs4, utf16-ucs4,

ucs4-utf8, ucs4-utf16.

diff --git a/ChangeLog b/ChangeLog
index ea643a9f52ec03a37703ed302531f6add7c6cf33..4753024563ea6d19c3eebdc94fc6de85c7708567 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2007-03-24  Bruno Haible  <bruno@clisp.org>
+
+       * modules/unistr/base (Depends-on): Remove utf8-ucs4-unsafe,
+       utf16-ucs4-unsafe, utf8-ucs4, utf16-ucs4, ucs4-utf8, ucs4-utf16.
+
+       * modules/unistr/u8-mbtouc: Add source files from module utf8-ucs4.
+       * modules/utf8-ucs4: Turn into a symbolic link to module
+       unistr/u8-mbtouc.
+
+       * modules/unistr/u8-mbtouc-unsafe: Add source files from module
+       utf8-ucs4-unsafe.
+       * modules/utf8-ucs4-unsafe: Turn into a symbolic link to module
+       unistr/u8-mbtouc-unsafe.
+
+       * modules/unistr/u16-mbtouc: Add source files from module utf16-ucs4.
+       * modules/utf16-ucs4: Turn into a symbolic link to module
+       unistr/u16-mbtouc.
+
+       * modules/unistr/u16-mbtouc-unsafe: Add source files from module
+       utf16-ucs4-unsafe.
+       * modules/utf16-ucs4-unsafe: Turn into a symbolic link to module
+       unistr/u16-mbtouc-unsafe.
+
+       * modules/unistr/u8-uctomb: Add source files from module utf4-utf8.
+       * modules/ucs4-utf8: Turn into a symbolic link to module
+       unistr/u8-ubtomb.
+
+       * modules/unistr/u16-uctomb: Add source files from module utf4-utf16.
+       * modules/ucs4-utf16: Turn into a symbolic link to module
+       unistr/u16-ubtomb.
+
 2007-03-24  Bruno Haible  <bruno@clisp.org>
 
        * lib/unistr/u8-mbtouc-aux.c: Renamed from lib/unistr/utf8-ucs4.c.

diff --git a/modules/ucs4-utf16 b/modules/ucs4-utf16
index 45c786f8d5d4487f910ff2bd89d27ec270b618b5..0aee82d9b525b905bdadfbec754f48cf8c2a6a48 100644 (file)
--- a/modules/ucs4-utf16
+++ b/modules/ucs4-utf16
@@ -2,16 +2,13 @@ Description:
 Conversion UCS-4 to UTF-16.
 
 Files:
-lib/unistr/u16-uctomb-aux.c
 
 Depends-on:
-unitypes
-unistr/base
+unistr/u16-uctomb
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/u16-uctomb-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/ucs4-utf8 b/modules/ucs4-utf8
index 8ed1c95125bf526dbc3113d8c5cb25566aea4482..102d0467df123e684b2638905772bf0293cc3542 100644 (file)
--- a/modules/ucs4-utf8
+++ b/modules/ucs4-utf8
@@ -2,16 +2,13 @@ Description:
 Conversion UCS-4 to UTF-8.
 
 Files:
-lib/unistr/u8-uctomb-aux.c
 
 Depends-on:
-unitypes
-unistr/base
+unistr/u8-uctomb
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/u8-uctomb-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/unistr/base b/modules/unistr/base
index a027458dfb0d178ca4c8a9868cd73c6522344ebf..90fc8ff56b14e54849be8d3ed2c44f9d2835f031 100644 (file)
--- a/modules/unistr/base
+++ b/modules/unistr/base
@@ -8,12 +8,6 @@ Depends-on:
 unitypes
 stdbool
 inline
-utf8-ucs4-unsafe
-utf16-ucs4-unsafe
-utf8-ucs4
-utf16-ucs4
-ucs4-utf8
-ucs4-utf16
 
 configure.ac:
 

diff --git a/modules/unistr/u16-mbtouc b/modules/unistr/u16-mbtouc
index 0b0f5f522a77fd45c4a24c11ae6e197224992597..1febbc2adb642b9320f3b38fed207bf3f40f5c7b 100644 (file)
--- a/modules/unistr/u16-mbtouc
+++ b/modules/unistr/u16-mbtouc
@@ -3,6 +3,7 @@ Look at first character in UTF-16 string.
 
 Files:
 lib/unistr/u16-mbtouc.c
+lib/unistr/u16-mbtouc-aux.c
 
 Depends-on:
 unistr/base
@@ -11,7 +12,7 @@ configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-mbtouc])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtouc.c
+lib_SOURCES += unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/unistr/u16-mbtouc-unsafe b/modules/unistr/u16-mbtouc-unsafe
index 8e1ff61658dd4347acf4270f9e892da96e9f6a14..6213dc5eb380e579e4bdad6a12004b4322557b2e 100644 (file)
--- a/modules/unistr/u16-mbtouc-unsafe
+++ b/modules/unistr/u16-mbtouc-unsafe
@@ -3,6 +3,7 @@ Look at first character in UTF-16 string.
 
 Files:
 lib/unistr/u16-mbtouc-unsafe.c
+lib/unistr/u16-mbtouc-unsafe-aux.c
 
 Depends-on:
 unistr/base
@@ -11,7 +12,7 @@ configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-mbtouc-unsafe])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtouc-unsafe.c
+lib_SOURCES += unistr/u16-mbtouc-unsafe.c unistr/u16-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/unistr/u16-uctomb b/modules/unistr/u16-uctomb
index e61b6eea72fbb19d7c0281aa8f803d7b90f9b2bf..8c14f2e356412f4ff55596c79894e21f320eae8e 100644 (file)
--- a/modules/unistr/u16-uctomb
+++ b/modules/unistr/u16-uctomb
@@ -3,6 +3,7 @@ Store a character in UTF-16 string.
 
 Files:
 lib/unistr/u16-uctomb.c
+lib/unistr/u16-uctomb-aux.c
 
 Depends-on:
 unistr/base
@@ -11,7 +12,7 @@ configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-uctomb])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-uctomb.c
+lib_SOURCES += unistr/u16-uctomb.c unistr/u16-uctomb-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/unistr/u8-mbtouc b/modules/unistr/u8-mbtouc
index a4fbb9800be0140e2d7a1e01ac9508e49ab7279e..460dfd41d62f85c13c6e4d918f8fbaf6a4a7c1d2 100644 (file)
--- a/modules/unistr/u8-mbtouc
+++ b/modules/unistr/u8-mbtouc
@@ -3,6 +3,7 @@ Look at first character in UTF-8 string.
 
 Files:
 lib/unistr/u8-mbtouc.c
+lib/unistr/u8-mbtouc-aux.c
 
 Depends-on:
 unistr/base
@@ -11,7 +12,7 @@ configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-mbtouc])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtouc.c
+lib_SOURCES += unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/unistr/u8-mbtouc-unsafe b/modules/unistr/u8-mbtouc-unsafe
index 0d4b60809ae7cc63b2133f9725b63b6b2ab73a25..246966ee49c8844b2e0fbf78d2dde94d6c901167 100644 (file)
--- a/modules/unistr/u8-mbtouc-unsafe
+++ b/modules/unistr/u8-mbtouc-unsafe
@@ -3,6 +3,7 @@ Look at first character in UTF-8 string.
 
 Files:
 lib/unistr/u8-mbtouc-unsafe.c
+lib/unistr/u8-mbtouc-unsafe-aux.c
 
 Depends-on:
 unistr/base
@@ -11,7 +12,7 @@ configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtouc-unsafe.c
+lib_SOURCES += unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/unistr/u8-uctomb b/modules/unistr/u8-uctomb
index 59f650eabeee02e9526f107f14d51c7561254f01..9f3ee3695d04ef1c32b2d807d68c97844cef4bc1 100644 (file)
--- a/modules/unistr/u8-uctomb
+++ b/modules/unistr/u8-uctomb
@@ -3,6 +3,7 @@ Store a character in UTF-8 string.
 
 Files:
 lib/unistr/u8-uctomb.c
+lib/unistr/u8-uctomb-aux.c
 
 Depends-on:
 unistr/base
@@ -11,7 +12,7 @@ configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-uctomb])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-uctomb.c
+lib_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/utf16-ucs4 b/modules/utf16-ucs4
index 9803405b03e4fa57b20685d0859ed5d02ee8532b..ba07bb5d9499ab66aa84a1d169668d949cfe340a 100644 (file)
--- a/modules/utf16-ucs4
+++ b/modules/utf16-ucs4
@@ -2,16 +2,13 @@ Description:
 Conversion UTF-16 to UCS-4.
 
 Files:
-lib/unistr/u16-mbtouc-aux.c
 
 Depends-on:
-unitypes
-unistr/base
+unistr/u16-mbtouc
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtouc-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/utf16-ucs4-unsafe b/modules/utf16-ucs4-unsafe
index 2fde2733b543857b4feeb5de3bb32aea70909ffd..ba1c103ffc6a7ba322a6c73fd15bb7c8fac3bf64 100644 (file)
--- a/modules/utf16-ucs4-unsafe
+++ b/modules/utf16-ucs4-unsafe
@@ -2,16 +2,13 @@ Description:
 Conversion UTF-16 to UCS-4.
 
 Files:
-lib/unistr/u16-mbtouc-unsafe-aux.c
 
 Depends-on:
-unitypes
-unistr/base
+unistr/u16-mbtouc-unsafe
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/utf8-ucs4 b/modules/utf8-ucs4
index 5a2737635655eb8d0dfc38aa7c0bbe05c523d328..b0536f5339a0475041561e7f00c8021dd7e7e411 100644 (file)
--- a/modules/utf8-ucs4
+++ b/modules/utf8-ucs4
@@ -2,16 +2,13 @@ Description:
 Conversion UTF-8 to UCS-4.
 
 Files:
-lib/unistr/u8-mbtouc-aux.c
 
 Depends-on:
-unitypes
-unistr/base
+unistr/u8-mbtouc
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtouc-aux.c
 
 Include:
 "unistr.h"

diff --git a/modules/utf8-ucs4-unsafe b/modules/utf8-ucs4-unsafe
index 649721ef38d385ffe97ce67d07f9568d0e593230..452541ccf7d245fced52bff249bc81c597a0043c 100644 (file)
--- a/modules/utf8-ucs4-unsafe
+++ b/modules/utf8-ucs4-unsafe
@@ -2,16 +2,13 @@ Description:
 Conversion UTF-8 to UCS-4.
 
 Files:
-lib/unistr/u8-mbtouc-unsafe-aux.c
 
 Depends-on:
-unitypes
-unistr/base
+unistr/u8-mbtouc-unsafe
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"