X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2FMakefile.am;h=89ac735b21839027fc899d32d21e144716f6a53a;hp=23a4120fda5ba6cd8058d3f20d870ec6f34a2fc2;hb=9b8b8513deb50fdb4c0a8f79663993a5e312fe1a;hpb=36fed23c7b7f61b03f5660b43eee2fe127d1a151 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 23a4120fda5..89ac735b218 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the include subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. @@ -28,97 +28,86 @@ include $(top_srcdir)/fragment.am std_srcdir = ${glibcxx_srcdir}/include/std std_builddir = . 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 -# Renamed at build time. -std_headers_rename = \ - algorithm \ - bitset \ - complex \ - deque \ - fstream \ - functional \ - iomanip \ - ios \ - iosfwd \ - iostream \ - istream \ - iterator \ - limits \ - list \ - locale \ - map \ - memory \ - numeric \ - ostream \ - queue \ - set \ - sstream \ - stack \ - stdexcept \ - streambuf \ - string \ - utility \ - valarray \ - vector + ${std_srcdir}/algorithm \ + ${std_srcdir}/array \ + ${std_srcdir}/bitset \ + ${std_srcdir}/c++0x_warning.h \ + ${std_srcdir}/complex \ + ${std_srcdir}/condition_variable \ + ${std_srcdir}/date_time \ + ${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}/mutex \ + ${std_srcdir}/numeric \ + ${std_srcdir}/ostream \ + ${std_srcdir}/queue \ + ${std_srcdir}/random \ + ${std_srcdir}/ratio \ + ${std_srcdir}/regex \ + ${std_srcdir}/set \ + ${std_srcdir}/sstream \ + ${std_srcdir}/stack \ + ${std_srcdir}/stdexcept \ + ${std_srcdir}/streambuf \ + ${std_srcdir}/string \ + ${std_srcdir}/system_error \ + ${std_srcdir}/tuple \ + ${std_srcdir}/type_traits \ + ${std_srcdir}/unordered_map \ + ${std_srcdir}/unordered_set \ + ${std_srcdir}/utility \ + ${std_srcdir}/valarray \ + ${std_srcdir}/vector bits_srcdir = ${glibcxx_srcdir}/include/bits bits_builddir = ./bits bits_headers = \ + ${bits_srcdir}/algorithmfwd.h \ ${bits_srcdir}/allocator.h \ - ${bits_srcdir}/atomicity.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}/boost_sp_shared_count.h \ ${bits_srcdir}/char_traits.h \ ${bits_srcdir}/codecvt.h \ ${bits_srcdir}/concept_check.h \ - ${bits_srcdir}/concurrence.h \ ${bits_srcdir}/cpp_type_traits.h \ ${bits_srcdir}/deque.tcc \ ${bits_srcdir}/fstream.tcc \ ${bits_srcdir}/functexcept.h \ + ${bits_srcdir}/functional_hash.h \ ${bits_srcdir}/gslice.h \ ${bits_srcdir}/gslice_array.h \ + ${bits_srcdir}/hashtable.h \ ${bits_srcdir}/indirect_array.h \ ${bits_srcdir}/ios_base.h \ ${bits_srcdir}/istream.tcc \ ${bits_srcdir}/list.tcc \ ${bits_srcdir}/locale_classes.h \ + ${bits_srcdir}/locale_classes.tcc \ ${bits_srcdir}/locale_facets.h \ ${bits_srcdir}/locale_facets.tcc \ + ${bits_srcdir}/locale_facets_nonio.h \ + ${bits_srcdir}/locale_facets_nonio.tcc \ ${bits_srcdir}/localefwd.h \ ${bits_srcdir}/mask_array.h \ + ${bits_srcdir}/move.h \ ${bits_srcdir}/ostream.tcc \ + ${bits_srcdir}/ostream_insert.h \ ${bits_srcdir}/postypes.h \ ${bits_srcdir}/stream_iterator.h \ ${bits_srcdir}/streambuf_iterator.h \ @@ -151,6 +140,7 @@ bits_headers = \ ${bits_srcdir}/stl_vector.h \ ${bits_srcdir}/streambuf.tcc \ ${bits_srcdir}/stringfwd.h \ + ${bits_srcdir}/unique_ptr.h \ ${bits_srcdir}/valarray_array.h \ ${bits_srcdir}/valarray_array.tcc \ ${bits_srcdir}/valarray_before.h \ @@ -160,43 +150,14 @@ bits_headers = \ backward_srcdir = ${glibcxx_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}/auto_ptr.h \ + ${backward_srcdir}/backward_warning.h \ + ${backward_srcdir}/binders.h \ + ${backward_srcdir}/hash_map \ + ${backward_srcdir}/hash_set \ + ${backward_srcdir}/hash_fun.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 \ - ${backward_srcdir}/backward_warning.h - + ${backward_srcdir}/strstream pb_srcdir = ${glibcxx_srcdir}/include/ext/pb_ds pb_builddir = ./ext/pb_ds @@ -206,7 +167,6 @@ pb_subdirs = \ ${pb_builddir}/detail/pairing_heap_ \ ${pb_builddir}/detail/splay_tree_ \ ${pb_builddir}/detail/list_update_map_ \ - ${pb_builddir}/detail/typelist \ ${pb_builddir}/detail/basic_tree_policy \ ${pb_builddir}/detail/trie_policy \ ${pb_builddir}/detail/gp_hash_table_map_ \ @@ -229,7 +189,7 @@ pb_subdirs = \ ${pb_builddir}/detail/list_update_policy # 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 +# unwieldy list as one entire entity is not a sure thing, and may # cause build errors. Thus, split one list into many smaller # mini-lists, with the maximum size per mini-list of no more than 42. @@ -274,7 +234,7 @@ pb_headers1 = \ ${pb_srcdir}/detail/binomial_heap_/debug_fn_imps.hpp \ ${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp \ ${pb_srcdir}/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp \ - ${pb_srcdir}/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp + ${pb_srcdir}/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp pb_headers2 = \ ${pb_srcdir}/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp \ @@ -316,7 +276,7 @@ pb_headers2 = \ ${pb_srcdir}/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp \ ${pb_srcdir}/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp \ ${pb_srcdir}/detail/cc_hash_table_map_/size_fn_imps.hpp \ - ${pb_srcdir}/detail/cc_hash_table_map_/standard_policies.hpp + ${pb_srcdir}/detail/cc_hash_table_map_/standard_policies.hpp pb_headers3 = \ ${pb_srcdir}/detail/cc_hash_table_map_/trace_fn_imps.hpp \ @@ -357,7 +317,7 @@ pb_headers3 = \ ${pb_srcdir}/detail/hash_fn/probe_fn_base.hpp \ ${pb_srcdir}/detail/hash_fn/quadratic_probe_fn_imp.hpp \ ${pb_srcdir}/detail/hash_fn/ranged_hash_fn.hpp \ - ${pb_srcdir}/detail/hash_fn/ranged_probe_fn.hpp + ${pb_srcdir}/detail/hash_fn/ranged_probe_fn.hpp pb_headers4 = \ ${pb_srcdir}/detail/hash_fn/sample_probe_fn.hpp \ @@ -391,7 +351,7 @@ pb_headers4 = \ ${pb_srcdir}/detail/list_update_policy/counter_lu_policy_imp.hpp \ ${pb_srcdir}/detail/list_update_policy/mtf_lu_policy_imp.hpp \ ${pb_srcdir}/detail/list_update_policy/sample_update_policy.hpp \ - ${pb_srcdir}/detail/map_debug_base.hpp \ + ${pb_srcdir}/detail/debug_map_base.hpp \ ${pb_srcdir}/detail/ov_tree_map_/cond_dtor.hpp \ ${pb_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \ @@ -400,7 +360,7 @@ pb_headers4 = \ ${pb_srcdir}/detail/ov_tree_map_/insert_fn_imps.hpp \ ${pb_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \ ${pb_srcdir}/detail/ov_tree_map_/node_iterators.hpp \ - ${pb_srcdir}/detail/ov_tree_map_/ov_tree_map_.hpp + ${pb_srcdir}/detail/ov_tree_map_/ov_tree_map_.hpp pb_headers5 = \ ${pb_srcdir}/detail/ov_tree_map_/policy_access_fn_imps.hpp \ @@ -442,7 +402,7 @@ pb_headers5 = \ ${pb_srcdir}/detail/pat_trie_/update_fn_imps.hpp \ ${pb_srcdir}/detail/priority_queue_base_dispatch.hpp \ ${pb_srcdir}/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp \ - ${pb_srcdir}/detail/rb_tree_map_/debug_fn_imps.hpp + ${pb_srcdir}/detail/rb_tree_map_/debug_fn_imps.hpp pb_headers6 = \ ${pb_srcdir}/detail/rb_tree_map_/erase_fn_imps.hpp \ @@ -484,7 +444,7 @@ pb_headers6 = \ ${pb_srcdir}/detail/standard_policies.hpp \ ${pb_srcdir}/detail/thin_heap_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/thin_heap_/debug_fn_imps.hpp \ - ${pb_srcdir}/detail/thin_heap_/erase_fn_imps.hpp + ${pb_srcdir}/detail/thin_heap_/erase_fn_imps.hpp pb_headers7 = \ ${pb_srcdir}/detail/thin_heap_/find_fn_imps.hpp \ @@ -505,77 +465,73 @@ pb_headers7 = \ ${pb_srcdir}/detail/trie_policy/sample_trie_node_update.hpp \ ${pb_srcdir}/detail/trie_policy/string_trie_e_access_traits_imp.hpp \ ${pb_srcdir}/detail/trie_policy/trie_policy_base.hpp \ - ${pb_srcdir}/detail/typelist_assoc_container.hpp \ - ${pb_srcdir}/detail/typelist.hpp \ - ${pb_srcdir}/detail/typelist/typelist_append.hpp \ - ${pb_srcdir}/detail/typelist/typelist_apply.hpp \ - ${pb_srcdir}/detail/typelist/typelist_assoc_container_find.hpp \ - ${pb_srcdir}/detail/typelist/typelist_at_index.hpp \ - ${pb_srcdir}/detail/typelist/typelist_contains.hpp \ - ${pb_srcdir}/detail/typelist/typelist_filter.hpp \ - ${pb_srcdir}/detail/typelist/typelist_flatten.hpp \ - ${pb_srcdir}/detail/typelist/typelist_transform.hpp \ - ${pb_srcdir}/detail/typelist/typelist_typelist_append.hpp \ ${pb_srcdir}/detail/types_traits.hpp \ ${pb_srcdir}/detail/type_utils.hpp \ ${pb_srcdir}/detail/unordered_iterator/const_iterator.hpp \ ${pb_srcdir}/detail/unordered_iterator/const_point_iterator.hpp \ ${pb_srcdir}/detail/unordered_iterator/iterator.hpp \ - ${pb_srcdir}/detail/unordered_iterator/point_iterator.hpp - + ${pb_srcdir}/detail/unordered_iterator/point_iterator.hpp ext_srcdir = ${glibcxx_srcdir}/include/ext -ext_builddir = ./ext +ext_builddir = ./ext ext_headers = \ ${ext_srcdir}/algorithm \ + ${ext_srcdir}/atomicity.h \ ${ext_srcdir}/array_allocator.h \ ${ext_srcdir}/bitmap_allocator.h \ ${ext_srcdir}/codecvt_specializations.h \ + ${ext_srcdir}/concurrence.h \ ${ext_srcdir}/debug_allocator.h \ + ${ext_srcdir}/enc_filebuf.h \ ${ext_srcdir}/stdio_filebuf.h \ ${ext_srcdir}/stdio_sync_filebuf.h \ ${ext_srcdir}/functional \ - ${ext_srcdir}/hash_map \ - ${ext_srcdir}/hash_set \ - ${ext_srcdir}/hash_fun.h \ - ${ext_srcdir}/hashtable.h \ ${ext_srcdir}/iterator \ ${ext_srcdir}/malloc_allocator.h \ ${ext_srcdir}/memory \ ${ext_srcdir}/mt_allocator.h \ ${ext_srcdir}/new_allocator.h \ ${ext_srcdir}/numeric \ + ${ext_srcdir}/numeric_traits.h \ ${ext_srcdir}/pod_char_traits.h \ ${ext_srcdir}/pool_allocator.h \ ${ext_srcdir}/rb_tree \ ${ext_srcdir}/rope \ ${ext_srcdir}/ropeimpl.h \ ${ext_srcdir}/slist \ + ${ext_srcdir}/string_conversions.h \ + ${ext_srcdir}/throw_allocator.h \ ${ext_srcdir}/typelist.h \ + ${ext_srcdir}/type_traits.h \ ${ext_srcdir}/rc_string_base.h \ ${ext_srcdir}/sso_string_base.h \ ${ext_srcdir}/vstring.h \ ${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring_fwd.h \ - ${ext_srcdir}/vstring_util.h + ${ext_srcdir}/vstring_util.h \ + ${ext_compat_headers} +ext_compat_headers = \ + ${backward_srcdir}/hash_set \ + ${backward_srcdir}/hash_map tr1_srcdir = ${glibcxx_srcdir}/include/tr1 tr1_builddir = ./tr1 tr1_headers = \ ${tr1_srcdir}/array \ - ${tr1_srcdir}/bind_repeat.h \ - ${tr1_srcdir}/bind_iterate.h \ - ${tr1_srcdir}/boost_shared_ptr.h \ + ${tr1_srcdir}/bessel_function.tcc \ + ${tr1_srcdir}/beta_function.tcc \ + ${tr1_srcdir}/boost_sp_shared_count.h \ + ${tr1_srcdir}/ccomplex \ ${tr1_srcdir}/cctype \ ${tr1_srcdir}/cfenv \ ${tr1_srcdir}/cfloat \ ${tr1_srcdir}/cinttypes \ ${tr1_srcdir}/climits \ ${tr1_srcdir}/cmath \ - ${tr1_srcdir}/common.h \ ${tr1_srcdir}/complex \ + ${tr1_srcdir}/complex.h \ ${tr1_srcdir}/cstdarg \ ${tr1_srcdir}/cstdbool \ ${tr1_srcdir}/cstdint \ @@ -586,21 +542,27 @@ tr1_headers = \ ${tr1_srcdir}/ctype.h \ ${tr1_srcdir}/cwchar \ ${tr1_srcdir}/cwctype \ + ${tr1_srcdir}/ell_integral.tcc \ + ${tr1_srcdir}/exp_integral.tcc \ ${tr1_srcdir}/fenv.h \ ${tr1_srcdir}/float.h \ ${tr1_srcdir}/functional \ - ${tr1_srcdir}/functional_iterate.h \ - ${tr1_srcdir}/hashtable \ + ${tr1_srcdir}/functional_hash.h \ + ${tr1_srcdir}/gamma.tcc \ + ${tr1_srcdir}/hypergeometric.tcc \ + ${tr1_srcdir}/hashtable.h \ ${tr1_srcdir}/inttypes.h \ ${tr1_srcdir}/limits.h \ ${tr1_srcdir}/math.h \ ${tr1_srcdir}/memory \ - ${tr1_srcdir}/mu_iterate.h \ + ${tr1_srcdir}/modified_bessel_func.tcc \ + ${tr1_srcdir}/poly_hermite.tcc \ + ${tr1_srcdir}/poly_laguerre.tcc \ + ${tr1_srcdir}/legendre_function.tcc \ ${tr1_srcdir}/random \ - ${tr1_srcdir}/random.tcc \ - ${tr1_srcdir}/ref_fwd.h \ - ${tr1_srcdir}/ref_wrap_iterate.h \ - ${tr1_srcdir}/repeat.h \ + ${tr1_srcdir}/regex \ + ${tr1_srcdir}/riemann_zeta.tcc \ + ${tr1_srcdir}/special_function_util.h \ ${tr1_srcdir}/stdarg.h \ ${tr1_srcdir}/stdbool.h \ ${tr1_srcdir}/stdint.h \ @@ -608,9 +570,7 @@ tr1_headers = \ ${tr1_srcdir}/stdlib.h \ ${tr1_srcdir}/tgmath.h \ ${tr1_srcdir}/tuple \ - ${tr1_srcdir}/tuple_iterate.h \ ${tr1_srcdir}/type_traits \ - ${tr1_srcdir}/type_traits_fwd.h \ ${tr1_srcdir}/unordered_set \ ${tr1_srcdir}/unordered_map \ ${tr1_srcdir}/utility \ @@ -618,56 +578,90 @@ tr1_headers = \ ${tr1_srcdir}/wctype.h -# This is the common subset of files that all three "C" header models use. +tr1_impl_srcdir = ${glibcxx_srcdir}/include/tr1_impl +tr1_impl_builddir = ./tr1_impl +tr1_impl_headers = \ + ${tr1_impl_srcdir}/array \ + ${tr1_impl_srcdir}/boost_shared_ptr.h \ + ${tr1_impl_srcdir}/boost_sp_counted_base.h \ + ${tr1_impl_srcdir}/cctype \ + ${tr1_impl_srcdir}/cfenv \ + ${tr1_impl_srcdir}/cinttypes \ + ${tr1_impl_srcdir}/cmath \ + ${tr1_impl_srcdir}/complex \ + ${tr1_impl_srcdir}/cstdint \ + ${tr1_impl_srcdir}/cstdio \ + ${tr1_impl_srcdir}/cstdlib \ + ${tr1_impl_srcdir}/cwchar \ + ${tr1_impl_srcdir}/cwctype \ + ${tr1_impl_srcdir}/functional \ + ${tr1_impl_srcdir}/functional_hash.h \ + ${tr1_impl_srcdir}/hashtable \ + ${tr1_impl_srcdir}/hashtable_policy.h \ + ${tr1_impl_srcdir}/random \ + ${tr1_impl_srcdir}/random.tcc \ + ${tr1_impl_srcdir}/regex \ + ${tr1_impl_srcdir}/type_traits \ + ${tr1_impl_srcdir}/unordered_map \ + ${tr1_impl_srcdir}/unordered_set \ + ${tr1_impl_srcdir}/utility + + +# This is the common subset of C++ files that all three "C" header models use. c_base_srcdir = $(C_INCLUDE_DIR) c_base_builddir = . c_base_headers = \ - ${c_base_srcdir}/std_cassert.h \ - ${c_base_srcdir}/std_cctype.h \ - ${c_base_srcdir}/std_cerrno.h \ - ${c_base_srcdir}/std_cfloat.h \ - ${c_base_srcdir}/std_ciso646.h \ - ${c_base_srcdir}/std_climits.h \ - ${c_base_srcdir}/std_clocale.h \ - ${c_base_srcdir}/std_cmath.h \ - ${c_base_srcdir}/std_csetjmp.h \ - ${c_base_srcdir}/std_csignal.h \ - ${c_base_srcdir}/std_cstdarg.h \ - ${c_base_srcdir}/std_cstddef.h \ - ${c_base_srcdir}/std_cstdio.h \ - ${c_base_srcdir}/std_cstdlib.h \ - ${c_base_srcdir}/std_cstring.h \ - ${c_base_srcdir}/std_ctime.h \ - ${c_base_srcdir}/std_cwchar.h \ - ${c_base_srcdir}/std_cwctype.h -c_base_headers_rename = \ - cassert \ - cctype \ - cerrno \ - cfloat \ - ciso646 \ - climits \ - clocale \ - cmath \ - csetjmp \ - csignal \ - cstdarg \ - cstddef \ - cstdio \ - cstdlib \ - cstring \ - ctime \ - cwchar \ - cwctype + ${c_base_srcdir}/cassert \ + ${c_base_srcdir}/ccomplex \ + ${c_base_srcdir}/cctype \ + ${c_base_srcdir}/cerrno \ + ${c_base_srcdir}/cfenv \ + ${c_base_srcdir}/cfloat \ + ${c_base_srcdir}/cinttypes \ + ${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}/cstdatomic \ + ${c_base_srcdir}/cstdbool \ + ${c_base_srcdir}/cstddef \ + ${c_base_srcdir}/cstdint \ + ${c_base_srcdir}/cstdio \ + ${c_base_srcdir}/cstdlib \ + ${c_base_srcdir}/cstring \ + ${c_base_srcdir}/ctgmath \ + ${c_base_srcdir}/ctime \ + ${c_base_srcdir}/cwchar \ + ${c_base_srcdir}/cwctype # "C" compatibility headers. c_compatibility_srcdir = ${glibcxx_srcdir}/include/c_compatibility c_compatibility_builddir = . + +if GLIBCXX_C_HEADERS_C_STD +c_compatibility_headers = +endif + +if GLIBCXX_C_HEADERS_C_GLOBAL +c_compatibility_headers = \ + ${c_compatibility_srcdir}/complex.h \ + ${c_compatibility_srcdir}/fenv.h \ + ${c_compatibility_srcdir}/tgmath.h \ + ${c_compatibility_srcdir}/stdatomic.h +endif + +if GLIBCXX_C_HEADERS_C c_compatibility_headers = \ ${c_compatibility_srcdir}/assert.h \ + ${c_compatibility_srcdir}/complex.h \ ${c_compatibility_srcdir}/ctype.h \ ${c_compatibility_srcdir}/errno.h \ + ${c_compatibility_srcdir}/fenv.h \ ${c_compatibility_srcdir}/float.h \ + ${c_compatibility_srcdir}/inttypes.h \ ${c_compatibility_srcdir}/iso646.h \ ${c_compatibility_srcdir}/limits.h \ ${c_compatibility_srcdir}/locale.h \ @@ -675,13 +669,17 @@ c_compatibility_headers = \ ${c_compatibility_srcdir}/setjmp.h \ ${c_compatibility_srcdir}/signal.h \ ${c_compatibility_srcdir}/stdarg.h \ + ${c_compatibility_srcdir}/stdbool.h \ ${c_compatibility_srcdir}/stddef.h \ + ${c_compatibility_srcdir}/stdint.h \ ${c_compatibility_srcdir}/stdio.h \ ${c_compatibility_srcdir}/stdlib.h \ ${c_compatibility_srcdir}/string.h \ + ${c_compatibility_srcdir}/tgmath.h \ ${c_compatibility_srcdir}/time.h \ ${c_compatibility_srcdir}/wchar.h \ ${c_compatibility_srcdir}/wctype.h +endif # Debug mode headers debug_srcdir = ${glibcxx_srcdir}/include/debug @@ -692,18 +690,13 @@ debug_headers = \ ${debug_srcdir}/deque \ ${debug_srcdir}/formatter.h \ ${debug_srcdir}/functions.h \ - ${debug_srcdir}/hash_map \ - ${debug_srcdir}/hash_map.h \ - ${debug_srcdir}/hash_multimap.h \ - ${debug_srcdir}/hash_multiset.h \ - ${debug_srcdir}/hash_set \ - ${debug_srcdir}/hash_set.h \ ${debug_srcdir}/list \ ${debug_srcdir}/map \ ${debug_srcdir}/macros.h \ ${debug_srcdir}/map.h \ ${debug_srcdir}/multimap.h \ ${debug_srcdir}/multiset.h \ + ${debug_srcdir}/safe_association.h \ ${debug_srcdir}/safe_base.h \ ${debug_srcdir}/safe_iterator.h \ ${debug_srcdir}/safe_iterator.tcc \ @@ -711,12 +704,67 @@ debug_headers = \ ${debug_srcdir}/set \ ${debug_srcdir}/set.h \ ${debug_srcdir}/string \ + ${debug_srcdir}/unordered_map \ + ${debug_srcdir}/unordered_set \ ${debug_srcdir}/vector +# Parallel mode headers +parallel_srcdir = ${glibcxx_srcdir}/include/parallel +parallel_builddir = ./parallel +if ENABLE_PARALLEL +parallel_headers = \ + ${parallel_srcdir}/algo.h \ + ${parallel_srcdir}/algobase.h \ + ${parallel_srcdir}/algorithm \ + ${parallel_srcdir}/algorithmfwd.h \ + ${parallel_srcdir}/balanced_quicksort.h \ + ${parallel_srcdir}/base.h \ + ${parallel_srcdir}/basic_iterator.h \ + ${parallel_srcdir}/checkers.h \ + ${parallel_srcdir}/compatibility.h \ + ${parallel_srcdir}/compiletime_settings.h \ + ${parallel_srcdir}/equally_split.h \ + ${parallel_srcdir}/features.h \ + ${parallel_srcdir}/find.h \ + ${parallel_srcdir}/find_selectors.h \ + ${parallel_srcdir}/for_each.h \ + ${parallel_srcdir}/for_each_selectors.h \ + ${parallel_srcdir}/iterator.h \ + ${parallel_srcdir}/list_partition.h \ + ${parallel_srcdir}/losertree.h \ + ${parallel_srcdir}/merge.h \ + ${parallel_srcdir}/multiseq_selection.h \ + ${parallel_srcdir}/multiway_merge.h \ + ${parallel_srcdir}/multiway_mergesort.h \ + ${parallel_srcdir}/numeric \ + ${parallel_srcdir}/numericfwd.h \ + ${parallel_srcdir}/omp_loop.h \ + ${parallel_srcdir}/omp_loop_static.h \ + ${parallel_srcdir}/par_loop.h \ + ${parallel_srcdir}/parallel.h \ + ${parallel_srcdir}/partial_sum.h \ + ${parallel_srcdir}/partition.h \ + ${parallel_srcdir}/queue.h \ + ${parallel_srcdir}/quicksort.h \ + ${parallel_srcdir}/random_number.h \ + ${parallel_srcdir}/random_shuffle.h \ + ${parallel_srcdir}/search.h \ + ${parallel_srcdir}/set_operations.h \ + ${parallel_srcdir}/settings.h \ + ${parallel_srcdir}/sort.h \ + ${parallel_srcdir}/tags.h \ + ${parallel_srcdir}/types.h \ + ${parallel_srcdir}/unique_copy.h \ + ${parallel_srcdir}/workstealing.h +else +parallel_headers = +endif + + # Some of the different "C" header models need extra files. # Some "C" header schemes require the "C" compatibility headers. # For --enable-cheaders=c_std -if GLIBCXX_C_HEADERS_C_STD +if GLIBCXX_C_HEADERS_EXTRA c_base_headers_extra = ${c_base_srcdir}/cmath.tcc else c_base_headers_extra = @@ -738,7 +786,11 @@ host_headers = \ ${host_srcdir}/os_defines.h \ ${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ - ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h + ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h \ + ${glibcxx_srcdir}/$(ERROR_CONSTANTS_SRCDIR)/error_constants.h \ + ${glibcxx_srcdir}/include/precompiled/stdc++.h \ + ${glibcxx_srcdir}/include/precompiled/stdtr1c++.h \ + ${glibcxx_srcdir}/include/precompiled/extc++.h # Non-installed host_header files. COMPATIBILITY_H = config/abi/compatibility.h @@ -754,7 +806,7 @@ host_headers_extra = \ ${host_builddir}/c++io.h \ ${host_builddir}/c++locale.h \ ${host_builddir}/messages_members.h \ - ${host_builddir}/time_members.h + ${host_builddir}/time_members.h thread_host_headers = \ ${host_builddir}/gthr.h \ @@ -763,24 +815,46 @@ thread_host_headers = \ ${host_builddir}/gthr-tpf.h \ ${host_builddir}/gthr-default.h -pch_input = ${host_builddir}/stdc++.h -pch_output_builddir = ${host_builddir}/stdc++.h.gch -pch_output_installdir = ${host_installdir}/stdc++.h.gch -pch_source = ${glibcxx_srcdir}/include/stdc++.h -PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS) + +pch1_source = ${glibcxx_srcdir}/include/precompiled/stdc++.h +pch1_output_builddir = ${host_builddir}/stdc++.h.gch +pch1_output_anchor = ${host_builddir}/stdc++.h +pch1_output_installdir = ${host_installdir}/stdc++.h.gch +pch1a_output = ${pch1_output_builddir}/O0g.gch +pch1b_output = ${pch1_output_builddir}/O2g.gch +pch1_output = ${pch1a_output} ${pch1b_output} + +pch2_source = ${glibcxx_srcdir}/include/precompiled/stdtr1c++.h +pch2_output_builddir = ${host_builddir}/stdtr1c++.h.gch +pch2_output_anchor = ${host_builddir}/stdtr1c++.h +pch2_output_installdir = ${host_installdir}/stdtr1c++.h.gch +pch2_output = ${pch2_output_builddir}/O2g.gch + +pch3_source = ${glibcxx_srcdir}/include/precompiled/extc++.h +pch3_output_builddir = ${host_builddir}/extc++.h.gch +pch3_output_anchor = ${host_builddir}/extc++.h +pch3_output_installdir = ${host_installdir}/extc++.h.gch +pch3_output = ${pch3_output_builddir}/O2g.gch + + +pch_output = ${pch1_output} ${pch2_output} ${pch3_output} +pch_output_dirs = \ + ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir} +pch_output_anchors = \ + ${pch1_output_anchor} ${pch2_output_anchor} ${pch3_output_anchor} +PCHFLAGS=-Winvalid-pch -x c++-header $(CXXFLAGS) if GLIBCXX_BUILD_PCH -pch_build = ${pch_input} -pch_install = install-pch +pch_build = ${pch_output} else pch_build = -pch_install = endif # List of all timestamp files. By keeping only one copy of this list, both # CLEANFILES and all-local are kept up-to-date. allstamped = \ - stamp-std stamp-bits stamp-c_base stamp-c_compatibility \ - stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-debug stamp-host + stamp-std stamp-bits stamp-c_base stamp-c_base_extra \ + stamp-c_compatibility stamp-backward stamp-ext stamp-pb \ + stamp-tr1 stamp-tr1-impl stamp-debug stamp-parallel stamp-host # List of all files that are created by explicit building, editing, or # catenation. @@ -792,72 +866,46 @@ allcreated = \ # Here are the rules for building the headers all-local: ${allstamped} ${allcreated} -# This rule is slightly different, in that we must change the name of the -# local file from std_foo.h to foo. +# Ignore errors from 'mkdir -p' to avoid parallel make failure on +# systems with broken mkdir. Call mkdir unconditionally because +# it is just as cheap to avoid going through the shell. +# Ignore errors from $(LN_S) because the links may already exist. stamp-std: ${std_headers} - @if [ ! -d "${std_builddir}" ]; then \ - mkdir -p ${std_builddir} ;\ - fi ;\ - if [ ! -f stamp-std ]; then \ - (cd ${std_builddir} && for h in $?; do \ - build_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\ - $(LN_S) $$h ./$${build_name} || true ;\ - done) ;\ - fi ;\ - $(STAMP) stamp-std + @-mkdir -p ${std_builddir} + @-cd ${std_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-std stamp-bits: ${bits_headers} - @if [ ! -d "${bits_builddir}" ]; then \ - mkdir -p ${bits_builddir} ;\ - fi ;\ - if [ ! -f stamp-bits ]; then \ - (cd ${bits_builddir} && $(LN_S) $? . || true) ;\ - fi ;\ - $(STAMP) stamp-bits - -stamp-c_base: stamp-bits ${c_base_headers} ${c_base_headers_extra} - @if [ ! -d "${c_base_builddir}" ]; then \ - mkdir -p ${c_base_builddir} ;\ - fi ;\ - if [ ! -f stamp-c_base ]; then \ - (cd ${c_base_builddir} && for h in ${c_base_headers}; do \ - build_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\ - $(LN_S) $$h ./$${build_name} || true ;\ - done) ;\ - if [ ! -z "${c_base_headers_extra}" ]; then \ - (cd ${bits_builddir} && $(LN_S) ${c_base_headers_extra} . || true) ;\ - fi ;\ - fi ;\ - $(STAMP) stamp-c_base + @-mkdir -p ${bits_builddir} + @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-bits + +stamp-c_base: ${c_base_headers} + @-mkdir -p ${c_base_builddir} + @-cd ${c_base_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-c_base + +stamp-c_base_extra: ${c_base_headers_extra} + @-mkdir -p ${bits_builddir} + @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-c_base_extra stamp-c_compatibility: ${c_compatibility_headers_extra} - @if [ ! -d "${c_compatibility_builddir}" ]; then \ - mkdir -p ${c_compatibility_builddir} ;\ - fi ;\ - if [ ! -f stamp-c_compatibility ]; then \ - if [ ! -z "${c_compatibility_headers_extra}" ]; then \ - (cd ${c_compatibility_builddir} && $(LN_S) $? . || true) ;\ - fi ;\ - fi ;\ - $(STAMP) stamp-c_compatibility + @-mkdir -p ${c_compatibility_builddir} + @-if [ ! -z "${c_compatibility_headers_extra}" ]; then \ + cd ${c_compatibility_builddir} && $(LN_S) $? . 2>/dev/null ;\ + fi + @$(STAMP) stamp-c_compatibility stamp-backward: ${backward_headers} - @if [ ! -d "${backward_builddir}" ]; then \ - mkdir -p ${backward_builddir} ;\ - fi ;\ - if [ ! -f stamp-backward ]; then \ - (cd ${backward_builddir} && $(LN_S) $? . || true) ;\ - fi ;\ - $(STAMP) stamp-backward + @-mkdir -p ${backward_builddir} + @-cd ${backward_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-backward stamp-ext: ${ext_headers} - @if [ ! -d "${ext_builddir}" ]; then \ - mkdir -p ${ext_builddir} ;\ - fi ;\ - if [ ! -f stamp-ext ]; then \ - (cd ${ext_builddir} && $(LN_S) $? . || true) ;\ - fi ;\ - $(STAMP) stamp-ext + @-mkdir -p ${ext_builddir} + @-cd ${ext_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-ext # Have to deal with nested include directories, gah! Strip off source # directory before making the link. @@ -865,7 +913,7 @@ stamp-ext: ${ext_headers} stamp-pb: @if [ ! -d "${pb_builddir}" ]; then \ mkdir -p ${pb_subdirs} ;\ - fi + fi @if [ ! -f stamp-pb ]; then \ cd ${pb_builddir} && for h in ${pb_headers1}; do \ build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\ @@ -911,34 +959,33 @@ stamp-pb: $(STAMP) stamp-pb stamp-tr1: ${tr1_headers} - @if [ ! -d "${tr1_builddir}" ]; then \ - mkdir -p ${tr1_builddir} ;\ - fi ;\ - if [ ! -f stamp-tr1 ]; then \ - (cd ${tr1_builddir} && $(LN_S) $? . || true) ;\ - fi ;\ - $(STAMP) stamp-tr1 + @-mkdir -p ${tr1_builddir} + @-cd ${tr1_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-tr1 + +stamp-tr1-impl: ${tr1_impl_headers} + @-mkdir -p ${tr1_impl_builddir} + @-cd ${tr1_impl_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-tr1-impl stamp-debug: ${debug_headers} - @if [ ! -d "${debug_builddir}" ]; then \ - mkdir -p ${debug_builddir} ;\ - fi ;\ - if [ ! -f stamp-debug ]; then \ - (cd ${debug_builddir} && @LN_S@ $? . || true) ;\ - fi ;\ - $(STAMP) stamp-debug + @-mkdir -p ${debug_builddir} + @-cd ${debug_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-debug + +stamp-parallel: ${parallel_headers} + @-mkdir -p ${parallel_builddir} + @-cd ${parallel_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-parallel stamp-${host_alias}: - @if [ ! -d ${host_builddir} ]; then \ - mkdir -p ${host_builddir} ;\ - fi ;\ - $(STAMP) stamp-${host_alias} + @-mkdir -p ${host_builddir} + @$(STAMP) stamp-${host_alias} # Host includes static. # XXX Missing dependency info for {host_headers_extra} stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} - @if [ ! -f stamp-host ]; then \ - (cd ${host_builddir} ;\ + @cd ${host_builddir} && {\ $(LN_S) ${host_headers} . || true ;\ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\ @@ -947,9 +994,8 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\ $(LN_S) ${glibcxx_srcdir}/$(COMPATIBILITY_H) . || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\ - $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\ - $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\ - fi ;\ + $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\ + } 2>/dev/null $(STAMP) stamp-host # Host includes dynamic. @@ -960,29 +1006,44 @@ else stamp-namespace-version: echo 0 > stamp-namespace-version endif + +if ENABLE_VISIBILITY +stamp-visibility: + echo 1 > stamp-visibility +else +stamp-visibility: + echo 0 > stamp-visibility +endif + +# NB: The non-empty default ldbl_compat works around an AIX sed +# oddity, see libstdc++/31957 for details. ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ${glibcxx_srcdir}/include/bits/c++config \ stamp-${host_alias} \ ${toplevel_srcdir}/gcc/DATESTAMP \ - stamp-namespace-version + stamp-namespace-version \ + stamp-visibility @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ nsa_version=`cat stamp-namespace-version` ;\ - ldbl_compat='' ;\ + visibility=`cat stamp-visibility` ;\ + ldbl_compat='s,g,g,' ;\ grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ ${CONFIG_HEADER} > /dev/null 2>&1 \ && ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \ -e "s,define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION, define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION $$nsa_version," \ + -e "s,define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \ -e "$$ldbl_compat" \ < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ + -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ < ${CONFIG_HEADER} >> $@ ;\ echo "" >> $@ ;\ - echo "#endif // _CXXCONFIG_" >> $@ + echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ # Host includes for threads uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] @@ -1025,14 +1086,24 @@ ${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \ -e 's,^#include "\(.*\)",#include ,g' \ < ${toplevel_srcdir}/gcc/${glibcxx_thread_h} > $@ -# Build a precompiled C++ include, stdc++.h.gch. -${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source} - touch ${pch_input}; \ - if [ ! -d "${pch_output_builddir}" ]; then \ - mkdir -p ${pch_output_builddir}; \ - fi; \ - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \ - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch; +# Build two precompiled C++ includes, stdc++.h.gch/*.gch +${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} + -mkdir -p ${pch1_output_builddir} + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O0 -g ${pch1_source} -o $@ + +${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} + -mkdir -p ${pch1_output_builddir} + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@ + +# Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch +${pch2_output}: ${pch2_source} ${pch1_output} + -mkdir -p ${pch2_output_builddir} + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@ + +# Build a precompiled extension include, extc++.h.gch/O2.gch +${pch3_output}: ${pch3_source} ${pch2_output} + -mkdir -p ${pch3_output_builddir} + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@ # For robustness sake (in light of junk files or in-source # configuration), copy from the build or source tree to the install @@ -1044,7 +1115,7 @@ ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source} # the rest are taken from the original source tree. if GLIBCXX_HOSTED -install-data-local: install-headers ${pch_install} +install-data-local: install-headers else install-data-local: install-freestanding-headers endif @@ -1111,9 +1182,12 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${tr1_builddir} for file in ${tr1_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${tr1_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${tr1_impl_builddir} + for file in ${tr1_impl_headers}; do \ + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${tr1_impl_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} - for file in ${c_base_headers_rename}; do \ - $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done + for file in ${c_base_headers}; do \ + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install='$(c_base_headers_extra)';\ for file in $$c_base_headers_extra_install; do \ $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done @@ -1121,29 +1195,37 @@ install-headers: for file in $$c_compatibility_headers_install; do \ $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} - for file in ${std_headers_rename}; do \ - $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done + for file in ${std_headers}; do \ + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${debug_builddir} for file in ${debug_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${debug_builddir}; done + parallel_headers_install='${parallel_headers}';\ + test -z "$$parallel_headers_install" || \ + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${parallel_builddir};\ + for file in $$parallel_headers_install; do \ + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${parallel_builddir}; done $(mkinstalldirs) $(DESTDIR)${host_installdir} for file in ${host_headers} ${host_headers_extra} \ ${thread_host_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done -install-pch: - $(mkinstalldirs) $(DESTDIR)${pch_output_installdir} - for file in ${pch_output_builddir}/*; do \ - $(INSTALL_DATA) $$file $(DESTDIR)${pch_output_installdir}; done - # By adding these files here, automake will remove them for 'make clean' -CLEANFILES = ${pch_input} ${pch_output_builddir}/* +CLEANFILES = ${pch_output} ${pch_output_anchors} + +# To remove directories. +clean-local: + rm -rf ${pch_output_dirs} # Stop implicit '.o' make rules from ever stomping on extensionless # headers, in the improbable case where some foolish, crack-addled # developer tries to create them via make in the include build # directory. (This is more of an example of how this kind of rule can # be made.) -.PRECIOUS: $(std_headers_rename) $(c_base_headers_rename) -$(std_headers_rename): ; @: -$(c_base_headers_rename): ; @: +.PRECIOUS: $(std_headers) $(c_base_headers) $(tr1_headers) $(tr1_impl_headers) + $(ext_headers) +$(std_headers): ; @: +$(c_base_headers): ; @: +$(tr1_headers): ; @: +$(tr1_impl_headers): ; @: +$(ext_headers): ; @: