2004-01-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>
* acinclude.m4 (--enable-newlib-iconv): New configuration option. (--enable-newlib-builtin-converters): Ditto. * configure.in: Add code to set _ICONV_ENABLED flag. Set _MB_LEN_MAX to 1 if not mb enabled. * configure: Regenerated. * aclocal.m4: Ditto. * Makefile.in: Ditto. * newlib.hin: Add _ICONV_ENABLED flag. * libc/Makefile.am: Add support for iconv. * libc/configure.in: Ditto. * libc/Makefile.in: Regenerated. * libc/aclocal.m4: Ditto. * libc/configure: Ditto. * libc/libc.texinfo: Add iconv documentation. * libc/iconv/AUTHORS, libc/iconv/COPYING, libc/iconv/Makefile.am, libc/iconv/Makefile.in, libc/iconv/README.ORIGINAL, libc/iconv/README.TODO, libc/iconv/charset.aliases, libc/iconv/iconv.tex, libc/iconv/ccs/Makefile.am, libc/iconv/ccs/Makefile.in, libc/iconv/ccs/README.CCS.SOURCES, libc/iconv/ccs/big5.c, libc/iconv/ccs/cns11643_plane1.c, libc/iconv/ccs/cns11643_plane14.c, libc/iconv/ccs/cns11643_plane2.c, libc/iconv/ccs/cp775.c, libc/iconv/ccs/cp850.c, libc/iconv/ccs/cp852.c, libc/iconv/ccs/cp855.c, libc/iconv/ccs/cp866.c, libc/iconv/ccs/gb_2312_80.c, libc/iconv/ccs/iconv_mktbl, libc/iconv/ccs/iso_8859_1.c, libc/iconv/ccs/iso_8859_15.c, libc/iconv/ccs/iso_8859_2.c, libc/iconv/ccs/iso_8859_4.c, libc/iconv/ccs/iso_8859_5.c, libc/iconv/ccs/jis_x0201.c, libc/iconv/ccs/jis_x0208_1983.c, libc/iconv/ccs/jis_x0212_1990.c, libc/iconv/ccs/koi8_r.c, libc/iconv/ccs/koi8_u.c, libc/iconv/ccs/ksx1001.c, libc/iconv/ccs/shift_jis.c, libc/iconv/ccs/us_ascii.c, libc/iconv/ccs/binary/Makefile.am, libc/iconv/ccs/binary/Makefile.in, libc/iconv/ccs/binary/big5.cct, libc/iconv/ccs/binary/cns11643_plane1.cct, libc/iconv/ccs/binary/cns11643_plane14.cct, libc/iconv/ccs/binary/cns11643_plane2.cct, libc/iconv/ccs/binary/cp775.cct, libc/iconv/ccs/binary/cp850.cct, libc/iconv/ccs/binary/cp852.cct, libc/iconv/ccs/binary/cp855.cct, libc/iconv/ccs/binary/cp866.cct, libc/iconv/ccs/binary/gb_2312_80.cct, libc/iconv/ccs/binary/iso_8859_1.cct, libc/iconv/ccs/binary/iso_8859_15.cct, libc/iconv/ccs/binary/iso_8859_2.cct, libc/iconv/ccs/binary/iso_8859_4.cct, libc/iconv/ccs/binary/iso_8859_5.cct, libc/iconv/ccs/binary/jis_x0201.cct, libc/iconv/ccs/binary/jis_x0208_1983.cct, libc/iconv/ccs/binary/jis_x0212_1990.cct, libc/iconv/ccs/binary/koi8_r.cct, libc/iconv/ccs/binary/koi8_u.cct, libc/iconv/ccs/binary/ksx1001.cct, libc/iconv/ccs/binary/shift_jis.cct, libc/iconv/ccs/binary/us_ascii.cct, libc/iconv/ces/Makefile.am, libc/iconv/ces/Makefile.in, libc/iconv/ces/euc-jp.c, libc/iconv/ces/euc-kr.c, libc/iconv/ces/euc-tw.c, libc/iconv/ces/gb2312.c, libc/iconv/ces/iso-10646-ucs-2.c, libc/iconv/ces/iso-10646-ucs-4.c, libc/iconv/ces/ucs-2-internal.c, libc/iconv/ces/ucs-4-internal.c, libc/iconv/ces/utf-16.c, libc/iconv/ces/utf-8.c, libc/iconv/lib/Makefile.am, libc/iconv/lib/Makefile.in, libc/iconv/lib/aliases.c, libc/iconv/lib/bialiasesi.c, libc/iconv/lib/biccs.c, libc/iconv/lib/bices.c, libc/iconv/lib/ccs.c, libc/iconv/lib/ces.c, libc/iconv/lib/ces_euc.c, libc/iconv/lib/ces_iso2022.c, libc/iconv/lib/ces_table.c, libc/iconv/lib/converter.c, libc/iconv/lib/deps.h, libc/iconv/lib/endian.h, libc/iconv/lib/iconv.c, libc/iconv/lib/loaddata.c, libc/iconv/lib/local.h, libc/include/iconv.h: New files. * libc/sys/linux/include/iconv.h: Ditto. * libc/include/sys/_types.h (_iconv_t): Added. * doc/aclocal.m4: Regenerated. * doc/configure: Ditto. * doc/Makefile.in: Ditto. * iconvdata/Makefile.in: Ditto. * iconvdata/aclocal.m4: Ditto. * iconvdata/configure: Ditto. * libc/*aclocal.m4: Ditto. * libc/*Makefile.in: Ditto. * libc/*configure: Ditto. * libm/*aclocal.m4: Ditto. * libm/*Makefile.in: Ditto. * libm/*configure: Ditto.
This commit is contained in:
Jeff Johnston
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
@ -92,6 +92,7 @@ LN_S = @LN_S@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
|
||||
NEWLIB_ICONV_CFLAGS = @NEWLIB_ICONV_CFLAGS@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -110,176 +111,47 @@ AUTOMAKE_OPTIONS = cygnus
|
||||
|
||||
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
|
||||
|
||||
GENERAL_SOURCES = \
|
||||
__adjust.c \
|
||||
__exp10.c \
|
||||
__ten_mu.c \
|
||||
_Exit.c \
|
||||
abort.c \
|
||||
abs.c \
|
||||
assert.c \
|
||||
atexit.c \
|
||||
atof.c \
|
||||
atoff.c \
|
||||
atoi.c \
|
||||
atol.c \
|
||||
calloc.c \
|
||||
div.c \
|
||||
dtoa.c \
|
||||
dtoastub.c \
|
||||
environ.c \
|
||||
envlock.c \
|
||||
eprintf.c \
|
||||
exit.c \
|
||||
getenv.c \
|
||||
getenv_r.c \
|
||||
labs.c \
|
||||
ldiv.c \
|
||||
ldtoa.c \
|
||||
malloc.c \
|
||||
mblen.c \
|
||||
mblen_r.c \
|
||||
mbstowcs.c \
|
||||
mbstowcs_r.c \
|
||||
mbtowc.c \
|
||||
mbtowc_r.c \
|
||||
mlock.c \
|
||||
mprec.c \
|
||||
mstats.c \
|
||||
rand.c \
|
||||
rand_r.c \
|
||||
realloc.c \
|
||||
strtod.c \
|
||||
strtol.c \
|
||||
strtoul.c \
|
||||
wcstombs.c \
|
||||
wcstombs_r.c \
|
||||
wctomb.c \
|
||||
wctomb_r.c
|
||||
GENERAL_SOURCES = __adjust.c __exp10.c __ten_mu.c _Exit.c abort.c abs.c assert.c atexit.c atof.c atoff.c atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c environ.c envlock.c eprintf.c exit.c getenv.c getenv_r.c labs.c ldiv.c ldtoa.c malloc.c mblen.c mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c mbtowc_r.c mlock.c mprec.c mstats.c rand.c rand_r.c realloc.c strtod.c strtol.c strtoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c
|
||||
|
||||
|
||||
EXTENDED_SOURCES = \
|
||||
drand48.c \
|
||||
ecvtbuf.c \
|
||||
efgcvt.c \
|
||||
erand48.c \
|
||||
jrand48.c \
|
||||
lcong48.c \
|
||||
lrand48.c \
|
||||
mrand48.c \
|
||||
msize.c \
|
||||
mtrim.c \
|
||||
nrand48.c \
|
||||
rand48.c \
|
||||
seed48.c \
|
||||
srand48.c \
|
||||
strtoll.c \
|
||||
strtoll_r.c \
|
||||
strtoull.c \
|
||||
strtoull_r.c \
|
||||
atoll.c \
|
||||
llabs.c \
|
||||
lldiv.c
|
||||
EXTENDED_SOURCES = drand48.c ecvtbuf.c efgcvt.c erand48.c jrand48.c lcong48.c lrand48.c mrand48.c msize.c mtrim.c nrand48.c rand48.c seed48.c srand48.c strtoll.c strtoll_r.c strtoull.c strtoull_r.c atoll.c llabs.c lldiv.c
|
||||
|
||||
|
||||
ELIX_2_OBJS = \
|
||||
a64l.$(oext) \
|
||||
btowc.$(oext) \
|
||||
getopt.$(oext) \
|
||||
getsubopt.$(oext) \
|
||||
l64a.$(oext) \
|
||||
malign.$(oext) \
|
||||
malignr.$(oext) \
|
||||
malloptr.$(oext) \
|
||||
mbrlen.$(oext) \
|
||||
mbrtowc.$(oext) \
|
||||
mbsinit.$(oext) \
|
||||
mbsrtowcs.$(oext) \
|
||||
on_exit.$(oext) \
|
||||
pvallocr.$(oext) \
|
||||
valloc.$(oext) \
|
||||
vallocr.$(oext) \
|
||||
wcrtomb.$(oext) \
|
||||
wcsrtombs.$(oext) \
|
||||
wctob.$(oext)
|
||||
ELIX_2_OBJS = a64l.$(oext) btowc.$(oext) getopt.$(oext) getsubopt.$(oext) l64a.$(oext) malign.$(oext) malignr.$(oext) malloptr.$(oext) mbrlen.$(oext) mbrtowc.$(oext) mbsinit.$(oext) mbsrtowcs.$(oext) on_exit.$(oext) pvallocr.$(oext) valloc.$(oext) vallocr.$(oext) wcrtomb.$(oext) wcsrtombs.$(oext) wctob.$(oext)
|
||||
|
||||
|
||||
ELIX_3_OBJS = \
|
||||
putenv.$(oext) \
|
||||
putenv_r.$(oext) \
|
||||
setenv.$(oext) \
|
||||
setenv_r.$(oext)
|
||||
ELIX_3_OBJS = putenv.$(oext) putenv_r.$(oext) setenv.$(oext) setenv_r.$(oext)
|
||||
|
||||
|
||||
ELIX_4_OBJS = \
|
||||
system.$(oext)
|
||||
ELIX_4_OBJS = system.$(oext)
|
||||
|
||||
@ELIX_LEVEL_1_TRUE@LIB_OBJS =
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS)
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) $(ELIX_3_OBJS)
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
|
||||
|
||||
# Because of how libtool moves objects around, mallocr must be built last.
|
||||
LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \
|
||||
mallinfor.$(oext) msizer.$(oext) mallocr.$(oext)
|
||||
LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) mallinfor.$(oext) msizer.$(oext) mallocr.$(oext)
|
||||
|
||||
|
||||
libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
|
||||
|
||||
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstdlib.la
|
||||
@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) $(EXTENDED_SOURCES)
|
||||
@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) $(LIBADD_OBJS)
|
||||
@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) $(LIBADD_OBJS)
|
||||
@USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE)
|
||||
@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE)
|
||||
@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
|
||||
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstdlib.la
|
||||
@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
|
||||
@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = $(LIB_OBJS) $(LIBADD_OBJS)
|
||||
@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES = $(LIB_OBJS) $(LIBADD_OBJS)
|
||||
@USE_LIBTOOL_TRUE@LIB_COMPILE = $(LTCOMPILE)
|
||||
@USE_LIBTOOL_FALSE@LIB_COMPILE = $(COMPILE)
|
||||
@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
|
||||
@USE_LIBTOOL_FALSE@noinst_DATA =
|
||||
@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
|
||||
@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) $(EXTENDED_SOURCES)
|
||||
@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) $(LIB_OBJS)
|
||||
@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) $(LIB_OBJS)
|
||||
@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
|
||||
@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
|
||||
@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
|
||||
@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
|
||||
|
||||
MALLOC_COMPILE = $(LIB_COMPILE) -DINTERNAL_NEWLIB
|
||||
|
||||
CHEWOUT_FILES = \
|
||||
_Exit.def \
|
||||
a64l.def \
|
||||
abort.def \
|
||||
abs.def \
|
||||
assert.def \
|
||||
atexit.def \
|
||||
atof.def \
|
||||
atoi.def \
|
||||
atoll.def \
|
||||
calloc.def \
|
||||
div.def \
|
||||
ecvtbuf.def \
|
||||
efgcvt.def \
|
||||
envlock.def \
|
||||
exit.def \
|
||||
getenv.def \
|
||||
labs.def \
|
||||
ldiv.def \
|
||||
llabs.def \
|
||||
lldiv.def \
|
||||
malloc.def \
|
||||
mallocr.def \
|
||||
mblen.def \
|
||||
mbstowcs.def \
|
||||
mbtowc.def \
|
||||
mlock.def \
|
||||
mstats.def \
|
||||
on_exit.def \
|
||||
rand.def \
|
||||
rand48.def \
|
||||
strtod.def \
|
||||
strtol.def \
|
||||
strtoll.def \
|
||||
strtoul.def \
|
||||
strtoull.def \
|
||||
system.def \
|
||||
wcstombs.def \
|
||||
wctomb.def
|
||||
CHEWOUT_FILES = _Exit.def a64l.def abort.def abs.def assert.def atexit.def atof.def atoi.def atoll.def calloc.def div.def ecvtbuf.def efgcvt.def envlock.def exit.def getenv.def labs.def ldiv.def llabs.def lldiv.def malloc.def mallocr.def mblen.def mbstowcs.def mbtowc.def mlock.def mstats.def on_exit.def rand.def rand48.def strtod.def strtol.def strtoll.def strtoul.def strtoull.def system.def wcstombs.def wctomb.def
|
||||
|
||||
|
||||
SUFFIXES = .def
|
||||
|
||||
Reference in New Issue
Block a user