From 066930bbe1ceaf67eefa8842b37d684914afa1ad Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Sat, 12 Jan 2002 00:50:04 +0000 Subject: [PATCH] Makefile.am (std_headers): Update list with new names. 2002-01-11 Phil Edwards * include/Makefile.am (std_headers): Update list with new names. (stamp-std): Link to standardized name. * include/Makefile.in: Regenerate. * include/std/algorithm, include/std/bitset, include/std/complex, include/std/deque, include/std/fstream, include/std/functional, include/std/iomanip, include/std/ios, include/std/iosfwd, include/std/iostream, include/std/istream, include/std/iterator, include/std/limits, include/std/list, include/std/locale, include/std/map, include/std/memory, include/std/numeric, include/std/ostream, include/std/queue, include/std/set, include/std/sstream, include/std/stack, include/std/stdexcept, include/std/streambuf, include/std/string, include/std/utility, include/std/valarray, include/std/vector: Rename to... * include/std/std_algorithm.h, include/std/std_bitset.h, include/std/std_complex.h, include/std/std_deque.h, include/std/std_fstream.h, include/std/std_functional.h, include/std/std_iomanip.h, include/std/std_ios.h, include/std/std_iosfwd.h, include/std/std_iostream.h, include/std/std_istream.h, include/std/std_iterator.h, include/std/std_limits.h, include/std/std_list.h, include/std/std_locale.h, include/std/std_map.h, include/std/std_memory.h, include/std/std_numeric.h, include/std/std_ostream.h, include/std/std_queue.h, include/std/std_set.h, include/std/std_sstream.h, include/std/std_stack.h, include/std/std_stdexcept.h, include/std/std_streambuf.h, include/std/std_string.h, include/std/std_utility.h, include/std/std_valarray.h, include/std/std_vector.h: ...this. From-SVN: r48788 --- libstdc++-v3/ChangeLog | 33 +++ libstdc++-v3/include/Makefile.am | 65 ++--- libstdc++-v3/include/Makefile.in | 236 ++++++++++++++++-- .../std/{algorithm => std_algorithm.h} | 0 .../include/std/{bitset => std_bitset.h} | 0 .../include/std/{complex => std_complex.h} | 0 .../include/std/{deque => std_deque.h} | 0 .../include/std/{fstream => std_fstream.h} | 0 .../std/{functional => std_functional.h} | 0 .../include/std/{iomanip => std_iomanip.h} | 0 libstdc++-v3/include/std/{ios => std_ios.h} | 0 .../include/std/{iosfwd => std_iosfwd.h} | 0 .../include/std/{iostream => std_iostream.h} | 0 .../include/std/{istream => std_istream.h} | 0 .../include/std/{iterator => std_iterator.h} | 0 .../include/std/{limits => std_limits.h} | 0 libstdc++-v3/include/std/{list => std_list.h} | 0 .../include/std/{locale => std_locale.h} | 0 libstdc++-v3/include/std/{map => std_map.h} | 0 .../include/std/{memory => std_memory.h} | 0 .../include/std/{numeric => std_numeric.h} | 0 .../include/std/{ostream => std_ostream.h} | 0 .../include/std/{queue => std_queue.h} | 0 libstdc++-v3/include/std/{set => std_set.h} | 0 .../include/std/{sstream => std_sstream.h} | 0 .../include/std/{stack => std_stack.h} | 0 .../std/{stdexcept => std_stdexcept.h} | 0 .../std/{streambuf => std_streambuf.h} | 0 .../include/std/{string => std_string.h} | 0 .../include/std/{utility => std_utility.h} | 0 .../include/std/{valarray => std_valarray.h} | 0 .../include/std/{vector => std_vector.h} | 0 32 files changed, 279 insertions(+), 55 deletions(-) rename libstdc++-v3/include/std/{algorithm => std_algorithm.h} (100%) rename libstdc++-v3/include/std/{bitset => std_bitset.h} (100%) rename libstdc++-v3/include/std/{complex => std_complex.h} (100%) rename libstdc++-v3/include/std/{deque => std_deque.h} (100%) rename libstdc++-v3/include/std/{fstream => std_fstream.h} (100%) rename libstdc++-v3/include/std/{functional => std_functional.h} (100%) rename libstdc++-v3/include/std/{iomanip => std_iomanip.h} (100%) rename libstdc++-v3/include/std/{ios => std_ios.h} (100%) rename libstdc++-v3/include/std/{iosfwd => std_iosfwd.h} (100%) rename libstdc++-v3/include/std/{iostream => std_iostream.h} (100%) rename libstdc++-v3/include/std/{istream => std_istream.h} (100%) rename libstdc++-v3/include/std/{iterator => std_iterator.h} (100%) rename libstdc++-v3/include/std/{limits => std_limits.h} (100%) rename libstdc++-v3/include/std/{list => std_list.h} (100%) rename libstdc++-v3/include/std/{locale => std_locale.h} (100%) rename libstdc++-v3/include/std/{map => std_map.h} (100%) rename libstdc++-v3/include/std/{memory => std_memory.h} (100%) rename libstdc++-v3/include/std/{numeric => std_numeric.h} (100%) rename libstdc++-v3/include/std/{ostream => std_ostream.h} (100%) rename libstdc++-v3/include/std/{queue => std_queue.h} (100%) rename libstdc++-v3/include/std/{set => std_set.h} (100%) rename libstdc++-v3/include/std/{sstream => std_sstream.h} (100%) rename libstdc++-v3/include/std/{stack => std_stack.h} (100%) rename libstdc++-v3/include/std/{stdexcept => std_stdexcept.h} (100%) rename libstdc++-v3/include/std/{streambuf => std_streambuf.h} (100%) rename libstdc++-v3/include/std/{string => std_string.h} (100%) rename libstdc++-v3/include/std/{utility => std_utility.h} (100%) rename libstdc++-v3/include/std/{valarray => std_valarray.h} (100%) rename libstdc++-v3/include/std/{vector => std_vector.h} (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ce6e4414454..d2d31e64fd6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,36 @@ +2002-01-11 Phil Edwards + + * include/Makefile.am (std_headers): Update list with new names. + (stamp-std): Link to standardized name. + * include/Makefile.in: Regenerate. + + * include/std/algorithm, include/std/bitset, include/std/complex, + include/std/deque, include/std/fstream, include/std/functional, + include/std/iomanip, include/std/ios, include/std/iosfwd, + include/std/iostream, include/std/istream, include/std/iterator, + include/std/limits, include/std/list, include/std/locale, + include/std/map, include/std/memory, include/std/numeric, + include/std/ostream, include/std/queue, include/std/set, + include/std/sstream, include/std/stack, include/std/stdexcept, + include/std/streambuf, include/std/string, include/std/utility, + include/std/valarray, include/std/vector: Rename to... + + * include/std/std_algorithm.h, include/std/std_bitset.h, + include/std/std_complex.h, include/std/std_deque.h, + include/std/std_fstream.h, include/std/std_functional.h, + include/std/std_iomanip.h, include/std/std_ios.h, + include/std/std_iosfwd.h, include/std/std_iostream.h, + include/std/std_istream.h, include/std/std_iterator.h, + include/std/std_limits.h, include/std/std_list.h, + include/std/std_locale.h, include/std/std_map.h, + include/std/std_memory.h, include/std/std_numeric.h, + include/std/std_ostream.h, include/std/std_queue.h, + include/std/std_set.h, include/std/std_sstream.h, + include/std/std_stack.h, include/std/std_stdexcept.h, + include/std/std_streambuf.h, include/std/std_string.h, + include/std/std_utility.h, include/std/std_valarray.h, + include/std/std_vector.h: ...this. + 2002-01-11 Loren Rittle * include/Makefile.am (extra_target_headers): New list of all diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 1ff45bd8f32..b6472ac5a42 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -185,35 +185,35 @@ c_base_headers = \ std_srcdir = ${glibcpp_srcdir}/include/std std_builddir = ./ std_headers = \ - ${std_srcdir}/algorithm \ - ${std_srcdir}/bitset \ - ${std_srcdir}/complex \ - ${std_srcdir}/deque \ - ${std_srcdir}/fstream \ - ${std_srcdir}/functional \ - ${std_srcdir}/iomanip \ - ${std_srcdir}/ios \ - ${std_srcdir}/iosfwd \ - ${std_srcdir}/iostream \ - ${std_srcdir}/istream \ - ${std_srcdir}/iterator \ - ${std_srcdir}/limits \ - ${std_srcdir}/list \ - ${std_srcdir}/locale \ - ${std_srcdir}/map \ - ${std_srcdir}/memory \ - ${std_srcdir}/numeric \ - ${std_srcdir}/ostream \ - ${std_srcdir}/queue \ - ${std_srcdir}/set \ - ${std_srcdir}/sstream \ - ${std_srcdir}/stack \ - ${std_srcdir}/stdexcept \ - ${std_srcdir}/streambuf \ - ${std_srcdir}/string \ - ${std_srcdir}/utility \ - ${std_srcdir}/valarray \ - ${std_srcdir}/vector + ${std_srcdir}/std_algorithm.h \ + ${std_srcdir}/std_bitset.h \ + ${std_srcdir}/std_complex.h \ + ${std_srcdir}/std_deque.h \ + ${std_srcdir}/std_fstream.h \ + ${std_srcdir}/std_functional.h \ + ${std_srcdir}/std_iomanip.h \ + ${std_srcdir}/std_ios.h \ + ${std_srcdir}/std_iosfwd.h \ + ${std_srcdir}/std_iostream.h \ + ${std_srcdir}/std_istream.h \ + ${std_srcdir}/std_iterator.h \ + ${std_srcdir}/std_limits.h \ + ${std_srcdir}/std_list.h \ + ${std_srcdir}/std_locale.h \ + ${std_srcdir}/std_map.h \ + ${std_srcdir}/std_memory.h \ + ${std_srcdir}/std_numeric.h \ + ${std_srcdir}/std_ostream.h \ + ${std_srcdir}/std_queue.h \ + ${std_srcdir}/std_set.h \ + ${std_srcdir}/std_sstream.h \ + ${std_srcdir}/std_stack.h \ + ${std_srcdir}/std_stdexcept.h \ + ${std_srcdir}/std_streambuf.h \ + ${std_srcdir}/std_string.h \ + ${std_srcdir}/std_utility.h \ + ${std_srcdir}/std_valarray.h \ + ${std_srcdir}/std_vector.h target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits @@ -248,11 +248,16 @@ allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \ # Here are the rules for building the headers all-local: ${target_builddir}/c++config.h ${allstamps} +# This rule is slightly different, in that we must change the name of the +# local file from std_foo.h to foo. stamp-std: ${std_headers} @if [ ! -d "${std_builddir}" ]; then \ mkdir -p ${std_builddir} ;\ fi ;\ - (cd ${std_builddir} && @LN_S@ $? . || true) ;\ + (cd ${std_builddir} && for h in $?; do \ + official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\ + @LN_S@ $$h ./$${official_name || true} ;\ + done) ;\ echo `date` > stamp-std stamp-bits: ${bits_headers} diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 70fee33be73..52580447234 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-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 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. @@ -158,45 +158,224 @@ glibcpp_builddir = @glibcpp_builddir@ bits_srcdir = ${glibcpp_srcdir}/include/bits bits_builddir = ./bits -bits_headers = ${bits_srcdir}/basic_file.h ${bits_srcdir}/basic_ios.h ${bits_srcdir}/basic_ios.tcc ${bits_srcdir}/basic_string.h ${bits_srcdir}/basic_string.tcc ${bits_srcdir}/boost_concept_check.h ${bits_srcdir}/char_traits.h ${bits_srcdir}/codecvt.h ${bits_srcdir}/concept_check.h ${bits_srcdir}/cpp_type_traits.h ${bits_srcdir}/fpos.h ${bits_srcdir}/fstream.tcc ${bits_srcdir}/functexcept.h ${bits_srcdir}/generic_shadow.h ${bits_srcdir}/gslice.h ${bits_srcdir}/gslice_array.h ${bits_srcdir}/indirect_array.h ${bits_srcdir}/ios_base.h ${bits_srcdir}/istream.tcc ${bits_srcdir}/locale_facets.h ${bits_srcdir}/locale_facets.tcc ${bits_srcdir}/localefwd.h ${bits_srcdir}/mask_array.h ${bits_srcdir}/ostream.tcc ${bits_srcdir}/pthread_allocimpl.h ${bits_srcdir}/stream_iterator.h ${bits_srcdir}/streambuf_iterator.h ${bits_srcdir}/slice.h ${bits_srcdir}/slice_array.h ${bits_srcdir}/sstream.tcc ${bits_srcdir}/stl_algo.h ${bits_srcdir}/stl_algobase.h ${bits_srcdir}/stl_alloc.h ${bits_srcdir}/stl_bvector.h ${bits_srcdir}/stl_construct.h ${bits_srcdir}/stl_deque.h ${bits_srcdir}/stl_function.h ${bits_srcdir}/stl_heap.h ${bits_srcdir}/stl_iterator.h ${bits_srcdir}/stl_iterator_base_funcs.h ${bits_srcdir}/stl_iterator_base_types.h ${bits_srcdir}/stl_list.h ${bits_srcdir}/stl_map.h ${bits_srcdir}/stl_multimap.h ${bits_srcdir}/stl_multiset.h ${bits_srcdir}/stl_numeric.h ${bits_srcdir}/stl_pair.h ${bits_srcdir}/stl_pthread_alloc.h ${bits_srcdir}/stl_queue.h ${bits_srcdir}/stl_raw_storage_iter.h ${bits_srcdir}/stl_relops.h ${bits_srcdir}/stl_set.h ${bits_srcdir}/stl_stack.h ${bits_srcdir}/stl_tempbuf.h ${bits_srcdir}/stl_threads.h ${bits_srcdir}/stl_tree.h ${bits_srcdir}/stl_uninitialized.h ${bits_srcdir}/stl_vector.h ${bits_srcdir}/streambuf.tcc ${bits_srcdir}/stringfwd.h ${bits_srcdir}/type_traits.h ${bits_srcdir}/valarray_array.h ${bits_srcdir}/valarray_array.tcc ${bits_srcdir}/valarray_meta.h +bits_headers = \ + ${bits_srcdir}/basic_file.h \ + ${bits_srcdir}/basic_ios.h \ + ${bits_srcdir}/basic_ios.tcc \ + ${bits_srcdir}/basic_string.h \ + ${bits_srcdir}/basic_string.tcc \ + ${bits_srcdir}/boost_concept_check.h \ + ${bits_srcdir}/char_traits.h \ + ${bits_srcdir}/codecvt.h \ + ${bits_srcdir}/concept_check.h \ + ${bits_srcdir}/cpp_type_traits.h \ + ${bits_srcdir}/fpos.h \ + ${bits_srcdir}/fstream.tcc \ + ${bits_srcdir}/functexcept.h \ + ${bits_srcdir}/generic_shadow.h \ + ${bits_srcdir}/gslice.h \ + ${bits_srcdir}/gslice_array.h \ + ${bits_srcdir}/indirect_array.h \ + ${bits_srcdir}/ios_base.h \ + ${bits_srcdir}/istream.tcc \ + ${bits_srcdir}/locale_facets.h \ + ${bits_srcdir}/locale_facets.tcc \ + ${bits_srcdir}/localefwd.h \ + ${bits_srcdir}/mask_array.h \ + ${bits_srcdir}/ostream.tcc \ + ${bits_srcdir}/pthread_allocimpl.h \ + ${bits_srcdir}/stream_iterator.h \ + ${bits_srcdir}/streambuf_iterator.h \ + ${bits_srcdir}/slice.h \ + ${bits_srcdir}/slice_array.h \ + ${bits_srcdir}/sstream.tcc \ + ${bits_srcdir}/stl_algo.h \ + ${bits_srcdir}/stl_algobase.h \ + ${bits_srcdir}/stl_alloc.h \ + ${bits_srcdir}/stl_bvector.h \ + ${bits_srcdir}/stl_construct.h \ + ${bits_srcdir}/stl_deque.h \ + ${bits_srcdir}/stl_function.h \ + ${bits_srcdir}/stl_heap.h \ + ${bits_srcdir}/stl_iterator.h \ + ${bits_srcdir}/stl_iterator_base_funcs.h \ + ${bits_srcdir}/stl_iterator_base_types.h \ + ${bits_srcdir}/stl_list.h \ + ${bits_srcdir}/stl_map.h \ + ${bits_srcdir}/stl_multimap.h \ + ${bits_srcdir}/stl_multiset.h \ + ${bits_srcdir}/stl_numeric.h \ + ${bits_srcdir}/stl_pair.h \ + ${bits_srcdir}/stl_pthread_alloc.h \ + ${bits_srcdir}/stl_queue.h \ + ${bits_srcdir}/stl_raw_storage_iter.h \ + ${bits_srcdir}/stl_relops.h \ + ${bits_srcdir}/stl_set.h \ + ${bits_srcdir}/stl_stack.h \ + ${bits_srcdir}/stl_tempbuf.h \ + ${bits_srcdir}/stl_threads.h \ + ${bits_srcdir}/stl_tree.h \ + ${bits_srcdir}/stl_uninitialized.h \ + ${bits_srcdir}/stl_vector.h \ + ${bits_srcdir}/streambuf.tcc \ + ${bits_srcdir}/stringfwd.h \ + ${bits_srcdir}/type_traits.h \ + ${bits_srcdir}/valarray_array.h \ + ${bits_srcdir}/valarray_array.tcc \ + ${bits_srcdir}/valarray_meta.h backward_srcdir = ${glibcpp_srcdir}/include/backward backward_builddir = ./backward -backward_headers = ${backward_srcdir}/complex.h ${backward_srcdir}/iomanip.h ${backward_srcdir}/istream.h ${backward_srcdir}/ostream.h ${backward_srcdir}/stream.h ${backward_srcdir}/streambuf.h ${backward_srcdir}/algo.h ${backward_srcdir}/algobase.h ${backward_srcdir}/alloc.h ${backward_srcdir}/bvector.h ${backward_srcdir}/defalloc.h ${backward_srcdir}/deque.h ${backward_srcdir}/function.h ${backward_srcdir}/hash_map.h ${backward_srcdir}/hash_set.h ${backward_srcdir}/hashtable.h ${backward_srcdir}/heap.h ${backward_srcdir}/iostream.h ${backward_srcdir}/iterator.h ${backward_srcdir}/list.h ${backward_srcdir}/map.h ${backward_srcdir}/multimap.h ${backward_srcdir}/new.h ${backward_srcdir}/multiset.h ${backward_srcdir}/pair.h ${backward_srcdir}/queue.h ${backward_srcdir}/rope.h ${backward_srcdir}/set.h ${backward_srcdir}/slist.h ${backward_srcdir}/stack.h ${backward_srcdir}/tempbuf.h ${backward_srcdir}/tree.h ${backward_srcdir}/vector.h ${backward_srcdir}/fstream.h ${backward_srcdir}/strstream.h ${backward_srcdir}/strstream ${backward_srcdir}/backward_warning.h +backward_headers = \ + ${backward_srcdir}/complex.h \ + ${backward_srcdir}/iomanip.h \ + ${backward_srcdir}/istream.h \ + ${backward_srcdir}/ostream.h \ + ${backward_srcdir}/stream.h \ + ${backward_srcdir}/streambuf.h \ + ${backward_srcdir}/algo.h \ + ${backward_srcdir}/algobase.h \ + ${backward_srcdir}/alloc.h \ + ${backward_srcdir}/bvector.h \ + ${backward_srcdir}/defalloc.h \ + ${backward_srcdir}/deque.h \ + ${backward_srcdir}/function.h \ + ${backward_srcdir}/hash_map.h \ + ${backward_srcdir}/hash_set.h \ + ${backward_srcdir}/hashtable.h \ + ${backward_srcdir}/heap.h \ + ${backward_srcdir}/iostream.h \ + ${backward_srcdir}/iterator.h \ + ${backward_srcdir}/list.h \ + ${backward_srcdir}/map.h \ + ${backward_srcdir}/multimap.h \ + ${backward_srcdir}/new.h \ + ${backward_srcdir}/multiset.h \ + ${backward_srcdir}/pair.h \ + ${backward_srcdir}/queue.h \ + ${backward_srcdir}/rope.h \ + ${backward_srcdir}/set.h \ + ${backward_srcdir}/slist.h \ + ${backward_srcdir}/stack.h \ + ${backward_srcdir}/tempbuf.h \ + ${backward_srcdir}/tree.h \ + ${backward_srcdir}/vector.h \ + ${backward_srcdir}/fstream.h \ + ${backward_srcdir}/strstream.h \ + ${backward_srcdir}/strstream \ + ${backward_srcdir}/backward_warning.h ext_srcdir = ${glibcpp_srcdir}/include/ext ext_builddir = ./ext -ext_headers = ${ext_srcdir}/algorithm ${ext_srcdir}/functional ${ext_srcdir}/hash_map ${ext_srcdir}/hash_set ${ext_srcdir}/iterator ${ext_srcdir}/memory ${ext_srcdir}/numeric ${ext_srcdir}/rb_tree ${ext_srcdir}/rope ${ext_srcdir}/ropeimpl.h ${ext_srcdir}/slist ${ext_srcdir}/stl_hash_fun.h ${ext_srcdir}/stl_hashtable.h ${ext_srcdir}/stl_rope.h +ext_headers = \ + ${ext_srcdir}/algorithm \ + ${ext_srcdir}/functional \ + ${ext_srcdir}/hash_map \ + ${ext_srcdir}/hash_set \ + ${ext_srcdir}/iterator \ + ${ext_srcdir}/memory \ + ${ext_srcdir}/numeric \ + ${ext_srcdir}/rb_tree \ + ${ext_srcdir}/rope \ + ${ext_srcdir}/ropeimpl.h \ + ${ext_srcdir}/slist \ + ${ext_srcdir}/stl_hash_fun.h \ + ${ext_srcdir}/stl_hashtable.h \ + ${ext_srcdir}/stl_rope.h # This is the common subset of files that all three "C" header models use. c_base_srcdir = @C_INCLUDE_DIR@ c_base_builddir = ./ -c_base_headers = ${c_base_srcdir}/cassert ${c_base_srcdir}/cctype ${c_base_srcdir}/cerrno ${c_base_srcdir}/cfloat ${c_base_srcdir}/ciso646 ${c_base_srcdir}/climits ${c_base_srcdir}/clocale ${c_base_srcdir}/cmath ${c_base_srcdir}/csetjmp ${c_base_srcdir}/csignal ${c_base_srcdir}/cstdarg ${c_base_srcdir}/cstddef ${c_base_srcdir}/cstdio ${c_base_srcdir}/cstdlib ${c_base_srcdir}/cstring ${c_base_srcdir}/ctime ${c_base_srcdir}/cwchar ${c_base_srcdir}/cwctype ${c_base_srcdir}/cmath.tcc +c_base_headers = \ + ${c_base_srcdir}/cassert \ + ${c_base_srcdir}/cctype \ + ${c_base_srcdir}/cerrno \ + ${c_base_srcdir}/cfloat \ + ${c_base_srcdir}/ciso646 \ + ${c_base_srcdir}/climits \ + ${c_base_srcdir}/clocale \ + ${c_base_srcdir}/cmath \ + ${c_base_srcdir}/csetjmp \ + ${c_base_srcdir}/csignal \ + ${c_base_srcdir}/cstdarg \ + ${c_base_srcdir}/cstddef \ + ${c_base_srcdir}/cstdio \ + ${c_base_srcdir}/cstdlib \ + ${c_base_srcdir}/cstring \ + ${c_base_srcdir}/ctime \ + ${c_base_srcdir}/cwchar \ + ${c_base_srcdir}/cwctype \ + ${c_base_srcdir}/cmath.tcc std_srcdir = ${glibcpp_srcdir}/include/std std_builddir = ./ -std_headers = ${std_srcdir}/algorithm ${std_srcdir}/bitset ${std_srcdir}/complex ${std_srcdir}/deque ${std_srcdir}/fstream ${std_srcdir}/functional ${std_srcdir}/iomanip ${std_srcdir}/ios ${std_srcdir}/iosfwd ${std_srcdir}/iostream ${std_srcdir}/istream ${std_srcdir}/iterator ${std_srcdir}/limits ${std_srcdir}/list ${std_srcdir}/locale ${std_srcdir}/map ${std_srcdir}/memory ${std_srcdir}/numeric ${std_srcdir}/ostream ${std_srcdir}/queue ${std_srcdir}/set ${std_srcdir}/sstream ${std_srcdir}/stack ${std_srcdir}/stdexcept ${std_srcdir}/streambuf ${std_srcdir}/string ${std_srcdir}/utility ${std_srcdir}/valarray ${std_srcdir}/vector +std_headers = \ + ${std_srcdir}/std_algorithm.h \ + ${std_srcdir}/std_bitset.h \ + ${std_srcdir}/std_complex.h \ + ${std_srcdir}/std_deque.h \ + ${std_srcdir}/std_fstream.h \ + ${std_srcdir}/std_functional.h \ + ${std_srcdir}/std_iomanip.h \ + ${std_srcdir}/std_ios.h \ + ${std_srcdir}/std_iosfwd.h \ + ${std_srcdir}/std_iostream.h \ + ${std_srcdir}/std_istream.h \ + ${std_srcdir}/std_iterator.h \ + ${std_srcdir}/std_limits.h \ + ${std_srcdir}/std_list.h \ + ${std_srcdir}/std_locale.h \ + ${std_srcdir}/std_map.h \ + ${std_srcdir}/std_memory.h \ + ${std_srcdir}/std_numeric.h \ + ${std_srcdir}/std_ostream.h \ + ${std_srcdir}/std_queue.h \ + ${std_srcdir}/std_set.h \ + ${std_srcdir}/std_sstream.h \ + ${std_srcdir}/std_stack.h \ + ${std_srcdir}/std_stdexcept.h \ + ${std_srcdir}/std_streambuf.h \ + ${std_srcdir}/std_string.h \ + ${std_srcdir}/std_utility.h \ + ${std_srcdir}/std_valarray.h \ + ${std_srcdir}/std_vector.h target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits -target_headers = ${target_srcdir}/ctype_base.h ${target_srcdir}/ctype_inline.h ${target_srcdir}/ctype_noninline.h ${target_srcdir}/os_defines.h ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h +target_headers = \ + ${target_srcdir}/ctype_base.h \ + ${target_srcdir}/ctype_inline.h \ + ${target_srcdir}/ctype_noninline.h \ + ${target_srcdir}/os_defines.h \ + ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ + ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h # These extra_target_headers files are all built with ad hoc naming rules. -extra_target_headers = ${target_builddir}/basic_file_model.h ${target_builddir}/c++config.h ${target_builddir}/c++io.h ${target_builddir}/c++locale.h ${target_builddir}/messages_members.h ${target_builddir}/codecvt_specializations.h +extra_target_headers = \ + ${target_builddir}/basic_file_model.h \ + ${target_builddir}/c++config.h \ + ${target_builddir}/c++io.h \ + ${target_builddir}/c++locale.h \ + ${target_builddir}/messages_members.h \ + ${target_builddir}/codecvt_specializations.h thread_builddir = ./${target_alias}/bits -thread_headers = ${thread_builddir}/gthr.h ${thread_builddir}/gthr-single.h ${thread_builddir}/gthr-default.h +thread_headers = \ + ${thread_builddir}/gthr.h \ + ${thread_builddir}/gthr-single.h \ + ${thread_builddir}/gthr-default.h # List of all timestamp files. By keeping only one copy of this list, both # CLEANFILES and all-local are kept up-to-date. -allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext stamp-target stamp-thread +allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \ + stamp-target stamp-thread # Target includes for threads @@ -219,14 +398,14 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar 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) --cygnus include/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnits include/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 @@ -239,8 +418,13 @@ 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 \ - 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 \ @@ -253,12 +437,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 @@ -306,22 +488,26 @@ 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 # Here are the rules for building the headers all-local: ${target_builddir}/c++config.h ${allstamps} +# This rule is slightly different, in that we must change the name of the +# local file from std_foo.h to foo. stamp-std: ${std_headers} @if [ ! -d "${std_builddir}" ]; then \ mkdir -p ${std_builddir} ;\ fi ;\ - (cd ${std_builddir} && @LN_S@ $? . || true) ;\ + (cd ${std_builddir} && for h in $?; do \ + official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\ + @LN_S@ $$h ./$${official_name || true} ;\ + done) ;\ echo `date` > stamp-std stamp-bits: ${bits_headers} diff --git a/libstdc++-v3/include/std/algorithm b/libstdc++-v3/include/std/std_algorithm.h similarity index 100% rename from libstdc++-v3/include/std/algorithm rename to libstdc++-v3/include/std/std_algorithm.h diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/std_bitset.h similarity index 100% rename from libstdc++-v3/include/std/bitset rename to libstdc++-v3/include/std/std_bitset.h diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/std_complex.h similarity index 100% rename from libstdc++-v3/include/std/complex rename to libstdc++-v3/include/std/std_complex.h diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/std_deque.h similarity index 100% rename from libstdc++-v3/include/std/deque rename to libstdc++-v3/include/std/std_deque.h diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/std_fstream.h similarity index 100% rename from libstdc++-v3/include/std/fstream rename to libstdc++-v3/include/std/std_fstream.h diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/std_functional.h similarity index 100% rename from libstdc++-v3/include/std/functional rename to libstdc++-v3/include/std/std_functional.h diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/std_iomanip.h similarity index 100% rename from libstdc++-v3/include/std/iomanip rename to libstdc++-v3/include/std/std_iomanip.h diff --git a/libstdc++-v3/include/std/ios b/libstdc++-v3/include/std/std_ios.h similarity index 100% rename from libstdc++-v3/include/std/ios rename to libstdc++-v3/include/std/std_ios.h diff --git a/libstdc++-v3/include/std/iosfwd b/libstdc++-v3/include/std/std_iosfwd.h similarity index 100% rename from libstdc++-v3/include/std/iosfwd rename to libstdc++-v3/include/std/std_iosfwd.h diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/std_iostream.h similarity index 100% rename from libstdc++-v3/include/std/iostream rename to libstdc++-v3/include/std/std_iostream.h diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/std_istream.h similarity index 100% rename from libstdc++-v3/include/std/istream rename to libstdc++-v3/include/std/std_istream.h diff --git a/libstdc++-v3/include/std/iterator b/libstdc++-v3/include/std/std_iterator.h similarity index 100% rename from libstdc++-v3/include/std/iterator rename to libstdc++-v3/include/std/std_iterator.h diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/std_limits.h similarity index 100% rename from libstdc++-v3/include/std/limits rename to libstdc++-v3/include/std/std_limits.h diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/std_list.h similarity index 100% rename from libstdc++-v3/include/std/list rename to libstdc++-v3/include/std/std_list.h diff --git a/libstdc++-v3/include/std/locale b/libstdc++-v3/include/std/std_locale.h similarity index 100% rename from libstdc++-v3/include/std/locale rename to libstdc++-v3/include/std/std_locale.h diff --git a/libstdc++-v3/include/std/map b/libstdc++-v3/include/std/std_map.h similarity index 100% rename from libstdc++-v3/include/std/map rename to libstdc++-v3/include/std/std_map.h diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/std_memory.h similarity index 100% rename from libstdc++-v3/include/std/memory rename to libstdc++-v3/include/std/std_memory.h diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/std_numeric.h similarity index 100% rename from libstdc++-v3/include/std/numeric rename to libstdc++-v3/include/std/std_numeric.h diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/std_ostream.h similarity index 100% rename from libstdc++-v3/include/std/ostream rename to libstdc++-v3/include/std/std_ostream.h diff --git a/libstdc++-v3/include/std/queue b/libstdc++-v3/include/std/std_queue.h similarity index 100% rename from libstdc++-v3/include/std/queue rename to libstdc++-v3/include/std/std_queue.h diff --git a/libstdc++-v3/include/std/set b/libstdc++-v3/include/std/std_set.h similarity index 100% rename from libstdc++-v3/include/std/set rename to libstdc++-v3/include/std/std_set.h diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/std_sstream.h similarity index 100% rename from libstdc++-v3/include/std/sstream rename to libstdc++-v3/include/std/std_sstream.h diff --git a/libstdc++-v3/include/std/stack b/libstdc++-v3/include/std/std_stack.h similarity index 100% rename from libstdc++-v3/include/std/stack rename to libstdc++-v3/include/std/std_stack.h diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/std_stdexcept.h similarity index 100% rename from libstdc++-v3/include/std/stdexcept rename to libstdc++-v3/include/std/std_stdexcept.h diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/std_streambuf.h similarity index 100% rename from libstdc++-v3/include/std/streambuf rename to libstdc++-v3/include/std/std_streambuf.h diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/std_string.h similarity index 100% rename from libstdc++-v3/include/std/string rename to libstdc++-v3/include/std/std_string.h diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/std_utility.h similarity index 100% rename from libstdc++-v3/include/std/utility rename to libstdc++-v3/include/std/std_utility.h diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/std_valarray.h similarity index 100% rename from libstdc++-v3/include/std/valarray rename to libstdc++-v3/include/std/std_valarray.h diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/std_vector.h similarity index 100% rename from libstdc++-v3/include/std/vector rename to libstdc++-v3/include/std/std_vector.h -- 2.30.2