2000-04-22 04:33:34 +08:00
|
|
|
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
|
|
|
|
|
|
|
|
|
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
|
|
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
|
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|
|
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
|
|
# PARTICULAR PURPOSE.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SHELL = @SHELL@
|
|
|
|
|
|
|
|
|
|
srcdir = @srcdir@
|
|
|
|
|
top_srcdir = @top_srcdir@
|
|
|
|
|
VPATH = @srcdir@
|
|
|
|
|
prefix = @prefix@
|
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
|
|
|
|
|
|
bindir = @bindir@
|
|
|
|
|
sbindir = @sbindir@
|
|
|
|
|
libexecdir = @libexecdir@
|
|
|
|
|
datadir = @datadir@
|
|
|
|
|
sysconfdir = @sysconfdir@
|
|
|
|
|
sharedstatedir = @sharedstatedir@
|
|
|
|
|
localstatedir = @localstatedir@
|
|
|
|
|
libdir = @libdir@
|
|
|
|
|
infodir = @infodir@
|
|
|
|
|
mandir = @mandir@
|
|
|
|
|
includedir = @includedir@
|
|
|
|
|
oldincludedir = /usr/include
|
|
|
|
|
|
|
|
|
|
DESTDIR =
|
|
|
|
|
|
|
|
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
|
|
|
pkglibdir = $(libdir)/@PACKAGE@
|
|
|
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
|
|
|
|
|
|
|
|
top_builddir = ..
|
|
|
|
|
|
|
|
|
|
ACLOCAL = @ACLOCAL@
|
|
|
|
|
AUTOCONF = @AUTOCONF@
|
|
|
|
|
AUTOMAKE = @AUTOMAKE@
|
|
|
|
|
AUTOHEADER = @AUTOHEADER@
|
|
|
|
|
|
|
|
|
|
INSTALL = @INSTALL@
|
|
|
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
|
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
|
|
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
|
|
|
transform = @program_transform_name@
|
|
|
|
|
|
|
|
|
|
NORMAL_INSTALL = :
|
|
|
|
|
PRE_INSTALL = :
|
|
|
|
|
POST_INSTALL = :
|
|
|
|
|
NORMAL_UNINSTALL = :
|
|
|
|
|
PRE_UNINSTALL = :
|
|
|
|
|
POST_UNINSTALL = :
|
|
|
|
|
build_alias = @build_alias@
|
|
|
|
|
build_triplet = @build@
|
|
|
|
|
host_alias = @host_alias@
|
|
|
|
|
host_triplet = @host@
|
|
|
|
|
target_alias = @target_alias@
|
|
|
|
|
target_triplet = @target@
|
|
|
|
|
AR = @AR@
|
|
|
|
|
AS = @AS@
|
2001-07-14 00:47:56 +08:00
|
|
|
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
|
|
|
|
BASIC_FILE_H = @BASIC_FILE_H@
|
2000-04-22 04:33:34 +08:00
|
|
|
CC = @CC@
|
2001-07-14 00:47:56 +08:00
|
|
|
CCODECVT_C = @CCODECVT_C@
|
|
|
|
|
CLOCALE_H = @CLOCALE_H@
|
2000-04-22 04:33:34 +08:00
|
|
|
CPP = @CPP@
|
2000-10-12 19:45:23 +08:00
|
|
|
CSHADOW_FLAGS = @CSHADOW_FLAGS@
|
2001-07-14 00:47:56 +08:00
|
|
|
CSTDIO_H = @CSTDIO_H@
|
2000-04-22 04:33:34 +08:00
|
|
|
CXX = @CXX@
|
|
|
|
|
CXXCPP = @CXXCPP@
|
2001-07-14 00:47:56 +08:00
|
|
|
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
2000-06-19 11:14:40 +08:00
|
|
|
DEBUG_FLAGS = @DEBUG_FLAGS@
|
2000-04-22 04:33:34 +08:00
|
|
|
DLLTOOL = @DLLTOOL@
|
|
|
|
|
EXEEXT = @EXEEXT@
|
2000-05-10 08:23:47 +08:00
|
|
|
EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
|
2000-09-07 09:02:01 +08:00
|
|
|
GCJ = @GCJ@
|
|
|
|
|
GCJFLAGS = @GCJFLAGS@
|
2001-07-14 00:47:56 +08:00
|
|
|
GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
|
2000-04-22 04:33:34 +08:00
|
|
|
LIBMATHOBJS = @LIBMATHOBJS@
|
2001-07-14 00:47:56 +08:00
|
|
|
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
|
2000-04-22 04:33:34 +08:00
|
|
|
LIBSTRINGOBJS = @LIBSTRINGOBJS@
|
2001-07-14 00:47:56 +08:00
|
|
|
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
2001-05-04 04:35:18 +08:00
|
|
|
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
|
2000-04-22 04:33:34 +08:00
|
|
|
LIBTOOL = @LIBTOOL@
|
|
|
|
|
LN_S = @LN_S@
|
|
|
|
|
MAINT = @MAINT@
|
|
|
|
|
MAKEINFO = @MAKEINFO@
|
2000-06-02 15:24:15 +08:00
|
|
|
OBJDUMP = @OBJDUMP@
|
2000-07-29 01:56:27 +08:00
|
|
|
OBJEXT = @OBJEXT@
|
2000-10-12 19:45:23 +08:00
|
|
|
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
2000-07-27 05:30:45 +08:00
|
|
|
OPT_LDFLAGS = @OPT_LDFLAGS@
|
2001-07-14 00:47:56 +08:00
|
|
|
OS_INC_SRCDIR = @OS_INC_SRCDIR@
|
2000-04-22 04:33:34 +08:00
|
|
|
PACKAGE = @PACKAGE@
|
|
|
|
|
RANLIB = @RANLIB@
|
2000-06-19 11:14:40 +08:00
|
|
|
SECTION_FLAGS = @SECTION_FLAGS@
|
|
|
|
|
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
2000-07-29 01:56:27 +08:00
|
|
|
STRIP = @STRIP@
|
2000-06-20 06:20:15 +08:00
|
|
|
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
|
2000-04-22 04:33:34 +08:00
|
|
|
VERSION = @VERSION@
|
2000-10-12 19:45:23 +08:00
|
|
|
WARN_FLAGS = @WARN_FLAGS@
|
2000-05-20 03:55:50 +08:00
|
|
|
WERROR = @WERROR@
|
2000-10-31 09:56:19 +08:00
|
|
|
enable_shared = @enable_shared@
|
|
|
|
|
enable_static = @enable_static@
|
2001-04-12 02:52:31 +08:00
|
|
|
glibcpp_CXX = @glibcpp_CXX@
|
2000-04-22 04:33:34 +08:00
|
|
|
glibcpp_basedir = @glibcpp_basedir@
|
2001-05-14 09:15:36 +08:00
|
|
|
glibcpp_builddir = @glibcpp_builddir@
|
|
|
|
|
glibcpp_prefixdir = @glibcpp_prefixdir@
|
|
|
|
|
glibcpp_srcdir = @glibcpp_srcdir@
|
2001-07-14 00:47:56 +08:00
|
|
|
glibcpp_thread_h = @glibcpp_thread_h@
|
2001-02-07 09:54:21 +08:00
|
|
|
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
|
|
|
|
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
2000-10-15 16:45:33 +08:00
|
|
|
gxx_include_dir = @gxx_include_dir@
|
2000-07-19 08:57:38 +08:00
|
|
|
ifGNUmake = @ifGNUmake@
|
2000-11-16 09:44:03 +08:00
|
|
|
libio_la = @libio_la@
|
2001-02-02 05:08:05 +08:00
|
|
|
toplevel_srcdir = @toplevel_srcdir@
|
2000-04-22 04:33:34 +08:00
|
|
|
|
|
|
|
|
AUTOMAKE_OPTIONS = 1.3 cygnus
|
2001-02-03 17:01:44 +08:00
|
|
|
|
|
|
|
|
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
|
2001-07-19 01:09:02 +08:00
|
|
|
@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la
|
2000-12-09 06:26:49 +08:00
|
|
|
@GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES =
|
2000-10-08 02:54:08 +08:00
|
|
|
|
2000-10-12 19:45:23 +08:00
|
|
|
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
2001-07-14 00:47:56 +08:00
|
|
|
GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
|
2000-10-12 19:45:23 +08:00
|
|
|
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
|
|
|
|
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
|
|
|
|
|
2001-07-19 01:09:02 +08:00
|
|
|
INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
|
2000-07-19 08:57:38 +08:00
|
|
|
|
|
|
|
|
|
2001-07-19 01:09:02 +08:00
|
|
|
libio_headers = libio.h libioP.h iolibio.h
|
2000-04-22 04:33:34 +08:00
|
|
|
|
2001-07-19 01:09:02 +08:00
|
|
|
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c
|
2000-11-17 09:04:02 +08:00
|
|
|
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
|
2001-07-19 01:09:02 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c
|
2000-11-17 09:04:02 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS =
|
2000-04-22 04:33:34 +08:00
|
|
|
|
|
|
|
|
EXTRA_DIST = iostreamP.h
|
|
|
|
|
|
2000-10-27 20:29:42 +08:00
|
|
|
libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS)
|
2000-10-08 02:54:08 +08:00
|
|
|
|
|
|
|
|
AM_CFLAGS = -D_GNU_SOURCE @DEBUG_FLAGS@
|
2000-04-22 04:33:34 +08:00
|
|
|
CONFIG_HEADER = ../config.h
|
|
|
|
|
CONFIG_CLEAN_FILES =
|
|
|
|
|
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DEFS = @DEFS@ -I. -I$(srcdir) -I..
|
|
|
|
|
CPPFLAGS = @CPPFLAGS@
|
|
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
|
|
LIBS = @LIBS@
|
|
|
|
|
libio_la_LDFLAGS =
|
2000-10-07 07:31:22 +08:00
|
|
|
libio_la_LIBADD =
|
2000-10-27 20:29:42 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@libio_la_OBJECTS = \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@filedoalloc.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@genops.lo fileops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@stdfiles.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@c_codecvt.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofclose.lo \
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofopen.lo \
|
2000-10-27 20:29:42 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@wfiledoalloc.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@wfileops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@wgenops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofwide.lo
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@libio_la_OBJECTS = \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@wfiledoalloc.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@wfileops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@wgenops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@iofwide.lo
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@libio_la_OBJECTS = \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@filedoalloc.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@genops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@fileops.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@stdfiles.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@c_codecvt.lo \
|
|
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@iofclose.lo \
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@iofopen.lo
|
2000-10-27 20:29:42 +08:00
|
|
|
@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_FALSE@libio_la_OBJECTS =
|
2000-04-22 04:33:34 +08:00
|
|
|
CFLAGS = @CFLAGS@
|
2000-10-08 02:54:08 +08:00
|
|
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
|
|
|
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
2000-04-22 04:33:34 +08:00
|
|
|
CCLD = $(CC)
|
2000-10-08 02:54:08 +08:00
|
|
|
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
2000-04-22 04:33:34 +08:00
|
|
|
DIST_COMMON = ChangeLog Makefile.am Makefile.in
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|
|
|
|
|
2000-11-17 09:04:02 +08:00
|
|
|
TAR = gtar
|
2000-04-22 04:33:34 +08:00
|
|
|
GZIP_ENV = --best
|
|
|
|
|
SOURCES = $(libio_la_SOURCES)
|
|
|
|
|
OBJECTS = $(libio_la_OBJECTS)
|
|
|
|
|
|
|
|
|
|
all: all-redirect
|
|
|
|
|
.SUFFIXES:
|
2000-07-29 01:56:27 +08:00
|
|
|
.SUFFIXES: .S .c .lo .o .obj .s
|
2000-04-22 04:33:34 +08:00
|
|
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
|
|
|
cd $(top_srcdir) && $(AUTOMAKE) --cygnus libio/Makefile
|
|
|
|
|
|
|
|
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
|
|
|
cd $(top_builddir) \
|
|
|
|
|
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mostlyclean-noinstLTLIBRARIES:
|
|
|
|
|
|
|
|
|
|
clean-noinstLTLIBRARIES:
|
|
|
|
|
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
|
|
|
|
|
|
|
|
|
|
distclean-noinstLTLIBRARIES:
|
|
|
|
|
|
|
|
|
|
maintainer-clean-noinstLTLIBRARIES:
|
|
|
|
|
|
|
|
|
|
.c.o:
|
|
|
|
|
$(COMPILE) -c $<
|
|
|
|
|
|
2000-07-29 01:56:27 +08:00
|
|
|
# FIXME: We should only use cygpath when building on Windows,
|
|
|
|
|
# and only if it is available.
|
|
|
|
|
.c.obj:
|
|
|
|
|
$(COMPILE) -c `cygpath -w $<`
|
|
|
|
|
|
2000-04-22 04:33:34 +08:00
|
|
|
.s.o:
|
|
|
|
|
$(COMPILE) -c $<
|
|
|
|
|
|
|
|
|
|
.S.o:
|
|
|
|
|
$(COMPILE) -c $<
|
|
|
|
|
|
|
|
|
|
mostlyclean-compile:
|
|
|
|
|
-rm -f *.o core *.core
|
2000-07-29 01:56:27 +08:00
|
|
|
-rm -f *.$(OBJEXT)
|
2000-04-22 04:33:34 +08:00
|
|
|
|
|
|
|
|
clean-compile:
|
|
|
|
|
|
|
|
|
|
distclean-compile:
|
|
|
|
|
-rm -f *.tab.c
|
|
|
|
|
|
|
|
|
|
maintainer-clean-compile:
|
|
|
|
|
|
|
|
|
|
.c.lo:
|
|
|
|
|
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
|
|
|
|
|
|
|
|
|
.s.lo:
|
|
|
|
|
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
|
|
|
|
|
|
|
|
|
.S.lo:
|
|
|
|
|
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
|
|
|
|
|
|
|
|
|
mostlyclean-libtool:
|
|
|
|
|
-rm -f *.lo
|
|
|
|
|
|
|
|
|
|
clean-libtool:
|
|
|
|
|
-rm -rf .libs _libs
|
|
|
|
|
|
|
|
|
|
distclean-libtool:
|
|
|
|
|
|
|
|
|
|
maintainer-clean-libtool:
|
|
|
|
|
|
|
|
|
|
libio.la: $(libio_la_OBJECTS) $(libio_la_DEPENDENCIES)
|
|
|
|
|
$(LINK) $(libio_la_LDFLAGS) $(libio_la_OBJECTS) $(libio_la_LIBADD) $(LIBS)
|
|
|
|
|
|
|
|
|
|
tags: TAGS
|
|
|
|
|
|
|
|
|
|
ID: $(HEADERS) $(SOURCES) $(LISP)
|
|
|
|
|
list='$(SOURCES) $(HEADERS)'; \
|
|
|
|
|
unique=`for i in $$list; do echo $$i; done | \
|
|
|
|
|
awk ' { files[$$0] = 1; } \
|
|
|
|
|
END { for (i in files) print i; }'`; \
|
|
|
|
|
here=`pwd` && cd $(srcdir) \
|
|
|
|
|
&& mkid -f$$here/ID $$unique $(LISP)
|
|
|
|
|
|
|
|
|
|
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
|
|
|
|
tags=; \
|
|
|
|
|
here=`pwd`; \
|
|
|
|
|
list='$(SOURCES) $(HEADERS)'; \
|
|
|
|
|
unique=`for i in $$list; do echo $$i; done | \
|
|
|
|
|
awk ' { files[$$0] = 1; } \
|
|
|
|
|
END { for (i in files) print i; }'`; \
|
|
|
|
|
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
|
|
|
|
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
|
|
|
|
|
|
|
|
|
mostlyclean-tags:
|
|
|
|
|
|
|
|
|
|
clean-tags:
|
|
|
|
|
|
|
|
|
|
distclean-tags:
|
|
|
|
|
-rm -f TAGS ID
|
|
|
|
|
|
|
|
|
|
maintainer-clean-tags:
|
|
|
|
|
|
|
|
|
|
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
|
|
|
|
|
|
|
|
|
subdir = libio
|
|
|
|
|
|
|
|
|
|
distdir: $(DISTFILES)
|
|
|
|
|
@for file in $(DISTFILES); do \
|
|
|
|
|
if test -f $$file; then d=.; else d=$(srcdir); fi; \
|
|
|
|
|
if test -d $$d/$$file; then \
|
2001-03-30 16:14:15 +08:00
|
|
|
cp -pr $$d/$$file $(distdir)/$$file; \
|
2000-04-22 04:33:34 +08:00
|
|
|
else \
|
|
|
|
|
test -f $(distdir)/$$file \
|
|
|
|
|
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
|
|
|
|
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
|
|
|
|
fi; \
|
|
|
|
|
done
|
|
|
|
|
info-am:
|
|
|
|
|
info: info-am
|
|
|
|
|
dvi-am:
|
|
|
|
|
dvi: dvi-am
|
|
|
|
|
check-am:
|
|
|
|
|
check: check-am
|
|
|
|
|
installcheck-am:
|
|
|
|
|
installcheck: installcheck-am
|
|
|
|
|
install-info-am:
|
|
|
|
|
install-info: install-info-am
|
|
|
|
|
install-exec-am:
|
|
|
|
|
install-exec: install-exec-am
|
|
|
|
|
|
|
|
|
|
install-data-am:
|
|
|
|
|
install-data: install-data-am
|
|
|
|
|
|
|
|
|
|
install-am: all-am
|
|
|
|
|
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
|
|
|
|
install: install-am
|
|
|
|
|
uninstall-am:
|
|
|
|
|
uninstall: uninstall-am
|
|
|
|
|
all-am: Makefile $(LTLIBRARIES)
|
|
|
|
|
all-redirect: all-am
|
|
|
|
|
install-strip:
|
|
|
|
|
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|
|
|
|
|
installdirs:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mostlyclean-generic:
|
|
|
|
|
|
|
|
|
|
clean-generic:
|
|
|
|
|
|
|
|
|
|
distclean-generic:
|
|
|
|
|
-rm -f Makefile $(CONFIG_CLEAN_FILES)
|
|
|
|
|
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
|
|
|
|
|
|
|
|
|
|
maintainer-clean-generic:
|
|
|
|
|
mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
|
|
|
|
|
mostlyclean-libtool mostlyclean-tags \
|
|
|
|
|
mostlyclean-generic
|
|
|
|
|
|
|
|
|
|
mostlyclean: mostlyclean-am
|
|
|
|
|
|
|
|
|
|
clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \
|
|
|
|
|
clean-tags clean-generic mostlyclean-am
|
|
|
|
|
|
|
|
|
|
clean: clean-am
|
|
|
|
|
|
|
|
|
|
distclean-am: distclean-noinstLTLIBRARIES distclean-compile \
|
|
|
|
|
distclean-libtool distclean-tags distclean-generic \
|
|
|
|
|
clean-am
|
|
|
|
|
-rm -f libtool
|
|
|
|
|
|
|
|
|
|
distclean: distclean-am
|
|
|
|
|
|
|
|
|
|
maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
|
|
|
|
|
maintainer-clean-compile maintainer-clean-libtool \
|
|
|
|
|
maintainer-clean-tags maintainer-clean-generic \
|
|
|
|
|
distclean-am
|
|
|
|
|
@echo "This command is intended for maintainers to use;"
|
|
|
|
|
@echo "it deletes files that may require special tools to rebuild."
|
|
|
|
|
|
|
|
|
|
maintainer-clean: maintainer-clean-am
|
|
|
|
|
|
|
|
|
|
.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
|
|
|
|
|
clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
|
|
|
|
|
mostlyclean-compile distclean-compile clean-compile \
|
|
|
|
|
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
|
|
|
|
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
|
|
|
|
|
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
|
|
|
|
|
dvi-am dvi check check-am installcheck-am installcheck install-info-am \
|
|
|
|
|
install-info install-exec-am install-exec install-data-am install-data \
|
|
|
|
|
install-am install uninstall-am uninstall all-redirect all-am all \
|
|
|
|
|
installdirs mostlyclean-generic distclean-generic clean-generic \
|
|
|
|
|
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
|
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
|
|
|
.NOEXPORT:
|
