Makefile.in (INTL_TARGETS, POSUB): Delete all references.
* Makefile.in (INTL_TARGETS, POSUB): Delete all references. (INTL_SUBDIRS): Just intl. (.SUFFIXES): Add .gmo .po .pox. (native): Also depend on build-@POSUB@. (intl.all, intl.install): Depend on config.h and things it includes. (po-generated): New target; depend on c-parse.c and tradcif.c. (install-normal): Also depend on install-@POSUB@. (XGETTEXT, GMSGFMT, MSGMERGE, PACKAGE, CATALOGS): New variables. (build-, install-, build-po, update-po, install-po, .po.gmo, .po.pox, $(PACKAGE).pot, po/$(PACKAGE).pot): New rules. * aclocal.m4: Prefix each entry in CATALOGS with "po/" * configure.in: Don't munge XGETTEXT. Don't generate po/Makefile.in. * configure: Regenerate. * exgettext: Delete. * config/m68k/m68k.h: Add doc strings for -msky and -mnosky. * cp/Make-lang.in, java/Make-lang.in, objc/Make-lang.in: Replace $(INTL_TARGETS) with po-generated. po: * EXCLUDES: New file. * exgettext: New helper script; completely rewritten. * Makefile.in.in, POTFILES.in: Delete. From-SVN: r46680
This commit is contained in:
Zack Weinberg
parent
5fb566020a
commit
5b7874aa2e
|
|
@ -1,3 +1,25 @@
|
|||
2001-10-31 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* Makefile.in (INTL_TARGETS, POSUB): Delete all references.
|
||||
(INTL_SUBDIRS): Just intl.
|
||||
(.SUFFIXES): Add .gmo .po .pox.
|
||||
(native): Also depend on build-@POSUB@.
|
||||
(intl.all, intl.install): Depend on config.h and things it includes.
|
||||
(po-generated): New target; depend on c-parse.c and tradcif.c.
|
||||
(install-normal): Also depend on install-@POSUB@.
|
||||
(XGETTEXT, GMSGFMT, MSGMERGE, PACKAGE, CATALOGS): New variables.
|
||||
(build-, install-, build-po, update-po, install-po,
|
||||
.po.gmo, .po.pox, $(PACKAGE).pot, po/$(PACKAGE).pot): New rules.
|
||||
|
||||
* aclocal.m4: Prefix each entry in CATALOGS with "po/"
|
||||
* configure.in: Don't munge XGETTEXT. Don't generate
|
||||
po/Makefile.in.
|
||||
* configure: Regenerate.
|
||||
|
||||
* exgettext: Delete.
|
||||
* config/m68k/m68k.h: Add doc strings for -msky and -mnosky.
|
||||
* objc/Make-lang.in: Replace $(INTL_TARGETS) with po-generated.
|
||||
|
||||
2001-10-31 Kazu Hirata <kazu@hxi.com>
|
||||
|
||||
* config/h8300/h8300.md (two anonymous patterns): New.
|
||||
|
|
@ -207,7 +229,7 @@ Tue Oct 30 11:02:31 CET 2001 Jan Hubicka <jh@suse.cz>
|
|||
* configure.in: Do not assume that gas's version number is the
|
||||
last thing on the first line of as --version output.
|
||||
* configure: Regenerate.
|
||||
|
||||
|
||||
* tradcpp.c: Include intl.h. Rename WARNING, ERROR, FATAL to
|
||||
MT_WARNING, MT_ERROR, MT_FATAL.
|
||||
(main): Call gcc_init_libintl.
|
||||
|
|
@ -257,7 +279,7 @@ Mon Oct 29 19:22:07 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
|||
Undo assemble_name change in earlier patch.
|
||||
|
||||
Mon Oct 29 21:11:40 2001 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
|
||||
* objc/objc-act.c (finish_message_expr): For the GNU runtime: when
|
||||
determining the type of the receiver, do not check that TREE_CODE
|
||||
of receiver is CALL_EXPR before calling receiver_is_class_object().
|
||||
|
|
@ -407,7 +429,7 @@ Sat Oct 27 17:32:04 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
|||
* config/mips/mips.c (mips_output_function_prologue): TSIZE
|
||||
is now HOST_WIDE_INT; delete unneeded casts.
|
||||
* config/mips/mips.h: Don't use #elif.
|
||||
|
||||
|
||||
* expr.c (stor_constructor_field): Always call adjust_address.
|
||||
Copy TARGET before changing its alias set.
|
||||
(store_field): Likewise, for TO_RTX.
|
||||
|
|
@ -467,24 +489,24 @@ Sat Oct 27 12:12:09 CEST 2001 Jan Hubicka <jh@suse.cz>
|
|||
|
||||
2001-10-27 Daniel Berlin <dan@cgsoftware.com>
|
||||
|
||||
* sched-rgn.c: Remove bitset typedef.
|
||||
Change bitset to sbitmap in prototypes / variable types.
|
||||
Remove bbset_size.
|
||||
Remove edgeset_bits.
|
||||
Remove edgeset_size.
|
||||
s/BITSET_ADD/SET_BIT/g
|
||||
s/BITSET_INVERT/sbitmap_ones/g
|
||||
s/BITSET_INTER/sbitmap_a_and_b/g
|
||||
s/BITSET_UNION/sbitmap_a_or_b/g
|
||||
s/BITSET_DIFFER/sbitmap_difference/g
|
||||
s/bitset_member/TEST_BIT/g
|
||||
(BITSET_*): Removed.
|
||||
(bitset_member): Removed.
|
||||
(extract_bitlst): Rewrite, now that we have sbitmaps, we can use
|
||||
EXECUTE_IF_SET_IN_SBITMAP.
|
||||
(split_edges): Rewrite, use sbitmap functions instead of bitset
|
||||
operations.
|
||||
(schedule_region): Allocate/free sbitmaps, rather than bitsets.
|
||||
* sched-rgn.c: Remove bitset typedef.
|
||||
Change bitset to sbitmap in prototypes / variable types.
|
||||
Remove bbset_size.
|
||||
Remove edgeset_bits.
|
||||
Remove edgeset_size.
|
||||
s/BITSET_ADD/SET_BIT/g
|
||||
s/BITSET_INVERT/sbitmap_ones/g
|
||||
s/BITSET_INTER/sbitmap_a_and_b/g
|
||||
s/BITSET_UNION/sbitmap_a_or_b/g
|
||||
s/BITSET_DIFFER/sbitmap_difference/g
|
||||
s/bitset_member/TEST_BIT/g
|
||||
(BITSET_*): Removed.
|
||||
(bitset_member): Removed.
|
||||
(extract_bitlst): Rewrite, now that we have sbitmaps, we can use
|
||||
EXECUTE_IF_SET_IN_SBITMAP.
|
||||
(split_edges): Rewrite, use sbitmap functions instead of bitset
|
||||
operations.
|
||||
(schedule_region): Allocate/free sbitmaps, rather than bitsets.
|
||||
|
||||
2001-10-26 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
|
|
|
|||
|
|
@ -49,11 +49,6 @@ SUBDIRS =@subdirs@
|
|||
CONFIG_LANGUAGES = @all_languages@
|
||||
LANGUAGES = c gcov$(exeext) $(CONFIG_LANGUAGES)
|
||||
|
||||
# Languages should create dependencies of $(INTL_TARGETS) on generated
|
||||
# sources in Make-lang.in. Example:
|
||||
# $(INTL_TARGETS): $(srcdir)/cp/parse.c
|
||||
INTL_TARGETS = intl.all intl.install
|
||||
|
||||
# Selection of languages to be made during stage1 build.
|
||||
# This is overridden by configure.
|
||||
BOOT_LANGUAGES = c @all_boot_languages@
|
||||
|
|
@ -341,8 +336,7 @@ INTLDEPS = @INTLDEPS@
|
|||
LIBICONV = @LIBICONV@
|
||||
|
||||
# List of internationalization subdirectories.
|
||||
POSUB = @POSUB@
|
||||
INTL_SUBDIRS = intl $(POSUB)
|
||||
INTL_SUBDIRS = intl
|
||||
|
||||
# Change this to a null string if obstacks are installed in the
|
||||
# system library.
|
||||
|
|
@ -836,8 +830,9 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
|
|||
#
|
||||
# The only suffixes we want for implicit rules are .c and .o, so clear
|
||||
# the list and add them. This speeds up GNU Make, and allows -r to work.
|
||||
# For i18n support, we also need .gmo, .po, .pox.
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o
|
||||
.SUFFIXES: .c .o .po .pox .gmo
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \
|
||||
$(xmake_file) $(tmake_file) $(LANG_MAKEFILES)
|
||||
|
|
@ -941,7 +936,7 @@ start.encap: native xgcc$(exeext) cpp$(exeext) specs \
|
|||
rest.encap: $(STMP_FIXPROTO) $(LIBGCC) $(EXTRA_PARTS) lang.rest.encap
|
||||
# This is what is made with the host's compiler
|
||||
# whether making a cross compiler or not.
|
||||
native: config.status auto-host.h intl.all $(LANGUAGES) \
|
||||
native: config.status auto-host.h intl.all build-@POSUB@ $(LANGUAGES) \
|
||||
$(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2)
|
||||
|
||||
# Define the names for selecting languages in LANGUAGES.
|
||||
|
|
@ -1969,9 +1964,6 @@ intl.o: intl.c $(CONFIG_H) system.h intl.h Makefile
|
|||
|
||||
$(top_builddir)/intl/libintl.a: intl.all
|
||||
|
||||
# Make sure all the headers are there for xgettext to scan.
|
||||
$(INTL_TARGETS): $(CONFIG_H) $(srcdir)/c-parse.c
|
||||
|
||||
intl.all intl.install intl.uninstall \
|
||||
intl.mostlyclean intl.clean intl.distclean intl.maintainer-clean:
|
||||
@for d in $(INTL_SUBDIRS); do \
|
||||
|
|
@ -1981,6 +1973,14 @@ intl.all intl.install intl.uninstall \
|
|||
if [ $$? -eq 0 ] ; then true ; else exit 1 ; fi ; \
|
||||
done
|
||||
|
||||
# intl.all and intl.install need config.h to exist, and the files it includes.
|
||||
# (FIXME: intl/*.c shouldn't need to see insn-foo.h!)
|
||||
intl.all intl.install: config.h insn-flags.h insn-constants.h
|
||||
|
||||
# Make-lang.in should add dependencies of po-generated on any generated
|
||||
# files which need to be scanned by gettext (usually Yacc-generated parsers).
|
||||
po-generated: c-parse.c tradcif.c
|
||||
|
||||
#
|
||||
# Remake cpp and protoize.
|
||||
|
||||
|
|
@ -2496,7 +2496,7 @@ install: $(INSTALL_TARGET) ; @true
|
|||
# Install the driver last so that the window when things are
|
||||
# broken is small.
|
||||
install-normal: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
|
||||
$(INSTALL_CPP) install-man install-info intl.install \
|
||||
$(INSTALL_CPP) install-man install-info intl.install install-@POSUB@ \
|
||||
lang.install-normal install-driver
|
||||
|
||||
# Do nothing while making gcc with a cross-compiler. The person who
|
||||
|
|
@ -3337,3 +3337,66 @@ float.h-cross:
|
|||
echo "#error float.h values not known for cross-compiler" >> t-float.h-cross
|
||||
echo "#endif" >> t-float.h-cross
|
||||
mv t-float.h-cross float.h-cross
|
||||
|
||||
# Rules for generating translated message descriptions.
|
||||
# Disabled by autoconf if the tools are not available.
|
||||
|
||||
XGETTEXT = @XGETTEXT@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGMERGE = msgmerge
|
||||
|
||||
PACKAGE = @PACKAGE@
|
||||
CATALOGS = @CATALOGS@
|
||||
|
||||
.PHONY: build- install- build-po install-po update-po
|
||||
|
||||
# Dummy rules to deal with dependencies produced by use of
|
||||
# "build-@POSUB@" and "install-@POSUB@" above, when NLS is disabled.
|
||||
build-: ; @true
|
||||
install-: ; @true
|
||||
|
||||
build-po: $(CATALOGS)
|
||||
|
||||
# This notation should be acceptable to all Make implementations used
|
||||
# by people who are interested in updating .po files.
|
||||
update-po: $(CATALOGS:.gmo=.pox)
|
||||
|
||||
# Update files in $(srcdir) atomically.
|
||||
.po.gmo:
|
||||
test -d po || mkdir po
|
||||
$(GMSGFMT) --statistics $< -o $@
|
||||
$(SHELL) $(srcdir)/move-if-change $@ $(srcdir)/$@
|
||||
|
||||
# This rule does _not_ copy into $(srcdir). User must do this
|
||||
# by hand. (User is a translation maintainer and is expected to
|
||||
# go through the new .po by hand anyway.)
|
||||
.po.pox:
|
||||
test -d po || mkdir po
|
||||
$(MSGMERGE) $< $(srcdir)/po/$(PACKAGE).pot -o $@
|
||||
|
||||
install-po:
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
|
||||
for cat in $(CATALOGS); do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
echo $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir || exit 1; \
|
||||
echo $(INSTALL_DATA) $(srcdir)/po/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
$(INSTALL_DATA) $(srcdir)/po/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
done
|
||||
|
||||
# Rule for regenerating the message template (gcc.pot).
|
||||
# Instead of forcing everyone to edit POTFILES.in, which proved impractical,
|
||||
# this rule has no dependencies and always regenerates gcc.pot. This is
|
||||
# relatively harmless since the .po files do not directly depend on it.
|
||||
# Note that exgettext has an awk script embedded in it which requires a
|
||||
# fairly modern (POSIX-compliant) awk.
|
||||
$(PACKAGE).pot: po/$(PACKAGE).pot
|
||||
po/$(PACKAGE).pot: force
|
||||
test -d po || mkdir po
|
||||
$(MAKE) po-generated
|
||||
AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \
|
||||
$(XGETTEXT) $(PACKAGE) $(srcdir)
|
||||
$(SHELL) $(srcdir)/move-if-change $(PACKAGE).pot \
|
||||
$(srcdir)/po/$(PACKAGE).pot
|
||||
|
|
|
|||
|
|
@ -1691,8 +1691,9 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
|||
fi
|
||||
|
||||
dnl Construct list of names of catalog files to be constructed.
|
||||
dnl GCC LOCAL: Tweak for non-recursive po directory build.
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS po/$lang$CATOBJEXT"; done
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -178,11 +178,11 @@ extern int target_flags;
|
|||
{ "nofpa", - MASK_FPA, \
|
||||
N_("Do not generate code for a Sun FPA") }, \
|
||||
{ "sky", -(MASK_FPA|MASK_68040_ONLY|MASK_68881), \
|
||||
N_("") }, \
|
||||
N_("Generate code for a Sun Sky board") }, \
|
||||
{ "sky", MASK_SKY, \
|
||||
N_("") }, \
|
||||
N_("Generate code for a Sun Sky board") }, \
|
||||
{ "nosky", - MASK_SKY, \
|
||||
N_("") }, \
|
||||
N_("Do not use Sky linkage convention") }, \
|
||||
{ "68881", - (MASK_FPA|MASK_SKY), \
|
||||
N_("Generate code for a 68881") }, \
|
||||
{ "68881", MASK_68881, "" }, \
|
||||
|
|
|
|||
|
|
@ -6646,8 +6646,8 @@ echo "configure:6628: checking for catalogs to be installed" >&5
|
|||
echo "$ac_t""$LINGUAS" 1>&6
|
||||
fi
|
||||
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS po/$lang$CATOBJEXT"; done
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -6663,7 +6663,6 @@ echo "configure:6628: checking for catalogs to be installed" >&5
|
|||
INTL_LIBTOOL_SUFFIX_PREFIX=
|
||||
|
||||
|
||||
XGETTEXT="AWK='$AWK' \$(SHELL) \$(top_srcdir)/exgettext $XGETTEXT"
|
||||
|
||||
# Windows32 Registry support for specifying GCC installation paths.
|
||||
# Check whether --enable-win32-registry or --disable-win32-registry was given.
|
||||
|
|
@ -6675,7 +6674,7 @@ fi
|
|||
case $host_os in
|
||||
win32 | pe | cygwin* | mingw32* | uwin*)
|
||||
echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
|
||||
echo "configure:6679: checking whether windows registry support is requested" >&5
|
||||
echo "configure:6678: checking whether windows registry support is requested" >&5
|
||||
if test "x$enable_win32_registry" != xno; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define ENABLE_WIN32_REGISTRY 1
|
||||
|
|
@ -6684,14 +6683,14 @@ EOF
|
|||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6
|
||||
echo "configure:6688: checking for library containing RegOpenKeyExA" >&5
|
||||
echo "configure:6687: checking for library containing RegOpenKeyExA" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_func_search_save_LIBS="$LIBS"
|
||||
ac_cv_search_RegOpenKeyExA="no"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6695 "configure"
|
||||
#line 6694 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -6702,7 +6701,7 @@ int main() {
|
|||
RegOpenKeyExA()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_RegOpenKeyExA="none required"
|
||||
else
|
||||
|
|
@ -6713,7 +6712,7 @@ rm -f conftest*
|
|||
test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do
|
||||
LIBS="-l$i $ac_func_search_save_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6717 "configure"
|
||||
#line 6716 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -6724,7 +6723,7 @@ int main() {
|
|||
RegOpenKeyExA()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_RegOpenKeyExA="-l$i"
|
||||
break
|
||||
|
|
@ -6766,7 +6765,7 @@ esac
|
|||
|
||||
if test "x$enable_win32_registry" != xno; then
|
||||
echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
|
||||
echo "configure:6770: checking registry key on windows hosts" >&5
|
||||
echo "configure:6769: checking registry key on windows hosts" >&5
|
||||
cat >> confdefs.h <<EOF
|
||||
#define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
|
||||
EOF
|
||||
|
|
@ -6949,7 +6948,7 @@ fi
|
|||
|
||||
# Figure out what assembler we will be using.
|
||||
echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
|
||||
echo "configure:6953: checking what assembler to use" >&5
|
||||
echo "configure:6952: checking what assembler to use" >&5
|
||||
gcc_cv_as=
|
||||
gcc_cv_gas_major_version=
|
||||
gcc_cv_gas_minor_version=
|
||||
|
|
@ -7035,7 +7034,7 @@ fi
|
|||
|
||||
# Figure out what nm we will be using.
|
||||
echo $ac_n "checking what nm to use""... $ac_c" 1>&6
|
||||
echo "configure:7039: checking what nm to use" >&5
|
||||
echo "configure:7038: checking what nm to use" >&5
|
||||
if test -x nm$host_exeext; then
|
||||
gcc_cv_nm=./nm$host_exeext
|
||||
elif test x$host = x$target; then
|
||||
|
|
@ -7046,7 +7045,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6
|
|||
|
||||
# Figure out what assembler alignment features are present.
|
||||
echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
|
||||
echo "configure:7050: checking assembler alignment features" >&5
|
||||
echo "configure:7049: checking assembler alignment features" >&5
|
||||
gcc_cv_as_alignment_features=none
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
# Gas version 2.6 and later support for .balign and .p2align.
|
||||
|
|
@ -7094,7 +7093,7 @@ fi
|
|||
echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
|
||||
echo "configure:7098: checking assembler subsection support" >&5
|
||||
echo "configure:7097: checking assembler subsection support" >&5
|
||||
gcc_cv_as_subsections=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
|
|
@ -7134,7 +7133,7 @@ fi
|
|||
echo "$ac_t""$gcc_cv_as_subsections" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
|
||||
echo "configure:7138: checking assembler weak support" >&5
|
||||
echo "configure:7137: checking assembler weak support" >&5
|
||||
gcc_cv_as_weak=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then
|
||||
|
|
@ -7157,7 +7156,7 @@ fi
|
|||
echo "$ac_t""$gcc_cv_as_weak" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
|
||||
echo "configure:7161: checking assembler hidden support" >&5
|
||||
echo "configure:7160: checking assembler hidden support" >&5
|
||||
gcc_cv_as_hidden=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
|
|
@ -7181,7 +7180,7 @@ fi
|
|||
echo "$ac_t""$gcc_cv_as_hidden" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6
|
||||
echo "configure:7185: checking assembler leb128 support" >&5
|
||||
echo "configure:7184: checking assembler leb128 support" >&5
|
||||
gcc_cv_as_leb128=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
|
|
@ -7226,7 +7225,7 @@ fi
|
|||
echo "$ac_t""$gcc_cv_as_leb128" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6
|
||||
echo "configure:7230: checking assembler eh_frame optimization" >&5
|
||||
echo "configure:7229: checking assembler eh_frame optimization" >&5
|
||||
gcc_cv_as_eh_frame=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
|
|
@ -7307,7 +7306,7 @@ fi
|
|||
echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6
|
||||
echo "configure:7311: checking assembler section merging support" >&5
|
||||
echo "configure:7310: checking assembler section merging support" >&5
|
||||
gcc_cv_as_shf_merge=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
|
|
@ -7332,7 +7331,7 @@ echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
|
|||
case "$target" in
|
||||
sparc*-*-*)
|
||||
echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
|
||||
echo "configure:7336: checking assembler .register pseudo-op support" >&5
|
||||
echo "configure:7335: checking assembler .register pseudo-op support" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -7360,7 +7359,7 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
|
||||
echo "configure:7364: checking assembler supports -relax" >&5
|
||||
echo "configure:7363: checking assembler supports -relax" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -7390,7 +7389,7 @@ EOF
|
|||
case "$tm_file" in
|
||||
*64*)
|
||||
echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
|
||||
echo "configure:7394: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
|
||||
echo "configure:7393: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -7435,7 +7434,7 @@ EOF
|
|||
|
||||
if test "x$gcc_cv_as_flags64" != xno; then
|
||||
echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
|
||||
echo "configure:7439: checking for assembler offsetable %lo() support" >&5
|
||||
echo "configure:7438: checking for assembler offsetable %lo() support" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -7475,7 +7474,7 @@ EOF
|
|||
|
||||
i[34567]86-*-* | x86_64-*-*)
|
||||
echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
|
||||
echo "configure:7479: checking assembler instructions" >&5
|
||||
echo "configure:7478: checking assembler instructions" >&5
|
||||
gcc_cv_as_instructions=
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then
|
||||
|
|
@ -7502,7 +7501,7 @@ EOF
|
|||
echo "$ac_t""$gcc_cv_as_instructions" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6
|
||||
echo "configure:7506: checking assembler GOTOFF in data directives" >&5
|
||||
echo "configure:7505: checking assembler GOTOFF in data directives" >&5
|
||||
gcc_cv_as_gotoff_in_data=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x
|
||||
then
|
||||
|
|
@ -7532,7 +7531,7 @@ EOF
|
|||
esac
|
||||
|
||||
echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
|
||||
echo "configure:7536: checking assembler dwarf2 debug_line support" >&5
|
||||
echo "configure:7535: checking assembler dwarf2 debug_line support" >&5
|
||||
gcc_cv_as_dwarf2_debug_line=no
|
||||
# ??? Not all targets support dwarf2 debug_line, even within a version
|
||||
# of gas. Moreover, we need to emit a valid instruction to trigger any
|
||||
|
|
@ -7724,7 +7723,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:7728: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:7727: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
|
|
@ -7785,7 +7784,7 @@ all_boot_languages=
|
|||
all_compilers=
|
||||
all_stagestuff=
|
||||
all_diff_excludes=
|
||||
all_outputs='Makefile intl/Makefile po/Makefile.in fixinc/Makefile gccbug mklibgcc'
|
||||
all_outputs='Makefile intl/Makefile fixinc/Makefile gccbug mklibgcc'
|
||||
# List of language makefile fragments.
|
||||
all_lang_makefiles=
|
||||
all_headers=
|
||||
|
|
|
|||
|
|
@ -923,7 +923,6 @@ if test "${build}" != "${host}" && test "x$enable_nls" = "xyes"; then
|
|||
fi
|
||||
|
||||
AM_GNU_GETTEXT
|
||||
XGETTEXT="AWK='$AWK' \$(SHELL) \$(top_srcdir)/exgettext $XGETTEXT"
|
||||
|
||||
# Windows32 Registry support for specifying GCC installation paths.
|
||||
AC_ARG_ENABLE(win32-registry,
|
||||
|
|
@ -1903,7 +1902,7 @@ all_boot_languages=
|
|||
all_compilers=
|
||||
all_stagestuff=
|
||||
all_diff_excludes=
|
||||
all_outputs='Makefile intl/Makefile po/Makefile.in fixinc/Makefile gccbug mklibgcc'
|
||||
all_outputs='Makefile intl/Makefile fixinc/Makefile gccbug mklibgcc'
|
||||
# List of language makefile fragments.
|
||||
all_lang_makefiles=
|
||||
all_headers=
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2001-10-31 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* Make-lang.in: Replace $(INTL_TARGETS) with po-generated.
|
||||
|
||||
2001-10-28 Joseph S. Myers <jsm28@cam.ac.uk>
|
||||
|
||||
* ChangeLog.1, ChangeLog.2, ChangeLog, class.c, decl2.c, search.c,
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) $(GCC_H) $(CONFIG_H)
|
|||
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
|
||||
$(INCLUDES) $(srcdir)/cp/g++spec.c)
|
||||
|
||||
$(INTL_TARGETS): $(srcdir)/cp/parse.c
|
||||
po-generated: $(srcdir)/cp/parse.c
|
||||
|
||||
# Create the compiler driver for g++.
|
||||
GXX_OBJS = gcc.o g++spec.o intl.o prefix.o version.o
|
||||
|
|
|
|||
118
gcc/exgettext
118
gcc/exgettext
|
|
@ -1,118 +0,0 @@
|
|||
#! /bin/sh
|
||||
# Wrapper around gettext for GCC sources.
|
||||
# Copyright 1998 Free Software Foundation, Inc.
|
||||
|
||||
# Written by Paul Eggert <eggert@twinsun.com>.
|
||||
|
||||
# This file is part of GCC.
|
||||
|
||||
# GCC is free software; you can redistribute it and/or modify it under
|
||||
# the terms of the GNU General Public License as published by the Free
|
||||
# Software Foundation; either version 2, or (at your option) any later
|
||||
# version.
|
||||
|
||||
# GCC 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 General Public
|
||||
# License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with GCC; see the file COPYING. If not, write to the Free
|
||||
# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
# Set environment to default value, if not already set.
|
||||
: ${AWK=awk}
|
||||
|
||||
# The argument to this wrapper is the xgettext command to be executed.
|
||||
# Extract the xgettext program name from the rest of the command.
|
||||
xgettext=${1?}
|
||||
shift
|
||||
|
||||
# Save work if we're just wrapping a no-op.
|
||||
case $xgettext in
|
||||
:) exit;;
|
||||
esac
|
||||
|
||||
# Find the files to be scanned, and the directory to scan them from.
|
||||
directory=.
|
||||
files=
|
||||
for i
|
||||
do
|
||||
case $i in
|
||||
--directory=*)
|
||||
directory=`expr " $i" : ' --directory=\(.*\)'`;;
|
||||
--files-from=*)
|
||||
files_from=`expr " $i" : ' --files-from=\(.*\)'`
|
||||
files=`$AWK '/^[^#]/ { print }' $files_from`;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Generate keyword options for xgettext,
|
||||
# by scanning for declarations of functions
|
||||
# whose parameter names end in "msgid".
|
||||
generate_keyword_options='
|
||||
/^[A-Z_a-z].*\(.*msgid[,)]/ {
|
||||
|
||||
paren_index = index($0, "(")
|
||||
|
||||
name = substr($0, 1, paren_index - 1)
|
||||
sub(/[^0-9A-Z_a-z]*$/, "", name)
|
||||
sub(/[ ]+PARAMS/, "", name)
|
||||
sub(/[ ]+VPARAMS/, "", name)
|
||||
sub(/.*[^0-9A-Z_a-z]/, "", name)
|
||||
|
||||
args = substr($0, paren_index)
|
||||
sub(/msgid[,)].*/, "", args)
|
||||
for (n = 1; sub(/^[^,]*,/, "", args); n++) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (n == 1) {
|
||||
keyword = name
|
||||
} else {
|
||||
keyword = name ":" n
|
||||
}
|
||||
|
||||
if (! keyword_seen[keyword]++) {
|
||||
print "--keyword=" keyword
|
||||
}
|
||||
}
|
||||
'
|
||||
keyword_options=`(
|
||||
cd $directory &&
|
||||
$AWK "$generate_keyword_options" $files < /dev/null
|
||||
)` || exit
|
||||
|
||||
# Generate temporary file reflecting the %e strings in the scanned files.
|
||||
tmp=tmp-emsgids.c
|
||||
|
||||
generate_emsgids='
|
||||
/%e.*}/ {
|
||||
line = $0
|
||||
while ((percent_index = index(line, "%e")) != 0) {
|
||||
line = substr(line, percent_index + 2)
|
||||
bracket_index = index(line, "}")
|
||||
if (bracket_index == 0) {
|
||||
continue
|
||||
}
|
||||
msgid = substr(line, 1, bracket_index - 1)
|
||||
if (index(msgid, "%") != 0) {
|
||||
continue
|
||||
}
|
||||
printf "#line %d \"%s\"\n", FNR, FILENAME
|
||||
printf "_(\"%s\")\n", msgid
|
||||
line = substr(line, bracket_index + 1)
|
||||
}
|
||||
}
|
||||
'
|
||||
(cd $directory &&
|
||||
$AWK "$generate_emsgids" $files < /dev/null
|
||||
) > $directory/$tmp || exit
|
||||
|
||||
# Run the xgettext command, with temporary added as a file to scan.
|
||||
"$xgettext" $keyword_options ${1+"$@"} $tmp || exit
|
||||
|
||||
# Clean up.
|
||||
# If we don't get here, `make clean' will remove this file later.
|
||||
rm -f $directory/$tmp
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
2001-10-31 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* Make-lang.in: Replace $(INTL_TARGETS) with po-generated.
|
||||
|
||||
2001-10-29 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
|
||||
|
||||
* mangle.c (find_compression_record_match): Don't match compression
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext)
|
|||
-rm -f $(GCJ)-cross$(exeext)
|
||||
cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext)
|
||||
|
||||
$(INTL_TARGETS): $(srcdir)/java/parse.c $(srcdir)/java/parse-scan.c
|
||||
po-generated: $(srcdir)/java/parse.c $(srcdir)/java/parse-scan.c
|
||||
|
||||
$(srcdir)/java/parse.c: $(srcdir)/java/parse.y
|
||||
$(BISON) -t --name-prefix=java_ $(BISONFLAGS) \
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ objc-parse.o : $(srcdir)/objc/objc-parse.c \
|
|||
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/objc \
|
||||
-c $(srcdir)/objc/objc-parse.c $(OUTPUT_OPTION)
|
||||
|
||||
$(INTL_TARGETS): $(srcdir)/objc/objc-parse.c
|
||||
po-generated: $(srcdir)/objc/objc-parse.c
|
||||
$(srcdir)/objc/objc-parse.c : $(srcdir)/objc/objc-parse.y
|
||||
cd $(srcdir)/objc; \
|
||||
$(BISON) $(BISONFLAGS) -o op$$$$.c objc-parse.y ; \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2001-10-31 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* EXCLUDES: New file.
|
||||
* exgettext: New helper script; completely rewritten.
|
||||
* Makefile.in.in, POTFILES.in: Delete.
|
||||
|
||||
2001-10-12 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* Makefile.in.in: Upgrade to gettext-0.10.40.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
# This file lists all the sources which should *not* be scanned for
|
||||
# strings to translate. Only the first word on each line is used; the
|
||||
# rest is ignored. Only files with an extension of .c or .h are
|
||||
# examined to begin with.
|
||||
|
||||
# These files are part of libgcc, or target headers provided by gcc.
|
||||
config/rs6000/sol-c0.c
|
||||
config/float-c4x.h
|
||||
config/float-i128.h
|
||||
config/float-i32.h
|
||||
config/float-i386.h
|
||||
config/float-i64.h
|
||||
config/float-m68k.h
|
||||
config/float-sh.h
|
||||
config/float-sparc.h
|
||||
config/float-vax.h
|
||||
crtstuff.c
|
||||
frame.h
|
||||
gbl-ctors.h
|
||||
libgcc1.c
|
||||
libgcc1-test.c
|
||||
libgcc2.c
|
||||
libgcc2.h
|
||||
limitx.h
|
||||
limity.h
|
||||
longlong.h
|
||||
unwind-dw2-fde.c
|
||||
unwind-dw2-fde.h
|
||||
unwind-dw2.c
|
||||
unwind-pe.h
|
||||
unwind-sjlj.c
|
||||
unwind.h
|
||||
|
||||
# These programs are meant to be executed only by GCC maintainers or
|
||||
# installers. Such files do not need to be translated, as these
|
||||
# people typically need to be able to read English anyway.
|
||||
enquire.c
|
||||
fix-header.c
|
||||
gen-protos.c
|
||||
genattr.c
|
||||
genattrtab.c
|
||||
gencheck.c
|
||||
gencodes.c
|
||||
genconfig.c
|
||||
genconstants.c
|
||||
genemit.c
|
||||
genextract.c
|
||||
genflags.c
|
||||
gengenrtl.c
|
||||
genopinit.c
|
||||
genoutput.c
|
||||
genpeep.c
|
||||
genpreds.c
|
||||
genrecog.c
|
||||
gensupport.c
|
||||
gensupport.h
|
||||
scan-decls.c
|
||||
scan.c
|
||||
scan.h
|
||||
|
||||
# These files are not yet internationalized, because they contain
|
||||
# many strings that require a lot of analysis, and are little-used.
|
||||
mips-tdump.c
|
||||
mips-tfile.c
|
||||
|
|
@ -1,196 +0,0 @@
|
|||
# Makefile for program source directory in GNU NLS utilities package.
|
||||
# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
||||
#
|
||||
# This file file be copied and used freely without restrictions. It can
|
||||
# be used in projects which are not available under the GNU General Public License
|
||||
# but which still want to provide support for the GNU gettext functionality.
|
||||
# Please note that the actual code is *not* freely available.
|
||||
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
|
||||
# These two variables depend on the location of this directory.
|
||||
subdir = po
|
||||
top_builddir = ..
|
||||
|
||||
SHELL = /bin/sh
|
||||
@SET_MAKE@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datadir = @datadir@
|
||||
localedir = $(datadir)/locale
|
||||
gettextsrcdir = $(datadir)/gettext/po
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
|
||||
|
||||
CC = @CC@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGFMT = @MSGFMT@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
MSGMERGE = msgmerge
|
||||
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
|
||||
INCLUDES = -I.. -I$(top_srcdir)/intl
|
||||
|
||||
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
|
||||
|
||||
POFILES = @POFILES@
|
||||
GMOFILES = @GMOFILES@
|
||||
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
|
||||
$(POFILES) $(GMOFILES)
|
||||
|
||||
POTFILES = \
|
||||
|
||||
CATALOGS = @CATALOGS@
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o .po .pox .gmo .mo
|
||||
|
||||
.c.o:
|
||||
$(COMPILE) $<
|
||||
|
||||
.po.pox:
|
||||
$(MAKE) $(PACKAGE).pot
|
||||
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
|
||||
|
||||
.po.mo:
|
||||
$(MSGFMT) -o $@ $<
|
||||
|
||||
.po.gmo:
|
||||
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
|
||||
&& rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
|
||||
|
||||
|
||||
all: all-@USE_NLS@
|
||||
|
||||
all-yes: $(CATALOGS)
|
||||
all-no:
|
||||
|
||||
# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
|
||||
# otherwise packages like GCC can not be built if only parts of the source
|
||||
# have been downloaded.
|
||||
|
||||
$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
|
||||
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
|
||||
--add-comments --keyword=_ --keyword=N_ \
|
||||
--files-from=$(srcdir)/POTFILES.in \
|
||||
&& test ! -f $(PACKAGE).po \
|
||||
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
|
||||
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
|
||||
|
||||
|
||||
install: install-exec install-data
|
||||
install-exec:
|
||||
install-data: install-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext"; then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
|
||||
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
install-data-no: all
|
||||
install-data-yes: all
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
$(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
if test -r $$cat; then \
|
||||
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
|
||||
else \
|
||||
$(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
echo "installing $(srcdir)/$$cat as" \
|
||||
"$(DESTDIR)$$dir/$(PACKAGE).mo"; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
# Define this as empty until I found a useful application.
|
||||
installcheck:
|
||||
|
||||
uninstall:
|
||||
catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
|
||||
done
|
||||
if test "$(PACKAGE)" = "gettext"; then \
|
||||
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
|
||||
check: all
|
||||
|
||||
dvi info tags TAGS ID:
|
||||
|
||||
mostlyclean:
|
||||
rm -f core core.* *.pox $(PACKAGE).po *.new.po
|
||||
rm -fr *.o
|
||||
|
||||
clean: mostlyclean
|
||||
|
||||
distclean: clean
|
||||
rm -f Makefile Makefile.in POTFILES *.mo
|
||||
|
||||
maintainer-clean: distclean
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
rm -f $(GMOFILES)
|
||||
|
||||
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
||||
dist distdir:
|
||||
$(MAKE) update-po
|
||||
@$(MAKE) dist2
|
||||
# This is a separate target because 'update-po' must be executed before.
|
||||
dist2: $(DISTFILES)
|
||||
dists="$(DISTFILES)"; \
|
||||
for file in $$dists; do \
|
||||
if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
|
||||
cp -p $$dir/$$file $(distdir); \
|
||||
done
|
||||
|
||||
update-po: Makefile
|
||||
$(MAKE) $(PACKAGE).pot
|
||||
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
|
||||
cd $(srcdir); \
|
||||
catalogs='$(GMOFILES)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||
echo "$$lang:"; \
|
||||
if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
|
||||
mv -f $$lang.new.po $$lang.po; \
|
||||
else \
|
||||
echo "msgmerge for $$cat failed!"; \
|
||||
rm -f $$lang.new.po; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) update-gmo
|
||||
|
||||
update-gmo: Makefile $(GMOFILES)
|
||||
@:
|
||||
|
||||
Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
||||
$(SHELL) ./config.status
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make not to export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
1093
gcc/po/POTFILES.in
1093
gcc/po/POTFILES.in
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,156 @@
|
|||
#! /bin/sh
|
||||
# Wrapper around gettext for GCC sources.
|
||||
# Copyright 1998, 2001 Free Software Foundation, Inc.
|
||||
|
||||
# Written by Paul Eggert <eggert@twinsun.com>.
|
||||
# Revised by Zack Weinberg <zackw@stanford.edu> for no-POTFILES operation.
|
||||
|
||||
# This file is part of GNU CC.
|
||||
|
||||
# GNU CC is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
|
||||
# GNU CC 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 General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with GNU CC; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
# Set environment to default value, if not already set.
|
||||
: ${AWK=awk}
|
||||
|
||||
# The arguments to this wrapper are: the program to execute, the
|
||||
# name of the "package", and the path to the source directory.
|
||||
|
||||
if [ $# -ne 3 ]
|
||||
then echo "usage: $0 <xgettext> <package> <srcdir>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
xgettext=$1
|
||||
package=$2
|
||||
srcdir=$3
|
||||
|
||||
nl='
|
||||
'
|
||||
|
||||
set -e
|
||||
|
||||
# Create temporary directory for scratch files.
|
||||
T=exg$$.d
|
||||
mkdir $T
|
||||
trap "rm -r $T" 0
|
||||
|
||||
pwd=`pwd`
|
||||
kopt=$pwd/$T/keyword-options
|
||||
emsg=$pwd/$T/emsgids.c
|
||||
posr=$pwd/$T/po-sources
|
||||
|
||||
# Locate files to scan, and generate the list. All .c and .h files in
|
||||
# $srcdir are examined, likewise $srcdir/config and $srcdir/config/*
|
||||
# (directories). Also, all subdirectories of $srcdir that contain a
|
||||
# config-lang.in. Exclusions come from $srcdir/po/EXCLUDE.
|
||||
#
|
||||
# Then generate keyword options for xgettext, by scanning for declarations
|
||||
# of functions whose parameter names end in "msgid".
|
||||
#
|
||||
# Finally, generate a source file containing all %e strings from
|
||||
# driver specs, so those can be translated too.
|
||||
#
|
||||
# All in one huge awk script.
|
||||
|
||||
echo "scanning for keywords and %e strings..." >&2
|
||||
|
||||
( cd $srcdir
|
||||
lang_subdirs=`echo */config-lang.in | sed -e 's|/config-lang\.in||g'`
|
||||
{ echo *.[ch]
|
||||
echo config/*.[ch]
|
||||
echo config/*/*.[ch]
|
||||
for l in $lang_subdirs
|
||||
do echo $l/*.[ch]
|
||||
done
|
||||
} | tr ' ' "$nl" |
|
||||
$AWK -v excl=po/EXCLUDES -v posr=$posr -v kopt=$kopt -v emsg=$emsg '
|
||||
function keyword_option(line) {
|
||||
paren_index = index(line, "(")
|
||||
name = substr(line, 1, paren_index - 1)
|
||||
sub(/[^0-9A-Z_a-z]*$/, "", name)
|
||||
sub(/[ ]+PARAMS/, "", name)
|
||||
sub(/[ ]+VPARAMS/, "", name)
|
||||
sub(/.*[^0-9A-Z_a-z]/, "", name)
|
||||
|
||||
args = substr(line, paren_index)
|
||||
sub(/msgid[,\)].*/, "", args)
|
||||
for (n = 1; sub(/^[^,]*,/, "", args); n++) {
|
||||
continue
|
||||
}
|
||||
|
||||
if (n == 1) { keyword = name }
|
||||
else { keyword = name ":" n }
|
||||
|
||||
if (! keyword_seen[keyword]++) {
|
||||
print "--keyword=" keyword > kopt
|
||||
}
|
||||
}
|
||||
|
||||
function spec_error_string (line) {
|
||||
while ((percent_index = index(line, "%e")) != 0) {
|
||||
escape = substr(line, percent_index - 1, 1)
|
||||
line = substr(line, percent_index + 2)
|
||||
if (escape == "%") return
|
||||
|
||||
bracket_index = index(line, "}")
|
||||
if (bracket_index == 0) return
|
||||
|
||||
msgid = substr(line, 1, bracket_index - 1)
|
||||
if (index(msgid, "%") != 0) return
|
||||
|
||||
printf("#line %d \"%s\"\n", lineno, file) > emsg
|
||||
printf("_(\"%s\")\n", msgid) > emsg
|
||||
|
||||
line = substr(line, bracket_index + 1)
|
||||
}
|
||||
}
|
||||
|
||||
BEGIN {
|
||||
while ((getline < excl) > 0) {
|
||||
if ($0 ~ /^#/ || $0 ~ /^[ ]*$/)
|
||||
continue
|
||||
excludes[$1] = 1
|
||||
}
|
||||
}
|
||||
|
||||
{ if (!($0 in excludes)) {
|
||||
print > posr
|
||||
files[NR] = $0
|
||||
}
|
||||
}
|
||||
|
||||
END {
|
||||
for (f in files) {
|
||||
file = files[f]
|
||||
lineno = 1
|
||||
while (getline < file) {
|
||||
if (/^(#[ ]*define[ ]*)?[A-Za-z_].*\(.*msgid[,\)]/) {
|
||||
keyword_option($0)
|
||||
} else if (/%e/) {
|
||||
spec_error_string($0)
|
||||
}
|
||||
lineno++
|
||||
}
|
||||
}
|
||||
print emsg > posr
|
||||
}'
|
||||
)
|
||||
|
||||
# Run the xgettext command, with temporary added as a file to scan.
|
||||
echo "running xgettext..." >&2
|
||||
$xgettext --default-domain=$package --directory=$srcdir \
|
||||
--add-comments `cat $kopt` --files-from=$posr \
|
||||
-o $package.pot
|
||||
21497
gcc/po/gcc.pot
21497
gcc/po/gcc.pot
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue