This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] locale directory subdirs
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 8 Mar 2002 18:07:50 -0800
- Subject: [v3] locale directory subdirs
This patch is mostly renames. I've been meaning to do this for some
time, but didn't get around to it before the branch, sadly.
The config/locale directory started out as proof-of-concept and
gradually got out of control. Now that things are working, it makes
sense to try and impose order. Here's a stab at organization, along
subdirectories, like the other config top-level directories. Also,
consistent naming of files after locale categories, where appropriate,
is added.
tested x86/linux --enable-clocale=generic
tested x86/linux
I'd like to check this into the branch as well, but I'll wait till
after the weekend.
2002-03-08 Benjamin Kosnik <bkoz@redhat.com>
* c_locale_generic.cc: Move to...
* generic/c_locale.cc
* c_locale_generic.h: Move to...
* generic/c_locale.h
* codecvt_specializations_generic.h: Move to...
* generic/codecvt_specializations.h
* collate_members_generic.cc: Move to...
* generic/collate_members.cc
* ctype_members_generic.cc: Move to...
* generic/ctype_members.cc
* messages_members_generic.cc: Move to...
* generic/messages_members.cc
* messages_members_generic.h: Move to...
* generic/messages_members.h
* moneypunct_members_generic.cc: Move to...
* generic/monetary_members.cc
* numpunct_members_generic.cc: Move to...
* generic/numeric_members.cc
* time_members_generic.cc: Move to...
* generic/time_members.cc
* c_locale_gnu.cc: Move to...
* gnu/c_locale.cc
* c_locale_gnu.h: Move to...
* gnu/c_locale.h
* collate_members_gnu.cc: Move to...
* gnu/collate_members.cc
* ctype_members_gnu.cc: Move to...
* gnu/ctype_members.cc
* messages_members_gnu.cc: Move to...
* gnu/messages_members.cc
* messages_members_gnu.h: Move to...
* gnu/messages_members.h
* moneypunct_members_gnu.cc: Move to...
* gnu/monetary_members.cc
* numpunct_members_gnu.cc: Move to...
* gnu/numeric_members.cc
* time_members_gnu.cc: Move to...
* gnu/time_members.cc
* c_locale_ieee_1003.1-200x.cc: Move to...
* ieee_1003.1-2001/c_locale.cc
* c_locale_ieee_1003.1-200x.h: Move to...
* ieee_1003.1-2001/c_locale.h
* codecvt_specializations_ieee_1003.1-200x.h: Move to...
* ieee_1003.1-2001/codecvt_specializations.h
* messages_members_ieee_1003.1-200x.cc: Move to...
* ieee_1003.1-2001/messages_members.cc
* messages_members_ieee_1003.1-200x.h: Move to...
* ieee_1003.1-2001/messages_members.h
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Make consistent.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (sources): Change to monetary and numeric.
* src/Makefile.in: Regenerate.
* docs/html/configopts.html: Update to ieee_1003.1-2001.
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.195
diff -c -p -r1.195 acinclude.m4
*** acinclude.m4 2002/03/05 21:12:17 1.195
--- acinclude.m4 2002/03/09 02:02:42
*************** AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
*** 1127,1142 ****
# Don't use gettext.
USE_NLS=no
! CLOCALE_H=config/locale/c_locale_generic.h
! CLOCALE_CC=config/locale/c_locale_generic.cc
! CCODECVT_H=config/locale/codecvt_specializations_generic.h
! CCOLLATE_CC=config/locale/collate_members_generic.cc
! CCTYPE_CC=config/locale/ctype_members_generic.cc
! CMESSAGES_H=config/locale/messages_members_generic.h
! CMESSAGES_CC=config/locale/messages_members_generic.cc
! CMONEY_CC=config/locale/moneypunct_members_generic.cc
! CNUMERIC_CC=config/locale/numpunct_members_generic.cc
! CTIME_CC=config/locale/time_members_generic.cc
;;
xgnu)
AC_MSG_RESULT(gnu)
--- 1127,1142 ----
# Don't use gettext.
USE_NLS=no
! CLOCALE_H=config/locale/generic/c_locale.h
! CLOCALE_CC=config/locale/generic/c_locale.cc
! CCODECVT_H=config/locale/generic/codecvt_specializations.h
! CCOLLATE_CC=config/locale/generic/collate_members.cc
! CCTYPE_CC=config/locale/generic/ctype_members.cc
! CMESSAGES_H=config/locale/generic/messages_members.h
! CMESSAGES_CC=config/locale/generic/messages_members.cc
! CMONEY_CC=config/locale/generic/monetary_members.cc
! CNUMERIC_CC=config/locale/generic/numeric_members.cc
! CTIME_CC=config/locale/generic/time_members.cc
;;
xgnu)
AC_MSG_RESULT(gnu)
*************** AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
*** 1157,1189 ****
AC_SUBST(glibcpp_MOFILES)
AC_SUBST(glibcpp_POFILES)
! CLOCALE_H=config/locale/c_locale_gnu.h
! CLOCALE_CC=config/locale/c_locale_gnu.cc
! CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
! CCOLLATE_CC=config/locale/collate_members_gnu.cc
! CCTYPE_CC=config/locale/ctype_members_gnu.cc
! CMESSAGES_H=config/locale/messages_members_gnu.h
! CMESSAGES_CC=config/locale/messages_members_gnu.cc
! CMONEY_CC=config/locale/moneypunct_members_gnu.cc
! CNUMERIC_CC=config/locale/numpunct_members_gnu.cc
! CTIME_CC=config/locale/time_members_gnu.cc
;;
! xieee_1003.1)
AC_MSG_RESULT(generic)
# Don't use gettext.
USE_NLS=no
! CLOCALE_H=config/locale/c_locale_ieee_1003.1-200x.h
! CLOCALE_CC=config/locale/c_locale_ieee_1003.1-200x.cc
! CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
! CCOLLATE_CC=config/locale/collate_members_generic.cc
! CCTYPE_CC=config/locale/ctype_members_generic.cc
! CMESSAGES_H=config/locale/messages_members_ieee_1003.1-200x.h
! CMESSAGES_CC=config/locale/messages_members_ieee_1003.1-200x.cc
! CMONEY_CC=config/locale/moneypunct_members_generic.cc
! CNUMERIC_CC=config/locale/numpunct_members_generic.cc
! CTIME_CC=config/locale/time_members_generic.cc
;;
*)
echo "$enable_clocale is an unknown locale package" 1>&2
--- 1157,1189 ----
AC_SUBST(glibcpp_MOFILES)
AC_SUBST(glibcpp_POFILES)
! CLOCALE_H=config/locale/gnu/c_locale.h
! CLOCALE_CC=config/locale/gnu/c_locale.cc
! CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
! CCOLLATE_CC=config/locale/gnu/collate_members.cc
! CCTYPE_CC=config/locale/gnu/ctype_members.cc
! CMESSAGES_H=config/locale/gnu/messages_members.h
! CMESSAGES_CC=config/locale/gnu/messages_members.cc
! CMONEY_CC=config/locale/gnu/monetary_members.cc
! CNUMERIC_CC=config/locale/gnu/numeric_members.cc
! CTIME_CC=config/locale/gnu/time_members.cc
;;
! xieee_1003.1-2001)
AC_MSG_RESULT(generic)
# Don't use gettext.
USE_NLS=no
! CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
! CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
! CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
! CCOLLATE_CC=config/locale/generic/collate_members.cc
! CCTYPE_CC=config/locale/generic/ctype_members.cc
! CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
! CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
! CMONEY_CC=config/locale/generic/monetary_members.cc
! CNUMERIC_CC=config/locale/generic/numeric_members.cc
! CTIME_CC=config/locale/generic/time_members.cc
;;
*)
echo "$enable_clocale is an unknown locale package" 1>&2
*************** AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
*** 1204,1211 ****
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
! AC_LINK_FILES($CMONEY_CC, src/moneypunct.cc)
! AC_LINK_FILES($CNUMERIC_CC, src/numpunct.cc)
AC_LINK_FILES($CTIME_CC, src/time.cc)
])
--- 1204,1211 ----
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
! AC_LINK_FILES($CMONEY_CC, src/monetary.cc)
! AC_LINK_FILES($CNUMERIC_CC, src/numeric.cc)
AC_LINK_FILES($CTIME_CC, src/time.cc)
])
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.103
diff -c -p -r1.103 Makefile.am
*** Makefile.am 2002/02/14 18:24:12 1.103
--- Makefile.am 2002/03/09 02:02:42
*************** sources = \
*** 66,72 ****
cmath.cc bitset.cc \
functexcept.cc stdexcept.cc vterminate.cc \
c++locale.cc locale.cc localename.cc codecvt.cc \
! collate.cc ctype.cc messages.cc moneypunct.cc numpunct.cc time.cc \
concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc
--- 66,72 ----
cmath.cc bitset.cc \
functexcept.cc stdexcept.cc vterminate.cc \
c++locale.cc locale.cc localename.cc codecvt.cc \
! collate.cc ctype.cc messages.cc monetary.cc numeric.cc time.cc \
concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc