a345e45d14
2011-05-23 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/37144 PR libstdc++/28457 Interface changes for ext/pb_ds. PB_DS_BASE_C_DEC to unique PB_DS_*_BASE macros. * include/ext/pb_ds/assoc_container.hpp (container_base): Remove. (basic_hash_table, basic_branch, list_update): Derive from container_base_dispatch. * include/ext/pb_ds/list_update_policy.hpp (null_lu_metadata): Remove. (move_to_front_lu_policy): To lu_move_to_front_policy. (counter_lu_policy): To lu_counter_policy. * include/ext/pb_ds/tree_policy.hpp (null_tree_node_update): Remove. * include/ext/pb_ds/tag_and_trait.hpp (container_base_dispatch): Adjust template parameters, declare here. (null_mapped_type) Remove. (null_type): Just use this for template tricks everywhere. * include/ext/pb_ds/hash_policy.hpp (null_hash_fn, null_probe_fn): Remove. * include/ext/pb_ds/trie_policy.hpp (null_trie_node_update): Remove. (string_trie_e_access_traits): To trie_string_access_traits. * include/ext/pb_ds/priority_queue.hpp: Use container_base_dispatch. File changes. * include/Makefile.am (pb_headers): Removed and changed file names. * include/Makefile.in: Regenerated. * include/ext/pb_ds/detail/basic_types.hpp: Remove. * include/ext/pb_ds/detail/bin_search_tree_/ cond_dtor_entry_dealtor.hpp: Remove. * include/ext/pb_ds/detail/bin_search_tree_/ cond_key_dtor_entry_dealtor.hpp: Remove. * include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp: Move.. * include/ext/pb_ds/detail/binary_heap_/ point_const_iterator.hpp: ..here. * include/ext/pb_ds/detail/basic_tree_policy: Move to... * include/ext/pb_ds/detail/branch_policy: This. * include/ext/pb_ds/detail/branch_policy/ basic_tree_policy_base.hpp: Move... * include/ext/pb_ds/detail/branch_policy/branch_policy.hpp: ...here. * include/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp: Add. * include/ext/pb_ds/detail/branch_policy/traits.hpp: Add. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ null_metadata.hpp: Remove. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_point_iterator.hpp: Move... * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ point_const_iterator.hpp: ...here. * include/ext/pb_ds/detail/list_update_policy/ counter_lu_metadata.hpp: Move.. * include/ext/pb_ds/detail/list_update_policy/ lu_counter_metadata.hpp: ...here. * include/ext/pb_ds/detail/list_update_policy/ counter_lu_policy_imp.hpp: Remove. * include/ext/pb_ds/detail/list_update_policy/ mtf_lu_policy_imp.hpp: Remove. * include/ext/pb_ds/detail/trie_policy/ string_trie_e_access_traits_imp.hpp: Move... * include/ext/pb_ds/detail/trie_policy/ sample_trie_access_traits.hpp: ...here. * include/ext/pb_ds/detail/trie_policy/ sample_trie_e_access_traits.hpp: Move... * include/ext/pb_ds/detail/trie_policy/ trie_string_access_traits_imp.hpp: ...here. * include/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp: Remove. * include/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp: Remove. * include/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp: Remove. * include/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp: New, fold all types found in the following files into pat_trie_base. * include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/ cond_dtor_entry_dealtor.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/head.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/leaf.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/node_base.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp: Move... * include/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp: ...here. * include/ext/pb_ds/detail/unordered_iterator/ const_point_iterator.hpp: Move... * include/ext/pb_ds/detail/unordered_iterator/ point_const_iterator.hpp: ...here. Adjust for above changes. * include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp: Same. * include/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp: Same. * include/ext/pb_ds/detail/resize_policy/ sample_resize_trigger.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/ binomial_heap_base_.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/ split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/container_base_dispatch.hpp: Same. Adjust for template parameter ordering change. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ insert_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ resize_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ insert_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ entry_list_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ find_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ debug_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ cond_key_dtor_entry_dealtor.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ debug_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ resize_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ standard_policies.hpp: Same. * include/ext/pb_ds/detail/tree_trace_base.hpp: Same. * include/ext/pb_ds/detail/unordered_iterator/iterator.hpp: Same. * include/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp: Same. * include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/traits.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/traits.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/ split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_policy/ sample_update_policy.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ erase_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ constructor_destructor_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ insert_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ resize_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ constructor_destructor_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ insert_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ iterator_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ find_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ find_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ debug_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ constructor_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ debug_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ erase_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ resize_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ standard_policies.hpp: Same. * include/ext/pb_ds/detail/standard_policies.hpp: Same. * include/ext/pb_ds/detail/types_traits.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/entry_pred.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/resize_policy.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp: Same. * include/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp: Same. * include/ext/pb_ds/detail/tree_policy/ sample_tree_node_update.hpp: Same. * include/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp: Same. * include/ext/pb_ds/detail/trie_policy/ sample_trie_node_update.hpp: Same. * include/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp: Same. * include/ext/pb_ds/detail/trie_policy/ prefix_search_node_update_imp.hpp: Same. * include/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp: Same. * include/ext/pb_ds/detail/cond_dealtor.hpp: Same. * include/ext/pb_ds/detail/priority_queue_base_dispatch.hpp: Same. Adjust for template parameter change, fold into container_base_dispatch. * include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp: Same. * include/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/type_utils.hpp: Same. * include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp: Same. * include/ext/pb_ds/detail/eq_fn/eq_by_less.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ left_child_next_sibling_heap_.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_iterator.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ node.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/traits.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/debug_map_base.hpp: Same. * include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp: Same. * include/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp: Same. * include/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/node.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/traits.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/ entry_metadata_base.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/ constructor_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/ rc_binomial_heap_.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/ split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/node.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/traits.hpp: Same. Documentation changes. * include/ext/pb_ds/*: Add doxygen markup. * doc/doxygen/user.cfg.in: Add details for extracting comments from pb_ds. * scripts/run_doxygen: Fixup __gnu_pb_ds::detail. * scripts/make_graph.py: Move to svg output. Re-format generated tables. * doc/Makefile.am (stamp-html-copy): New rule. (stamp-html): Use it to copy non-generated files into html docs. * doc/Makefile.in: Regenerated. * doc/html/ext/pb_ds/sample_trie_e_access_traits.html: Move... * doc/html/ext/pb_ds/trie_string_access_traits.html: ...here. * doc/html/ext/pb_ds/string_trie_e_access_traits.html: Move.. * doc/html/ext/pb_ds/sample_trie_access_traits.html: ...here. * doc/html/ext/pb_ds/tree_text_lor_find_timing_test_local.png, hash_random_int_erase_mem_usage_test_local.png, multimap_text_insert_mem_usage_test_small_s2p_hash_local.png, tree_text_insert_timing_test_pat_trie_local.png , multimap_text_insert_mem_usage_test_small_s2p_tree_local.png , priority_queue_text_modify_down_timing_test_local.png, gp_hash_random_int_subscript_timing_test_find_local.png, text_find_timing_test_hash_local.png, multimap_text_insert_timing_test_small_s2p_hash_local.png, multimap_text_insert_timing_test_small_s2p_tree_local.png, multimap_text_insert_mem_usage_test_large_s2p_hash_local.png, multimap_text_insert_mem_usage_test_large_s2p_tree_local.png, multimap_text_insert_timing_test_large_s2p_hash_local.png, hash_zlob_random_int_find_timing_test_local.png, multimap_text_insert_timing_test_large_s2p_tree_local.png, binary_priority_queue_random_int_push_timing_test_local.png, priority_queue_text_pop_mem_usage_test_local.png, priority_queue_text_modify_down_timing_test_pairing_thin_local.png, tree_split_join_timing_test_local.png, multimap_text_find_timing_test_small_s2p_hash_local.png, ccgp_hash_random_int_subscript_timing_test_insert_local.png, priority_queue_random_int_push_pop_timing_test_local.png, multimap_text_find_timing_test_small_s2p_tree_local.png, gp_hash_random_int_subscript_timing_test_insert_local.png, priority_queue_text_push_timing_test_local.png, cc_hash_random_int_subscript_timing_test_find_local.png, tree_text_insert_timing_test_vector_tree_local.png, multimap_text_find_timing_test_large_s2p_hash_local.png, pairing_priority_queue_text_push_timing_test_local.png, tree_order_statistics_timing_test_local.png, priority_queue_text_push_pop_timing_test_local.png, text_find_timing_test_tree_like_local.png, multimap_text_find_timing_test_large_s2p_tree_local.png, priority_queue_text_modify_up_timing_test_pairing_thin_local.png, cc_hash_random_int_subscript_timing_test_insert_local.png, priority_queue_text_modify_up_timing_test_local.png, random_int_find_find_timing_test_tree_local.png, priority_queue_random_int_push_timing_test_local.png, tree_text_insert_timing_test_node_tree_local.png, pairing_priority_queue_text_push_pop_timing_test_local.png, gp_hash_random_int_find_timing_test_local.png, cc_hash_random_int_find_timing_test_local.png, priority_queue_text_join_timing_test_local.png: Update local pngs. Testsuite changes. * testsuite/ext/pb_ds/regression/tree_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/tree_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/priority_queue_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/trie_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/trie_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/list_update_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/list_update_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/hash_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/hash_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Fix typo. * testsuite/ext/pb_ds/example/basic_set.cc: Update. * testsuite/ext/pb_ds/example/ranged_hash.cc: Same. * testsuite/ext/pb_ds/example/tree_order_statistics.cc: Same. * testsuite/ext/pb_ds/example/trie_prefix_search.cc: Same. * testsuite/ext/pb_ds/example/trie_dna.cc: Same. * testsuite/ext/pb_ds/example/tree_intervals.cc: Same. * testsuite/ext/pb_ds/example/basic_multimap.cc: Same. * testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc: Same. * testsuite/performance/ext/pb_ds/tree_split_join_timing.cc: Same. * testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc: Same. * testsuite/data/make_graph_test_infos.xml: Same. * testsuite/util/regression/common_type.hpp: Same. * testsuite/util/regression/trait/assoc/native_type_trait.hpp: Same. * testsuite/util/regression/trait/assoc/trait.hpp: Same. * testsuite/util/regression/trait/assoc/type_trait.hpp: Same. * testsuite/util/regression/rand/priority_queue/ rand_regression_test.hpp: Same. * testsuite/util/regression/rand/priority_queue/ container_rand_regression_test.tcc: Same. * testsuite/util/regression/rand/assoc/rand_regression_test.hpp: Same. * testsuite/util/regression/rand/assoc/container_rand_regression_test.h * testsuite/util/regression/rand/assoc/ container_rand_regression_test.tcc: Same. * testsuite/util/native_type/native_priority_queue.hpp: Same. * testsuite/util/native_type/native_multimap.hpp: Same. * testsuite/util/native_type/native_hash_multimap.hpp: Same. * testsuite/util/native_type/native_set.hpp: Same. * testsuite/util/native_type/native_map.hpp: Same. * testsuite/util/native_type/native_hash_set.hpp: Same. * testsuite/util/native_type/native_hash_map.hpp: Same. * testsuite/util/testsuite_containers.h * testsuite/util/common_type/priority_queue/common_type.hpp: Same. * testsuite/util/common_type/assoc/common_type.hpp: Same. * testsuite/util/common_type/assoc/string_form.hpp: Same. * testsuite/util/common_type/assoc/template_policy.hpp: Same. * testsuite/util/common_type/assoc/detail/ trigger_policy_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ds_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ size_policy_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ probe_fn_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ tree_supports_order_statistics.hpp: Same. * testsuite/util/common_type/assoc/detail/ trie_supports_prefix_search.hpp: Same. * testsuite/util/common_type/assoc/detail/ list_update_policy_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ trie_supports_order_statistics.hpp: Same. * testsuite/util/common_type/assoc/native_set.hpp: Same. * testsuite/util/performance/assoc/timing/common_type.hpp: Same. * testsuite/util/performance/assoc/timing/multimap_find_test.hpp: Same. * testsuite/util/performance/assoc/multimap_common_type.hpp: Same. From-SVN: r174100
526 lines
15 KiB
Makefile
526 lines
15 KiB
Makefile
## Makefile for the doc subdirectory of the GNU C++ Standard library.
|
|
##
|
|
## Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
|
##
|
|
## This file is part of the libstdc++ version 3 distribution.
|
|
## Process this file with automake to produce Makefile.in.
|
|
|
|
## This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option)
|
|
## any later version.
|
|
|
|
## This library 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 library; see the file COPYING3. If not see
|
|
## <http://www.gnu.org/licenses/>.
|
|
|
|
include $(top_srcdir)/fragment.am
|
|
|
|
# Documentation Overview
|
|
#
|
|
# There are two main input materials for libstdc++ documentation.
|
|
# The first is the doxygen markup in libstdc++ sources, which is a
|
|
# reference to the API. And the second is the manual, via docbook markup in
|
|
# doc/xml/.
|
|
#
|
|
# A third and more obscure option deals with charting performance
|
|
# tests, and should be considered experimental.
|
|
|
|
# Documentation conditionals for output.
|
|
if BUILD_XML
|
|
STAMP_XML = doc-xml
|
|
STAMP_INSTALL_XML = doc-install-xml
|
|
else
|
|
STAMP_XML =
|
|
STAMP_INSTALL_XML =
|
|
endif
|
|
|
|
if BUILD_HTML
|
|
STAMP_HTML = doc-html
|
|
STAMP_INSTALL_HTML = doc-install-html
|
|
else
|
|
STAMP_HTML =
|
|
STAMP_INSTALL_HTML =
|
|
endif
|
|
|
|
if BUILD_MAN
|
|
STAMP_MAN = doc-man
|
|
STAMP_INSTALL_MAN = doc-install-man
|
|
else
|
|
STAMP_MAN =
|
|
STAMP_INSTALL_MAN =
|
|
endif
|
|
|
|
if BUILD_PDF
|
|
STAMP_PDF = doc-pdf
|
|
STAMP_INSTALL_PDF = doc-install-pdf
|
|
else
|
|
STAMP_PDF =
|
|
STAMP_INSTALL_PDF =
|
|
endif
|
|
|
|
if BUILD_EPUB
|
|
STAMP_EPUB = doc-epub
|
|
STAMP_INSTALL_EPUB = doc-install-epub
|
|
else
|
|
STAMP_EPUB = doc-epub
|
|
STAMP_INSTALL_EPUB = doc-install-epub
|
|
endif
|
|
|
|
# Documentation primary rules.
|
|
#
|
|
# xml:
|
|
# html:
|
|
# pdf:
|
|
# man:
|
|
# info:
|
|
# ps:
|
|
# dvi:
|
|
# epub:
|
|
# install-xml:
|
|
# install-html:
|
|
# install-pdf:
|
|
# install-man:
|
|
# install-info:
|
|
# install-ps:
|
|
# install-dvi:
|
|
# install-epub:
|
|
|
|
xml: $(STAMP_XML)
|
|
install-xml: $(STAMP_INSTALL_XML)
|
|
|
|
html: $(STAMP_HTML)
|
|
install-html: $(STAMP_INSTALL_HTML)
|
|
|
|
man: $(STAMP_MAN)
|
|
install-man: $(STAMP_INSTALL_MAN)
|
|
|
|
pdf: $(STAMP_PDF)
|
|
install-pdf: $(STAMP_INSTALL_PDF)
|
|
|
|
epub: $(STAMP_EPUB)
|
|
install-epub: $(STAMP_INSTALL_EPUB)
|
|
|
|
info:
|
|
install-info:
|
|
|
|
ps:
|
|
install-ps:
|
|
|
|
dvi:
|
|
install-dvi:
|
|
|
|
|
|
# Default creation and installation rules.
|
|
# Point to best sub-rule for the requested documentation target and
|
|
# create, and then install toplevel directory with standardized names
|
|
# and layouts.
|
|
|
|
# XML
|
|
xmldir="$(DESTDIR)@docdir@"
|
|
stamp-xml: stamp-xml-single-docbook stamp-xml-single-doxygen
|
|
$(STAMP) stamp-xml
|
|
|
|
doc-xml: stamp-xml
|
|
|
|
doc-install-xml: doc-xml
|
|
test -z ${xmldir} || $(mkinstalldirs) ${xmldir}
|
|
$(INSTALL_DATA) ${manual_xml} ${xmldir}
|
|
$(INSTALL_DATA) ${api_xml} ${xmldir}
|
|
|
|
# HTML
|
|
htmldir="$(DESTDIR)@docdir@"
|
|
stamp-html: stamp-html-copy stamp-html-doxygen
|
|
$(STAMP) stamp-html
|
|
|
|
copydir=${docbook_outdir}/html/manual/ext/
|
|
stamp-html-copy: stamp-html-docbook
|
|
cp -r ${top_srcdir}/doc/html/ext ${docbook_outdir}/html/manual/ext
|
|
cd ${docbook_outdir}/html/manual/ext
|
|
rm -rf ${docbook_outdir}/html/manual/ext/.svn
|
|
rm -rf ${docbook_outdir}/html/manual/ext/pb_ds/.svn
|
|
$(STAMP) stamp-html-copy
|
|
|
|
doc-html: stamp-html
|
|
|
|
doc-install-html: doc-html
|
|
test -z ${htmldir} || $(mkinstalldirs) ${htmldir}
|
|
cp -r ${docbook_outdir}/html ${htmldir}/libstdc++-manual.html;
|
|
cp -r ${doxygen_outdir}/html ${htmldir}/libstdc++-api.html;
|
|
|
|
# PDF
|
|
pdfdir="$(DESTDIR)@docdir@"
|
|
stamp-pdf: stamp-pdf-docbook stamp-pdf-doxygen
|
|
$(STAMP) stamp-pdf
|
|
|
|
doc-pdf: stamp-pdf
|
|
|
|
doc-install-pdf: doc-pdf
|
|
test -z ${pdfdir} || $(mkinstalldirs) ${pdfdir}
|
|
$(INSTALL_DATA) ${docbook_outdir}/pdf/libstdc++-manual.pdf ${pdfdir}
|
|
$(INSTALL_DATA) ${doxygen_outdir}/pdf/libstdc++-api.pdf ${pdfdir}
|
|
|
|
# MAN
|
|
mandir="$(DESTDIR)@mandir@"
|
|
stamp-man: stamp-man-doxygen
|
|
$(STAMP) stamp-man
|
|
|
|
doc-man: stamp-man
|
|
|
|
doc-install-man: doc-man
|
|
test -z ${mandir} || $(mkinstalldirs) ${mandir}
|
|
cp -r ${doxygen_outdir}/man/man3 ${mandir}
|
|
|
|
# TEXINFO,INFO
|
|
infodir="$(DESTDIR)@infodir@"
|
|
stamp-texinfo: stamp-texinfo-docbook
|
|
$(STAMP) stamp-texinfo
|
|
|
|
stamp-info: stamp-info-docbook
|
|
$(STAMP) stamp-info
|
|
|
|
doc-texinfo: stamp-texinfo
|
|
|
|
doc-info: stamp-info
|
|
|
|
doc-install-texinfo: doc-texinfo
|
|
test -z ${infodir} || $(mkinstalldirs) ${infodir}
|
|
$(INSTALL_DATA) ${manual_texi} ${infodir}
|
|
|
|
doc-install-info: doc-info
|
|
test -z ${infodir} || $(mkinstalldirs) ${infodir}
|
|
$(INSTALL_DATA) ${manual_info} ${infodir}
|
|
|
|
# EPUB
|
|
# Assumes ruby installed
|
|
epubdir="$(DESTDIR)@docdir@"
|
|
stamp-epub: stamp-epub-docbook
|
|
$(STAMP) stamp-epub
|
|
|
|
doc-epub: stamp-epub
|
|
|
|
doc-install-epub: doc-epub
|
|
test -z ${epubdir} || $(mkinstalldirs) ${epubdir}
|
|
$(INSTALL_DATA) ${manual_epub} ${epubdir}
|
|
|
|
|
|
# Doxygen configuration
|
|
# Assumes doxygen, graphviz (with dot), pdflatex installed
|
|
doxygen_script=${top_srcdir}/scripts/run_doxygen
|
|
doxygen_outdir = ${glibcxx_builddir}/doc/doxygen
|
|
api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml
|
|
doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
|
|
api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
|
|
|
|
${doxygen_outdir}/xml:
|
|
mkdir -p ${doxygen_outdir}/xml
|
|
|
|
${doxygen_outdir}/html:
|
|
mkdir -p ${doxygen_outdir}/html
|
|
|
|
${doxygen_outdir}/latex:
|
|
mkdir -p ${doxygen_outdir}/latex
|
|
|
|
${doxygen_outdir}/pdf:
|
|
mkdir -p ${doxygen_outdir}/pdf
|
|
|
|
${doxygen_outdir}/man:
|
|
mkdir -p ${doxygen_outdir}/man
|
|
|
|
stamp-xml-doxygen: ${doxygen_outdir}/xml
|
|
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
|
builddir=`cd ..; ${PWD_COMMAND}`; \
|
|
${SHELL} ${doxygen_script} \
|
|
--host_alias=${host_alias} --mode=xml $${srcdir} $${builddir} NO)
|
|
$(STAMP) stamp-xml-doxygen
|
|
|
|
stamp-xml-single-doxygen: stamp-xml-doxygen
|
|
@echo "Generating doxygen xml single file..."
|
|
$(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \
|
|
${doxygen_outdir}/xml/index.xml > ${api_xml};
|
|
$(STAMP) stamp-xml-single-doxygen
|
|
|
|
stamp-html-doxygen: ${doxygen_outdir}/html
|
|
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
|
builddir=`cd ..; ${PWD_COMMAND}`; \
|
|
${SHELL} ${doxygen_script} \
|
|
--host_alias=${host_alias} --mode=html $${srcdir} $${builddir} YES)
|
|
$(STAMP) stamp-html-doxygen
|
|
|
|
stamp-latex-doxygen: ${doxygen_outdir}/latex
|
|
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
|
builddir=`cd ..; ${PWD_COMMAND}`; \
|
|
${SHELL} ${doxygen_script} \
|
|
--host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO)
|
|
$(STAMP) stamp-latex-doxygen
|
|
|
|
# Chance of loooooonnggg creation time on this rule. Iff this fails,
|
|
# look at refman.log and see if TeX's memory is exhausted. Symptoms
|
|
# include asking a wizard to enlarge capacity. If this is the case,
|
|
# find texmf.cnf and add a zero for pool_size, string_vacancies,
|
|
# max_strings, and pool_free values.
|
|
stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
|
|
-(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
|
|
echo "Generating doxygen pdf file...";
|
|
if [ -f ${doxygen_pdf} ]; then \
|
|
mv ${doxygen_pdf} ${api_pdf} ; \
|
|
echo ":: PDF file is ${api_pdf}"; \
|
|
else \
|
|
echo "... error"; \
|
|
exit 12; \
|
|
fi
|
|
$(STAMP) stamp-pdf-doxygen
|
|
|
|
stamp-man-doxygen: ${doxygen_outdir}/man
|
|
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
|
builddir=`cd ..; ${PWD_COMMAND}`; \
|
|
${SHELL} ${doxygen_script} \
|
|
--host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
|
|
$(STAMP) stamp-man-doxygen
|
|
|
|
doc-xml-doxygen: stamp-xml-doxygen
|
|
doc-xml-single-doxygen: stamp-xml-single-doxygen
|
|
doc-html-doxygen: stamp-html-doxygen
|
|
doc-latex-doxygen: stamp-latex-doxygen
|
|
doc-pdf-doxygen: stamp-pdf-doxygen
|
|
doc-man-doxygen: stamp-man-doxygen
|
|
|
|
|
|
# Docbook configuration.
|
|
# Assumes
|
|
# libxslt
|
|
# dblatex
|
|
# pdflatex
|
|
# docbook-style-xsl
|
|
# emacs-nxml-mode
|
|
docbook_outdir = ${glibcxx_builddir}/doc/docbook
|
|
xml_dir = ${glibcxx_srcdir}/doc/xml
|
|
|
|
xml_sources_basic = \
|
|
${xml_dir}/spine.xml \
|
|
${xml_dir}/authors.xml \
|
|
${xml_dir}/api.xml \
|
|
${xml_dir}/faq.xml
|
|
|
|
xml_sources_manual = \
|
|
${xml_dir}/manual/abi.xml \
|
|
${xml_dir}/manual/algorithms.xml \
|
|
${xml_dir}/manual/allocator.xml \
|
|
${xml_dir}/manual/auto_ptr.xml \
|
|
${xml_dir}/manual/atomics.xml \
|
|
${xml_dir}/manual/backwards_compatibility.xml \
|
|
${xml_dir}/manual/bitmap_allocator.xml \
|
|
${xml_dir}/manual/build_hacking.xml \
|
|
${xml_dir}/manual/codecvt.xml \
|
|
${xml_dir}/manual/concurrency.xml \
|
|
${xml_dir}/manual/concurrency_extensions.xml \
|
|
${xml_dir}/manual/configure.xml \
|
|
${xml_dir}/manual/containers.xml \
|
|
${xml_dir}/manual/ctype.xml \
|
|
${xml_dir}/manual/debug_mode.xml \
|
|
${xml_dir}/manual/debug.xml \
|
|
${xml_dir}/manual/diagnostics.xml \
|
|
${xml_dir}/manual/documentation_hacking.xml \
|
|
${xml_dir}/manual/evolution.xml \
|
|
${xml_dir}/manual/extensions.xml \
|
|
${xml_dir}/manual/internals.xml \
|
|
${xml_dir}/manual/intro.xml \
|
|
${xml_dir}/manual/io.xml \
|
|
${xml_dir}/manual/iterators.xml \
|
|
${xml_dir}/manual/locale.xml \
|
|
${xml_dir}/manual/localization.xml \
|
|
${xml_dir}/manual/messages.xml \
|
|
${xml_dir}/manual/mt_allocator.xml \
|
|
${xml_dir}/manual/numerics.xml \
|
|
${xml_dir}/manual/parallel_mode.xml \
|
|
${xml_dir}/manual/prerequisites.xml \
|
|
${xml_dir}/manual/profile_mode.xml \
|
|
${xml_dir}/manual/shared_ptr.xml \
|
|
${xml_dir}/manual/spine.xml \
|
|
${xml_dir}/manual/status_cxx1998.xml \
|
|
${xml_dir}/manual/status_cxx200x.xml \
|
|
${xml_dir}/manual/status_cxxtr1.xml \
|
|
${xml_dir}/manual/status_cxxtr24733.xml \
|
|
${xml_dir}/manual/strings.xml \
|
|
${xml_dir}/manual/support.xml \
|
|
${xml_dir}/manual/test.xml \
|
|
${xml_dir}/manual/using.xml \
|
|
${xml_dir}/manual/using_exceptions.xml \
|
|
${xml_dir}/manual/utilities.xml \
|
|
${xml_dir}/manual/appendix_free.xml \
|
|
${xml_dir}/manual/appendix_contributing.xml \
|
|
${xml_dir}/manual/appendix_porting.xml
|
|
|
|
xml_sources_extra = \
|
|
${xml_dir}/gnu/fdl-1.3.xml \
|
|
${xml_dir}/gnu/gpl-3.0.xml
|
|
|
|
xml_sources = \
|
|
${xml_sources_basic} \
|
|
${xml_sources_manual} \
|
|
${xml_sources_extra}
|
|
|
|
xml_noinst = \
|
|
${xml_dir}/book.txml \
|
|
${xml_dir}/chapter.txml \
|
|
${xml_dir}/class.txml \
|
|
${xml_dir}/images/confdeps.dot \
|
|
${xml_dir}/images/confdeps.png \
|
|
${xml_dir}/images/confdeps.pdf
|
|
|
|
XSLTPROC = xsltproc
|
|
XSLTPROC_FLAGS = --nonet --xinclude
|
|
#XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
|
|
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
|
|
XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl
|
|
XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl
|
|
XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
|
|
XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
|
|
|
|
${docbook_outdir}/epub:
|
|
mkdir -p ${docbook_outdir}/epub
|
|
|
|
${docbook_outdir}/fo:
|
|
mkdir -p ${docbook_outdir}/fo
|
|
|
|
${docbook_outdir}/html:
|
|
mkdir -p ${docbook_outdir}/html
|
|
|
|
${docbook_outdir}/pdf:
|
|
mkdir -p ${docbook_outdir}/pdf
|
|
|
|
${docbook_outdir}/texinfo:
|
|
mkdir -p ${docbook_outdir}/texinfo
|
|
|
|
${docbook_outdir}/xml:
|
|
mkdir -p ${docbook_outdir}/xml
|
|
|
|
# Validate existing XML structure.
|
|
XMLLINT = xmllint
|
|
LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
|
|
SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd
|
|
#SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
|
|
XMLLINT_VALID_FLAGS = $(LINT_FLAGS) --dtdvalid $(SCHEMA_FLAGS)
|
|
XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
|
|
doc-xml-validate-docbook: $(xml_sources)
|
|
@echo "Generating XML validation log..."
|
|
$(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml
|
|
|
|
# XML, all one page
|
|
# Some info on canonicalization
|
|
# http://www.mail-archive.com/help-texinfo@gnu.org/msg00864.html
|
|
manual_xml = ${docbook_outdir}/xml/libstdc++-manual-single.xml
|
|
set_xml = ${docbook_outdir}/xml/libstdc++-set-single.xml
|
|
stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml
|
|
@echo "Generating XML single..."
|
|
$(XMLLINT) $(XMLLINT_FLAGS) \
|
|
${top_srcdir}/doc/xml/manual/spine.xml > ${manual_xml};
|
|
$(XMLLINT) $(XMLLINT_FLAGS) \
|
|
${top_srcdir}/doc/xml/spine.xml > ${set_xml};
|
|
if [ ! -d "${docbook_outdir}/xml/images" ]; then \
|
|
$(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/xml/; \
|
|
fi
|
|
$(STAMP) stamp-xml-single-docbook
|
|
|
|
doc-xml-single-docbook: stamp-xml-single-docbook
|
|
|
|
# HTML, index plus chapters
|
|
stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
|
|
@echo "Generating html files..."
|
|
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/html/ \
|
|
$(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml
|
|
$(STAMP) stamp-html-docbook
|
|
|
|
doc-html-docbook: stamp-html-docbook
|
|
|
|
# HTML, all one page
|
|
manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html
|
|
stamp-html-single-docbook: $(xml_sources) ${docbook_outdir}/html
|
|
@echo "Generating html single file..."
|
|
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${manual_html} \
|
|
$(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml
|
|
$(STAMP) stamp-html-single-docbook
|
|
|
|
doc-html-single-docbook: stamp-html-single-docbook
|
|
|
|
# FO
|
|
stamp-fo-docbook: $(xml_sources) ${docbook_outdir}/fo
|
|
@echo "Generating FO files..."
|
|
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/fo/spine.fo \
|
|
$(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml
|
|
$(STAMP) stamp-fo-docbook
|
|
|
|
doc-fo-docbook: stamp-fo-docbook
|
|
|
|
# PDF, via dblatex
|
|
manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf
|
|
DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf}
|
|
stamp-pdf-docbook: $(xml_sources) ${docbook_outdir}/pdf
|
|
@echo "Generating pdf dblatex files..."
|
|
dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml
|
|
$(STAMP) stamp-pdf-docbook
|
|
|
|
doc-pdf-docbook: stamp-pdf-docbook
|
|
|
|
# TEXINFO, via docbook2X
|
|
# NB: Both experimental and tempermental
|
|
manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi
|
|
manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info
|
|
DB2TEXI_FLAGS = \
|
|
--encoding=utf-8//TRANSLIT \
|
|
--string-param output-file="libstdc++-manual" \
|
|
--string-param directory-category="GNU C++ Library" \
|
|
--string-param explicit-node-names=true
|
|
|
|
stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo
|
|
@echo "Generating texinfo files..."
|
|
db2x_docbook2texi $(DB2TEXI_FLAGS) ${set_xml}
|
|
mv libstdc++-manual.texi ${manual_texi}
|
|
$(STAMP) stamp-texinfo-docbook
|
|
|
|
stamp-info-docbook: stamp-texinfo-docbook
|
|
@echo "Generating info files..."
|
|
$(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi}
|
|
$(STAMP) stamp-info-docbook
|
|
|
|
doc-texinfo-docbook: stamp-texinfo-docbook
|
|
|
|
doc-info-docbook: stamp-info-docbook
|
|
|
|
# EPUB, via dbtoepub + ruby
|
|
manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
|
|
stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
|
|
@echo "Generating epub files..."
|
|
${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml}
|
|
$(STAMP) stamp-epub-docbook
|
|
|
|
doc-epub-docbook: stamp-epub-docbook
|
|
|
|
|
|
# Performance doc and graph configuration.
|
|
# Assumes pychart, beautiful soup installed.
|
|
# Generates the plots and graphs for performance testing.
|
|
doc_performance_script=${top_srcdir}/scripts/make_graphs.py
|
|
doc-html-performance:
|
|
-@(chmod + ${doc_performance_script}; \
|
|
${doc_performance_script} ${top_srcdir} \
|
|
${glibcxx_builddir}/testsuite \
|
|
${top_srcdir}/testsuite/data/make_graph_htmls.xml \
|
|
${top_srcdir}/testsuite/data/make_graph_test_infos.xml local g++)
|
|
|
|
|
|
.PHONY: doc-doxygen-html doc-doxygen-man doc-performance
|
|
|
|
# By adding these files here, automake will remove them for 'make clean'
|
|
CLEANFILES = *.log stamp*
|
|
|
|
# To remove directories.
|
|
clean-local:
|
|
rm -rf man html pdf fo xml doxygen docbook ./libstdc++-* db2t*
|