1998-03-28 06:57:26 +08:00
|
|
|
# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
|
1997-11-26 12:23:08 +08:00
|
|
|
# This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU Library General Public License as
|
|
|
|
# published by the Free Software Foundation; either version 2 of the
|
|
|
|
# License, or (at your option) any later version.
|
|
|
|
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
# Library General Public License for more details.
|
|
|
|
|
|
|
|
# You should have received a copy of the GNU Library General Public
|
|
|
|
# License along with the GNU C Library; see the file COPYING.LIB. If
|
|
|
|
# not, write to the Free Software Foundation, Inc.,
|
|
|
|
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
#
|
|
|
|
# Makefile for iconv data and code.
|
|
|
|
#
|
|
|
|
subdir := iconvdata
|
|
|
|
|
|
|
|
# Names of all the shared objects which implement the transformations.
|
1997-12-02 01:16:22 +08:00
|
|
|
modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
|
|
|
|
ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \
|
|
|
|
T.61 ISO_6937 SJIS KOI-8 KOI8-R LATIN-GREEK LATIN-GREEK-1 \
|
1997-12-05 08:40:29 +08:00
|
|
|
HP-ROMAN8 EBCDIC-AT-DE EBCDIC-AT-DE-A EBCDIC-CA-FR \
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-21 02:41:05 +08:00
|
|
|
EUC-KR UHC JOHAB libJIS libKSC BIG5 EUC-JP libGB \
|
1998-04-22 04:37:08 +08:00
|
|
|
EUC-CN libCNS EUC-TW ISO646
|
1997-11-26 12:23:08 +08:00
|
|
|
modules.so := $(addsuffix .so, $(modules))
|
|
|
|
|
|
|
|
|
1997-12-02 01:16:22 +08:00
|
|
|
include ../Makeconfig
|
|
|
|
|
1997-11-26 12:23:08 +08:00
|
|
|
ISO8859-1-routines := iso8859-1
|
|
|
|
ISO8859-2-routines := iso8859-2
|
|
|
|
ISO8859-3-routines := iso8859-3
|
|
|
|
ISO8859-4-routines := iso8859-4
|
|
|
|
ISO8859-5-routines := iso8859-5
|
|
|
|
ISO8859-6-routines := iso8859-6
|
|
|
|
ISO8859-7-routines := iso8859-7
|
|
|
|
ISO8859-8-routines := iso8859-8
|
|
|
|
ISO8859-9-routines := iso8859-9
|
|
|
|
ISO8859-10-routines := iso8859-10
|
1998-04-02 01:44:34 +08:00
|
|
|
ISO646-routines := iso646
|
1997-11-26 12:23:08 +08:00
|
|
|
T.61-routines := t61
|
|
|
|
ISO_6937-routines := iso6937
|
1997-12-02 01:16:22 +08:00
|
|
|
SJIS-routines := sjis
|
|
|
|
KOI-8-routines := koi-8
|
|
|
|
KOI8-R-routines := koi8-r
|
|
|
|
LATIN-GREEK-routines := latin-greek
|
|
|
|
LATIN-GREEK-1-routines := latin-greek-1
|
|
|
|
HP-ROMAN8-routines := hp-roman8
|
|
|
|
EBCDIC-AT-DE-routines := ebcdic-at-de
|
|
|
|
EBCDIC-AT-DE-A-routines := ebcdic-at-de-a
|
|
|
|
EBCDIC-CA-FR-routines := ebcdic-ca-fr
|
1998-04-01 07:45:03 +08:00
|
|
|
EUC-KR-routines := euckr
|
|
|
|
JOHAB-routines := johab
|
1998-04-03 19:18:13 +08:00
|
|
|
UHC-routines := uhc
|
1998-04-13 00:28:35 +08:00
|
|
|
BIG5-routines := big5
|
1998-04-13 17:17:55 +08:00
|
|
|
EUC-JP-routines := eucjp
|
|
|
|
EUC-CN-routines := euccn
|
1998-04-13 23:01:09 +08:00
|
|
|
EUC-TW-routines := euctw
|
1997-12-02 01:16:22 +08:00
|
|
|
libJIS-routines := jis0201 jis0208 jis0212
|
1998-03-28 06:57:26 +08:00
|
|
|
libKSC-routines := ksc5601
|
1998-04-13 17:17:55 +08:00
|
|
|
libGB-routines := gb2312
|
1998-04-13 23:01:09 +08:00
|
|
|
libCNS-routines := cns11643l1 cns11643
|
1997-12-02 01:16:22 +08:00
|
|
|
|
1998-04-01 18:08:08 +08:00
|
|
|
LDFLAGS-EUC-KR.so = -Wl,-rpath,$(gconvdir)
|
|
|
|
$(objpfx)EUC-KR.so: $(objpfx)libKSC.so
|
|
|
|
LDFLAGS-JOHAB.so = -Wl,-rpath,$(gconvdir)
|
|
|
|
$(objpfx)JOHAB.so: $(objpfx)libKSC.so
|
1998-04-03 19:18:13 +08:00
|
|
|
LDFLAGS-UHC.so = -Wl,-rpath,$(gconvdir)
|
|
|
|
$(objpfx)UHC.so: $(objpfx)libKSC.so
|
1998-04-13 17:17:55 +08:00
|
|
|
LDFLAGS-EUC-JP.so = -Wl,-rpath,$(gconvdir)
|
|
|
|
$(objpfx)EUC-JP.so: $(objpfx)libJIS.so
|
|
|
|
LDFLAGS-EUC-CN.so = -Wl,-rpath,$(gconvdir)
|
|
|
|
$(objpfx)EUC-CN.so: $(objpfx)libGB.so
|
1998-04-13 23:01:09 +08:00
|
|
|
LDFLAGS-EUC-TW.so = -Wl,-rpath,$(gconvdir)
|
|
|
|
$(objpfx)EUC-TW.so: $(objpfx)libCNS.so
|
1998-04-01 18:08:08 +08:00
|
|
|
|
1998-04-03 19:18:13 +08:00
|
|
|
LDFLAGS-libJIS.so = -Wl,-soname,$(@F)
|
|
|
|
LDFLAGS-libKSC.so = -Wl,-soname,$(@F)
|
1998-04-13 17:17:55 +08:00
|
|
|
LDFLAGS-libGB.so = -Wl,-soname,$(@F)
|
1998-04-13 23:01:09 +08:00
|
|
|
LDFLAGS-libCNS.so = -Wl,-soname,$(@F)
|
1998-04-01 07:45:03 +08:00
|
|
|
|
Update.
1997-12-28 15:08 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/powerpc/__longjmp.S: Define _SETJMP_H before including
<bits/setjmp.h>.
* sysdeps/powerpc/setjmp.S: Likewise.
Patches by Matt McLean <keys@keys.got.net>.
* Make-dist (sysdep_dirs): Ignore bits dirs while searching.
* Makefile: Undo last patch.
(distribute): Add test-installation.pl.
* configure.in: Correct handling of --enable-add-ons without parameter.
Correct address of WWW pages.
* libc.map: Add _nl_domain_bindings.
* db2/mutex/tsl_parisc.s: New file.
* iconvdata/Makefile (distribute): Add jis0201.c, jis0208.c, jis0212.c,
and extra-module.mk.
* localedata/Makefile (distribute): New. Add all the files.
* stdlib/Makefile (headers): Add inttypes.h.
(routines): Add strtoimax, strtoumax, wcstoimax, and wcstoumax.
* sysdeps/generic/inttypes.h: New file.
* sysdeps/generic/strtoimax.c: New file.
* sysdeps/generic/strtoumax.c: New file.
* sysdeps/generic/wcstoimax.c: New file.
* sysdeps/generic/wcstoumax.c: New file.
* sysdeps/wordsize-32/Dist: Removed.
* sysdeps/wordsize-32/Makefile: Removed.
* sysdeps/wordsize-64/Dist: Removed.
* sysdeps/wordsize-64/Makefile: Removed.
* sysdeps/generic/bits/environments.h: New file.
* include/limits.h: Define MB_LEN_MAX in any case to 6. The gcc
header is still not correct.
* io/fcntl.h [__USE_FILE_OFFSET64]: We have to use the __*64 types.
* posix/unistd.h: Likewise.
* sysdeps/generic/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
* manual/arith.texi: Change definition of mul macro.
* manual/math.texi: Likewise.
* misc/Makefile (routines): Add mmap64.
* sysdeps/generic/mmap64.c: New file.
* sysdeps/unix/sysv/linux/alpha/mmap64.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc64/mmap64.c: New file.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Add __mmap64 and mmap64
aliases to mmap.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
* sysdeps/generic/setrlimit64.c: Don't mark as stub.
* nis/nss_nis/nis-hosts.c (internal_nis_gethostent_r): Pretty print.
* nis(rpcsvc/nis_tags.h: Prevent warning by unknown pragma.
* sysdeps/posix/mk-stdiolim.c: Generate correct file which defines
FOPEN_MAX also when included by limits.h.
* sysdeps/unix/sysv/linux/stdio_lim.h.in: Likewise.
* sysdeps/unix/sysv/linux/Dist: Add oldsiglist.c, netax25/ax25.h,
and netrom/netrom.h.
* sysdeps/unix/sysv/linux/Makefile [$(subdir)=stdio-common]: Add
oldsiglist to sysdep_routines, not aux.
[$(subdir)=inet] (sysdep_headers): Add netax25/ax25.h, netrom/netrom.h.
* sysdeps/unix/sysv/linux/bits/socket.h: Remove SOL_AX25, SOL_ATALK,
and SOL_NETROM definition.
* sysdeps/unix/sysv/linux/i386/Dist: Add s_pwrite64.S and s_pread64.S.
* sysdeps/unix/sysv/linux/net/route.h: Pretty print.
* sysdeps/unix/sysv/linux/netatalk/at.h: Pretty print.
1997-12-25 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/alpha/net/route.h: New file.
* sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h: Replace
sa_handler with k_sa_handler.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Add __getrlimit as
strong alias.
Reported by a sun.
* sysdeps/unix/sysv/linux/sigsuspend.c: Don't define
__libc_have_rt_sigs here.
* sysdeps/unix/sysv/linux/sigaction.c: Do it instead here.
* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/sigpending.c: Correct comment.
* sysdeps/unix/sysv/linux/sigprocmask.c: Likewise.
1997-12-11 07:51 Geoff Keating <geoffk@ozemail.com.au>
* sysdeps/powerpc/atomicity.h: New file.
* sysdeps/mach/powerpc/machine-lock.h: New file.
* Rules: Use -fpic to build anything that might end up in a users'
shared library.
* sysdeps/powerpc/s_fdim.c: New file.
* sysdeps/powerpc/s_fdimf.c: New file.
* sysdeps/powerpc/s_fmax.S: New file.
* sysdeps/powerpc/s_fmaxf.S: New file.
* sysdeps/powerpc/s_fmin.S: New file.
* sysdeps/powerpc/s_fminf.S: New file.
* sysdeps/powerpc/s_llrint.c: Now is for double.
* sysdeps/powerpc/s_llrintf.c: New file.
* sysdeps/powerpc/s_llround.c: Now is for double.
* sysdeps/powerpc/s_llroundf.c: New file.
* sysdeps/powerpc/s_lrint.c: Now is for double.
* sysdeps/powerpc/s_lrintf.S: New file.
* sysdeps/powerpc/s_lround.c: Now is for double.
* sysdeps/powerpc/s_lroundf.c: New file.
* sysdeps/powerpc/bits/mathinlines.h: Add inline versions of lrint,
lrintf, fdim, fdimf.
* sysdeps/unix/sysv/linux/powerpc/kernel_termios.h: Don't use bits/
file directly, use its parent.
* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Re-instate '++'
(for the third time).
1997-12-20 13:50 Richard Henderson <rth@cygnus.com>
* posix/sched.h: timespec is in <time.h>.
* sysdeps/unix/sysv/linux/sys/kd.h: Don't redefine _LINUX_TYPES_H.
1997-12-29 00:01:53 +08:00
|
|
|
distribute := 8bit-generic.c 8bit-gap.c gap.pl gaptab.pl gconv-modules \
|
|
|
|
iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c \
|
|
|
|
iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c \
|
|
|
|
t61.c iso6937.c sjis.c jis0201.h jis0208.h jis0212.h \
|
|
|
|
koi-8.c koi8-r.c koi8-r.h hp-roman8.c latin-greek.c \
|
|
|
|
latin-greek.h latin-greek-1.c latin-greek-1.h ebcdic-at-de.c \
|
|
|
|
ebcdic-at-de-a.c ebcdic-ca-fr.c jis0201.c jis0208.c jis0212.c \
|
1998-04-02 01:44:34 +08:00
|
|
|
extra-module.mk euckr.c johab.c uhc.c ksc5601.c ksc5601.h \
|
1998-04-13 23:01:09 +08:00
|
|
|
iso646.c big5.c eucjp.c gb2312.c gb2312.h euccn.c euctw.c \
|
1998-04-16 01:02:23 +08:00
|
|
|
cns11643l1.c cns11643l1.h cns11643.h cns11643.c \
|
|
|
|
run-iconv-test.sh $(wildcard testdata/*)
|
1997-11-26 12:23:08 +08:00
|
|
|
|
|
|
|
# We build the transformation modules only when we build shared libs.
|
|
|
|
ifeq (yes,$(build-shared))
|
|
|
|
|
|
|
|
# This macro is similar to build-shlib but it does not define a soname
|
|
|
|
# and it does not depend on the destination name to start with `lib'.
|
|
|
|
define build-module
|
|
|
|
$(LINK.o) -shared -o $@ $(sysdep-LDFLAGS) $(config-LDFLAGS) \
|
|
|
|
-B$(csu-objpfx) $(load-map-file:%=-Wl,--version-script=%) \
|
|
|
|
$(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \
|
|
|
|
-L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
|
|
|
|
-Wl,--whole-archive \
|
|
|
|
$(filter-out $($(@F:.so=)-map) $(+preinit) $(+postinit),$^) \
|
|
|
|
$(no-whole-archive) $(LDLIBS-$(@F:%.so=%).so)
|
|
|
|
endef
|
|
|
|
|
|
|
|
# Rule to generate the shared objects.
|
|
|
|
extra-modules-left := $(modules)
|
|
|
|
include extra-module.mk
|
|
|
|
|
|
|
|
|
|
|
|
extra-objs += $(modules.so)
|
|
|
|
install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
|
|
|
|
$(inst_gconvdir)/gconv-modules
|
|
|
|
|
|
|
|
# If we have the localedata add-on available we can build the conversion
|
|
|
|
# tables for numerous charsets.
|
|
|
|
define generate-8bit-table
|
|
|
|
( echo "static const wchar_t to_ucs4[256] = {"; \
|
1997-12-02 01:16:22 +08:00
|
|
|
sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/ [0x\1] = 0x\2,/p' -e d $^ | sort -u; \
|
|
|
|
echo "};"; \
|
|
|
|
echo "static const char from_ucs4[] = {"; \
|
|
|
|
sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/ [0x\2] = 0x\1,/p' -e d $^ | sort -u; \
|
|
|
|
echo "};" ) > $@.new && rm -f $@ && mv $@.new $@
|
|
|
|
endef
|
|
|
|
|
|
|
|
sed-generated-headers := iso8859-2.h iso8859-3.h iso8859-4.h iso8859-5.h \
|
|
|
|
iso8859-6.h iso8859-7.h iso8859-8.h iso8859-9.h \
|
|
|
|
iso8859-10.h koi-8.h hp-roman8.h ebcdic-at-de.h \
|
|
|
|
ebcdic-at-de-a.h ebcdic-ca-fr.h
|
|
|
|
|
|
|
|
define generate-8bit-gap-table
|
|
|
|
( echo "static const wchar_t to_ucs4[256] = {"; \
|
|
|
|
sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/ [0x\1] = 0x\2,/p' -e d $^ | sort -u; \
|
|
|
|
echo "};"; \
|
|
|
|
echo "static struct gap from_idx[] = {"; \
|
|
|
|
sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/0x\2 0x\1/p' -e d $^ | sort -u | $(PERL) gap.pl; \
|
|
|
|
echo " { start: 0xffff, end: 0xffff, idx: 0 }"; \
|
1997-11-26 12:23:08 +08:00
|
|
|
echo "};"; \
|
|
|
|
echo "static const char from_ucs4[] = {"; \
|
1997-12-02 01:16:22 +08:00
|
|
|
sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/0x\2 0x\1/p' -e d $^ | sort -u | $(PERL) gaptab.pl; \
|
1997-11-26 12:23:08 +08:00
|
|
|
echo "};" ) > $@.new && rm -f $@ && mv $@.new $@
|
|
|
|
endef
|
|
|
|
|
1997-12-02 01:16:22 +08:00
|
|
|
perl-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h
|
|
|
|
|
|
|
|
# The headers must be generated before the compilation.
|
|
|
|
before-compile = $(sed-generated-headers) $(perl-generated-headers)
|
|
|
|
|
|
|
|
|
|
|
|
# Rules to generate the headers.
|
|
|
|
iso8859-2.h: ../localedata/charmaps/ISO-8859-2 Makefile
|
|
|
|
$(generate-8bit-table)
|
|
|
|
iso8859-3.h: ../localedata/charmaps/ISO-8859-3 Makefile
|
|
|
|
$(generate-8bit-table)
|
|
|
|
iso8859-4.h: ../localedata/charmaps/ISO-8859-4 Makefile
|
|
|
|
$(generate-8bit-table)
|
|
|
|
iso8859-5.h: ../localedata/charmaps/ISO-8859-5 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
iso8859-6.h: ../localedata/charmaps/ISO-8859-6 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
iso8859-7.h: ../localedata/charmaps/ISO-8859-7 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
iso8859-8.h: ../localedata/charmaps/ISO-8859-8 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
iso8859-9.h: ../localedata/charmaps/ISO-8859-9 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
iso8859-10.h: ../localedata/charmaps/ISO-8859-10 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
|
|
|
|
koi-8.h: ../localedata/charmaps/KOI-8 Makefile
|
|
|
|
$(generate-8bit-table)
|
|
|
|
|
|
|
|
hp-roman8.h: ../localedata/charmaps/HP-ROMAN8 Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
|
|
|
|
ebcdic-at-de.h: ../localedata/charmaps/EBCDIC-AT-DE Makefile
|
|
|
|
$(generate-8bit-table)
|
|
|
|
ebcdic-at-de-a.h: ../localedata/charmaps/EBCDIC-AT-DE-A Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
1997-12-02 01:16:22 +08:00
|
|
|
ebcdic-ca-fr.h: ../localedata/charmaps/EBCDIC-CA-FR Makefile
|
1997-11-26 12:23:08 +08:00
|
|
|
$(generate-8bit-table)
|
|
|
|
|
1997-12-02 01:16:22 +08:00
|
|
|
ifneq ($(PERL),no)
|
|
|
|
koi8-r.h: ../localedata/charmaps/KOI8-R Makefile
|
|
|
|
$(generate-8bit-gap-table)
|
|
|
|
latin-greek.h: ../localedata/charmaps/LATIN-GREEK Makefile
|
|
|
|
$(generate-8bit-gap-table)
|
|
|
|
latin-greek-1.h: ../localedata/charmaps/LATIN-GREEK-1 Makefile
|
|
|
|
$(generate-8bit-gap-table)
|
1997-11-26 12:23:08 +08:00
|
|
|
endif
|
|
|
|
|
1997-12-02 01:16:22 +08:00
|
|
|
headers: $(sed-generated-headers) $(perl-generated-headers)
|
|
|
|
|
1997-11-26 12:23:08 +08:00
|
|
|
|
1998-04-09 18:14:17 +08:00
|
|
|
$(addprefix $(inst_gconvdir)/, $(modules.so)): \
|
|
|
|
$(inst_gconvdir)/%: $(objpfx)% $(+force)
|
1997-11-26 12:23:08 +08:00
|
|
|
$(do-install-program)
|
1998-04-09 18:14:17 +08:00
|
|
|
$(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
|
1997-11-26 12:23:08 +08:00
|
|
|
$(do-install)
|
|
|
|
endif
|
|
|
|
|
|
|
|
include ../Rules
|
1998-04-16 01:02:23 +08:00
|
|
|
|
|
|
|
.PHONY: do-iconv-test
|
1998-04-22 02:15:51 +08:00
|
|
|
tests: do-iconv-test
|
1998-04-16 01:02:23 +08:00
|
|
|
|
|
|
|
do-iconv-test: run-iconv-test.sh $(objpfx)gconv-modules \
|
|
|
|
$(addprefix $(objpfx),$(modules.so)) \
|
|
|
|
$(common-objdir)/iconv/iconv_prog
|
|
|
|
$(SHELL) -e $< $(common-objdir) > $(objpfx)iconv-test.out
|
|
|
|
|
|
|
|
$(objpfx)gconv-modules: gconv-modules
|
|
|
|
cp $^ $@
|