From: bkoz Date: Mon, 12 Sep 2005 23:09:41 +0000 (+0000) Subject: 2005-09-12 Benjamin Kosnik X-Git-Tag: upstream/4.9.2~58675 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e143b6f53e9441fdd60f7a3b68689dd31fecb97;p=platform%2Fupstream%2Flinaro-gcc.git 2005-09-12 Benjamin Kosnik David Edelsohn PR libstdc++/22554 PR libstdc++/23734 * include/Makefile.am (assoc_headers): Break into five sub values. (install-headers): Use them. (stamp-assoc): Same. * include/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104196 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 154e32a..4f3f286 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2005-09-12 Benjamin Kosnik + David Edelsohn + + PR libstdc++/22554 + PR libstdc++/23734 + * include/Makefile.am (assoc_headers): Break into five sub values. + (install-headers): Use them. + (stamp-assoc): Same. + * include/Makefile.in: Regenerate. + 2005-09-12 Chris Jefferson * include/bits/stl_algo.h (search_n): Delegate to specializations. @@ -8,8 +18,8 @@ 2005-09-12 Jim Xochellis - * include/bits/stl_algo.h (__search_n(std::random_access_iterator_tag)): - Add specialization. + * include/bits/stl_algo.h + (__search_n(std::random_access_iterator_tag)): Add specialization. (__search_n(,,,,binary_predicate,std::random_access_iterator_tag)): Likewise. diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index f328c63..8e2b79c 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index c0b503e..757e1cc 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file 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. @@ -11,23 +11,11 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file 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. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- @@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.3])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) -# AM_AUX_DIR_EXPAND +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file 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. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file 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. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -149,30 +116,19 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file 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 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -274,54 +230,31 @@ for _am_header in $config_headers :; do done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file 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. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# Add --enable-maintainer-mode option to configure. +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file 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 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# serial 3 +# serial 4 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) @@ -340,27 +273,16 @@ AC_DEFUN([AM_MAINTAINER_MODE], AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file 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. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -386,27 +308,16 @@ else fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file 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. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -460,25 +371,14 @@ else fi AC_SUBST([mkdir_p])]) -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file 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 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# serial 4 +# serial 5 # AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR]) # --------------------------------------------------- @@ -529,26 +429,15 @@ multi_basedir="$multi_basedir" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CC="$CC"])])dnl -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file 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. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -573,28 +462,16 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program 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. - -# This program 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. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file 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. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -637,25 +514,14 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file 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. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -678,25 +544,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004 Free Software Foundation, Inc. - -# This program 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. - -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# serial 1 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file 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. +# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 4195910..6fb113d 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -667,7 +667,7 @@ /* Define if the compiler is configured for setjmp/longjmp exceptions. */ #undef _GLIBCXX_SJLJ_EXCEPTIONS -/* Define to use symbol versioning in the shared library. */ +/* Define to use GNU symbol versioning in the shared library. */ #undef _GLIBCXX_SYMVER /* Define if C99 functions or macros from , , , diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index e4fa84d..185a8f3 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -225,7 +225,10 @@ assoc_subdirs = \ ${assoc_builddir}/detail/rb_tree_map_ \ ${assoc_builddir}/detail/lu_map_ -assoc_headers = \ +# The ability for make and the underlying host to deal with this +# unweildy list as one entire entity is not a sure thing, and may +# cause build errors. Thus, split one list into five smaller ones. +assoc_headers1 = \ ${assoc_srcdir}/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/type_utils.hpp \ ${assoc_srcdir}/detail/order_statistics_imp.hpp \ @@ -259,7 +262,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/ds_trait_imp.hpp \ ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \ - ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp + +assoc_headers2 = \ ${assoc_srcdir}/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp \ ${assoc_srcdir}/detail/cc_ht_map_/find_store_hash_fn_imps.hpp \ ${assoc_srcdir}/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp \ @@ -308,7 +313,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/gp_ht_map_/gp_ht_map_.hpp \ ${assoc_srcdir}/detail/gp_ht_map_/iterator_fn_imps.hpp \ ${assoc_srcdir}/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp \ - ${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp \ + ${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp + +assoc_headers3 = \ ${assoc_srcdir}/detail/tree_policy/order_statistics_imp.hpp \ ${assoc_srcdir}/detail/tree_policy/null_node_updator_imp.hpp \ ${assoc_srcdir}/detail/types_traits.hpp \ @@ -345,7 +352,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp \ - ${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp + +assoc_headers4 = \ ${assoc_srcdir}/detail/assoc_cntnr_base.hpp \ ${assoc_srcdir}/detail/ms_category_imp.hpp \ ${assoc_srcdir}/detail/hash_types_traits.hpp \ @@ -383,7 +392,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/ov_tree_map_/info_fn_imps.hpp \ ${assoc_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \ ${assoc_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \ - ${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp + +assoc_headers5 = \ ${assoc_srcdir}/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp \ ${assoc_srcdir}/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/hash_fn/linear_probe_fn_imp.hpp \ @@ -729,12 +740,29 @@ stamp-ext: ${ext_headers} # Have to deal with nested include directories, gah! Strip off source # directory before making the link. -stamp-assoc: ${assoc_headers} +# XXX check ${assoc_headers} +stamp-assoc: @if [ ! -d "${assoc_builddir}" ]; then \ mkdir -p ${assoc_subdirs} ;\ fi ;\ if [ ! -f stamp-assoc ]; then \ - (cd ${assoc_builddir} && for h in $?; do \ + (cd ${assoc_builddir} && for h in ${assoc_headers1}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers2}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers3}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers4}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers5}; do \ build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ $(LN_S) $$h $${build_name} || true ;\ done) ;\ @@ -894,7 +922,23 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${assoc_builddir} for dir in ${assoc_subdirs}; do \ $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done - for file in ${assoc_headers}; do \ + for file in ${assoc_headers1}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers2}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers3}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers4}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers5}; do \ install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 082c330..081f3e2 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -438,7 +438,11 @@ assoc_subdirs = \ ${assoc_builddir}/detail/rb_tree_map_ \ ${assoc_builddir}/detail/lu_map_ -assoc_headers = \ + +# The ability for make and the underlying host to deal with this +# unweildy list as one entire entity is not a sure thing, and may +# cause build errors. Thus, split one list into five smaller ones. +assoc_headers1 = \ ${assoc_srcdir}/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/type_utils.hpp \ ${assoc_srcdir}/detail/order_statistics_imp.hpp \ @@ -472,7 +476,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/ds_trait_imp.hpp \ ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \ - ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp + +assoc_headers2 = \ ${assoc_srcdir}/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp \ ${assoc_srcdir}/detail/cc_ht_map_/find_store_hash_fn_imps.hpp \ ${assoc_srcdir}/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp \ @@ -521,7 +527,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/gp_ht_map_/gp_ht_map_.hpp \ ${assoc_srcdir}/detail/gp_ht_map_/iterator_fn_imps.hpp \ ${assoc_srcdir}/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp \ - ${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp \ + ${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp + +assoc_headers3 = \ ${assoc_srcdir}/detail/tree_policy/order_statistics_imp.hpp \ ${assoc_srcdir}/detail/tree_policy/null_node_updator_imp.hpp \ ${assoc_srcdir}/detail/types_traits.hpp \ @@ -558,7 +566,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp \ - ${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp + +assoc_headers4 = \ ${assoc_srcdir}/detail/assoc_cntnr_base.hpp \ ${assoc_srcdir}/detail/ms_category_imp.hpp \ ${assoc_srcdir}/detail/hash_types_traits.hpp \ @@ -596,7 +606,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/ov_tree_map_/info_fn_imps.hpp \ ${assoc_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \ ${assoc_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \ - ${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp + +assoc_headers5 = \ ${assoc_srcdir}/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp \ ${assoc_srcdir}/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/hash_fn/linear_probe_fn_imp.hpp \ @@ -1104,12 +1116,29 @@ stamp-ext: ${ext_headers} # Have to deal with nested include directories, gah! Strip off source # directory before making the link. -stamp-assoc: ${assoc_headers} +# XXX check ${assoc_headers} +stamp-assoc: @if [ ! -d "${assoc_builddir}" ]; then \ mkdir -p ${assoc_subdirs} ;\ fi ;\ if [ ! -f stamp-assoc ]; then \ - (cd ${assoc_builddir} && for h in $?; do \ + (cd ${assoc_builddir} && for h in ${assoc_headers1}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers2}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers3}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers4}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers5}; do \ build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ $(LN_S) $$h $${build_name} || true ;\ done) ;\ @@ -1263,7 +1292,23 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${assoc_builddir} for dir in ${assoc_subdirs}; do \ $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done - for file in ${assoc_headers}; do \ + for file in ${assoc_headers1}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers2}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers3}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers4}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers5}; do \ install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index bd9b73c..5b26377 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libmath_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 0bb267b..6c6eebf 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 4d4372f..766eec77 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 4f3e20b..44811e8 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libstdc___la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 68040f2..168f207 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,