Mercurial > hg > octave-nkf > gnulib-hg
changeset 8522:2ac1de49bbbe
Reorganize modules utf8-ucs4-unsafe, utf16-ucs4-unsafe, utf8-ucs4, utf16-ucs4,
ucs4-utf8, ucs4-utf16.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 24 Mar 2007 14:55:28 +0000 |
| parents | c91a2881bc90 |
| children | 9097de04cd26 |
| files | ChangeLog modules/ucs4-utf16 modules/ucs4-utf8 modules/unistr/base modules/unistr/u16-mbtouc modules/unistr/u16-mbtouc-unsafe modules/unistr/u16-uctomb modules/unistr/u8-mbtouc modules/unistr/u8-mbtouc-unsafe modules/unistr/u8-uctomb modules/utf16-ucs4 modules/utf16-ucs4-unsafe modules/utf8-ucs4 modules/utf8-ucs4-unsafe |
| diffstat | 14 files changed, 49 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/modules/ucs4-utf16 +++ b/modules/ucs4-utf16 @@ -2,16 +2,13 @@ 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"
--- a/modules/ucs4-utf8 +++ b/modules/ucs4-utf8 @@ -2,16 +2,13 @@ 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"
--- a/modules/unistr/base +++ b/modules/unistr/base @@ -8,12 +8,6 @@ unitypes stdbool inline -utf8-ucs4-unsafe -utf16-ucs4-unsafe -utf8-ucs4 -utf16-ucs4 -ucs4-utf8 -ucs4-utf16 configure.ac:
--- a/modules/unistr/u16-mbtouc +++ b/modules/unistr/u16-mbtouc @@ -3,6 +3,7 @@ Files: lib/unistr/u16-mbtouc.c +lib/unistr/u16-mbtouc-aux.c Depends-on: unistr/base @@ -11,7 +12,7 @@ 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"
--- a/modules/unistr/u16-mbtouc-unsafe +++ b/modules/unistr/u16-mbtouc-unsafe @@ -3,6 +3,7 @@ Files: lib/unistr/u16-mbtouc-unsafe.c +lib/unistr/u16-mbtouc-unsafe-aux.c Depends-on: unistr/base @@ -11,7 +12,7 @@ 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"
--- a/modules/unistr/u16-uctomb +++ b/modules/unistr/u16-uctomb @@ -3,6 +3,7 @@ Files: lib/unistr/u16-uctomb.c +lib/unistr/u16-uctomb-aux.c Depends-on: unistr/base @@ -11,7 +12,7 @@ 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"
--- a/modules/unistr/u8-mbtouc +++ b/modules/unistr/u8-mbtouc @@ -3,6 +3,7 @@ Files: lib/unistr/u8-mbtouc.c +lib/unistr/u8-mbtouc-aux.c Depends-on: unistr/base @@ -11,7 +12,7 @@ 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"
--- a/modules/unistr/u8-mbtouc-unsafe +++ b/modules/unistr/u8-mbtouc-unsafe @@ -3,6 +3,7 @@ Files: lib/unistr/u8-mbtouc-unsafe.c +lib/unistr/u8-mbtouc-unsafe-aux.c Depends-on: unistr/base @@ -11,7 +12,7 @@ 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"
--- a/modules/unistr/u8-uctomb +++ b/modules/unistr/u8-uctomb @@ -3,6 +3,7 @@ Files: lib/unistr/u8-uctomb.c +lib/unistr/u8-uctomb-aux.c Depends-on: unistr/base @@ -11,7 +12,7 @@ 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"
--- a/modules/utf16-ucs4 +++ b/modules/utf16-ucs4 @@ -2,16 +2,13 @@ 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"
--- a/modules/utf16-ucs4-unsafe +++ b/modules/utf16-ucs4-unsafe @@ -2,16 +2,13 @@ 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"
--- a/modules/utf8-ucs4 +++ b/modules/utf8-ucs4 @@ -2,16 +2,13 @@ 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"
--- a/modules/utf8-ucs4-unsafe +++ b/modules/utf8-ucs4-unsafe @@ -2,16 +2,13 @@ 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"