diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 33 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 64 |
3 files changed, 85 insertions, 18 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 56cbc2c6187..cd8fe593477 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2002-01-12 Benjamin Kosnik <bkoz@redhat.com> + * include/Makefile.am (std_headers_rename): New variable. + (install-data-local): Use it. + * include/Makefile.in: Regenerate. + +2002-01-12 Benjamin Kosnik <bkoz@redhat.com> + * include/bits/locale_facets.tcc (money_put::do_put(string): Correct output iterator value. * testsuite/22_locale/money_put_members_char.cc (test03): Add. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index d9729a35c0b..08699d4ee5f 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -214,6 +214,37 @@ std_headers = \ ${std_srcdir}/std_utility.h \ ${std_srcdir}/std_valarray.h \ ${std_srcdir}/std_vector.h +# Renamed at build time. +std_headers_rename = \ + ${std_builddir}/algorithm \ + ${std_builddir}/bitset \ + ${std_builddir}/complex \ + ${std_builddir}/deque \ + ${std_builddir}/fstream \ + ${std_builddir}/functional \ + ${std_builddir}/iomanip \ + ${std_builddir}/ios \ + ${std_builddir}/iosfwd \ + ${std_builddir}/iostream \ + ${std_builddir}/istream \ + ${std_builddir}/iterator \ + ${std_builddir}/limits \ + ${std_builddir}/list \ + ${std_builddir}/locale \ + ${std_builddir}/map \ + ${std_builddir}/memory \ + ${std_builddir}/numeric \ + ${std_builddir}/ostream \ + ${std_builddir}/queue \ + ${std_builddir}/set \ + ${std_builddir}/sstream \ + ${std_builddir}/stack \ + ${std_builddir}/stdexcept \ + ${std_builddir}/streambuf \ + ${std_builddir}/string \ + ${std_builddir}/utility \ + ${std_builddir}/valarray \ + ${std_builddir}/vector target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits @@ -372,7 +403,7 @@ install-data-local: for file in ${c_base_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${std_builddir} - for file in ${std_headers}; do \ + for file in ${std_headers_rename}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${extra_target_headers}; do \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 87a68b9109b..86ff6102194 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 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. @@ -344,6 +344,38 @@ std_headers = \ ${std_srcdir}/std_valarray.h \ ${std_srcdir}/std_vector.h +# Renamed at build time. +std_headers_rename = \ + ${std_builddir}/algorithm \ + ${std_builddir}/bitset \ + ${std_builddir}/complex \ + ${std_builddir}/deque \ + ${std_builddir}/fstream \ + ${std_builddir}/functional \ + ${std_builddir}/iomanip \ + ${std_builddir}/ios \ + ${std_builddir}/iosfwd \ + ${std_builddir}/iostream \ + ${std_builddir}/istream \ + ${std_builddir}/iterator \ + ${std_builddir}/limits \ + ${std_builddir}/list \ + ${std_builddir}/locale \ + ${std_builddir}/map \ + ${std_builddir}/memory \ + ${std_builddir}/numeric \ + ${std_builddir}/ostream \ + ${std_builddir}/queue \ + ${std_builddir}/set \ + ${std_builddir}/sstream \ + ${std_builddir}/stack \ + ${std_builddir}/stdexcept \ + ${std_builddir}/streambuf \ + ${std_builddir}/string \ + ${std_builddir}/utility \ + ${std_builddir}/valarray \ + ${std_builddir}/vector + target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits @@ -403,9 +435,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnits include/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --cygnus include/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -418,13 +450,8 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = include 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 --gnits include/Makefile @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ @@ -437,10 +464,12 @@ info-am: info: info-am dvi-am: dvi: dvi-am -check-am: all-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 @@ -488,11 +517,12 @@ 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-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-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 # Here are the rules for building the headers @@ -607,7 +637,7 @@ install-data-local: for file in ${c_base_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${std_builddir} - for file in ${std_headers}; do \ + for file in ${std_headers_rename}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done $(INSTALL) -d ${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${extra_target_headers}; do \ |
