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

ucs4-utf8, ucs4-utf16.

14 files changed, 49 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index ea643a9f52..4753024563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
 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.
 	Enable the function only if HAVE_INLINE.
 	* lib/unistr/u8-mbtouc-unsafe-aux.c: Renamed from
diff --git a/modules/ucs4-utf16 b/modules/ucs4-utf16
index 45c786f8d5..0aee82d9b5 100644
--- 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 8ed1c95125..102d0467df 100644
--- 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 a027458dfb..90fc8ff56b 100644
--- 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 0b0f5f522a..1febbc2adb 100644
--- 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 8e1ff61658..6213dc5eb3 100644
--- 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 e61b6eea72..8c14f2e356 100644
--- 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 a4fbb9800b..460dfd41d6 100644
--- 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 0d4b60809a..246966ee49 100644
--- 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 59f650eabe..9f3ee3695d 100644
--- 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 9803405b03..ba07bb5d94 100644
--- 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 2fde2733b5..ba1c103ffc 100644
--- 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 5a27376356..b0536f5339 100644
--- 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 649721ef38..452541ccf7 100644
--- 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"