From ad41429085cb4de37aef72bee814b08acc8a2a35 Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Mon, 28 Apr 2003 21:03:19 +0000 Subject: configure.in: Test for libintl.h. 2003-04-28 Phil Edwards * configure.in: Test for libintl.h. * include/bits/c++config: Define __N for everybody. * include/bits/basic_string.h, include/bits/stl_bvector.h, include/bits/stl_deque.h, include/bits/stl_vector.h, include/std/std_bitset.h: Wrap all __throw* text with __N. * po/Makefile.am (pot): New rule, mostly working. * src/functexcept.cc: Call gettext on all __throw* arguments when -fexceptions is in effect. * po/Makefile.in, config.h.in, configure: Regenerate. From-SVN: r66185 --- libstdc++-v3/po/Makefile.am | 9 +++++++++ libstdc++-v3/po/Makefile.in | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 18 deletions(-) (limited to 'libstdc++-v3/po') diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am index 95b0553..9065757 100644 --- a/libstdc++-v3/po/Makefile.am +++ b/libstdc++-v3/po/Makefile.am @@ -22,6 +22,7 @@ ## USA. PACKAGE = @PACKAGE@ +glibcpp_srcdir = @glibcpp_srcdir@ # Location of installation directories. mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs @@ -77,5 +78,13 @@ install-data-local-yes: all-local-yes $(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \ done +# Maintainence of the .po template file. This rule is never run automatically, +# and updates the source directory. +pot: + cd $(glibcpp_srcdir); \ + xgettext --default-domain=$(PACKAGE) --add-comments --c++ --debug \ + --join-existing -o po/$(PACKAGE).pot --keyword=__N \ + `grep -r -l '__N(".*")' .` + # Specify what gets cleaned up on a 'make clean' CLEANFILES = $(LOCALE_OUT) diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 1bf5304..a579970 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -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 @@ -133,7 +133,6 @@ glibcpp_basedir = @glibcpp_basedir@ glibcpp_builddir = @glibcpp_builddir@ glibcpp_localedir = @glibcpp_localedir@ glibcpp_prefixdir = @glibcpp_prefixdir@ -glibcpp_srcdir = @glibcpp_srcdir@ glibcpp_thread_h = @glibcpp_thread_h@ glibcpp_toolexecdir = @glibcpp_toolexecdir@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ @@ -144,6 +143,7 @@ libtool_VERSION = @libtool_VERSION@ toplevel_srcdir = @toplevel_srcdir@ PACKAGE = @PACKAGE@ +glibcpp_srcdir = @glibcpp_srcdir@ # Location of installation directories. mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs @@ -159,9 +159,7 @@ LOCALE_OUT = @glibcpp_MOFILES@ MSGFMT = msgfmt # Necessary files. -DISTFILES = \ - Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot \ - $(LOCALE_IN) +DISTFILES = Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN) # Specify what gets cleaned up on a 'make clean' @@ -176,15 +174,15 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: .SUFFIXES: .mo .po $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --cygnus po/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -197,8 +195,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = po distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu po/Makefile @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ @@ -211,12 +214,10 @@ info-am: info: info-am dvi-am: dvi: dvi-am -check-am: +check-am: all-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 @@ -265,12 +266,11 @@ maintainer-clean-am: maintainer-clean-generic distclean-am maintainer-clean: maintainer-clean-am .PHONY: 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-local install-data-am \ -install-data install-am install uninstall-am uninstall all-local \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +installcheck-am installcheck install-exec-am install-exec \ +install-data-local install-data-am install-data install-am install \ +uninstall-am uninstall all-local all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean .po.mo: @@ -309,6 +309,14 @@ install-data-local-yes: all-local-yes $(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \ done +# Maintainence of the .po template file. This rule is never run automatically, +# and updates the source directory. +pot: + cd $(glibcpp_srcdir); \ + xgettext --default-domain=$(PACKAGE) --add-comments --c++ --debug \ + --join-existing -o po/$(PACKAGE).pot --keyword=__N \ + `grep -r -l '__N(".*")' .` + # 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: -- cgit v1.1