procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile.am: Remove trailing white space, fix typo.

Browse source 
libstdc++-v3/

	* include/Makefile.am: Remove trailing white space, fix typo.
	(parallel_headers): Remove duplicate file, sort entries.
	* include/Makefile.in: Regenerate.

From-SVN: r136810
This commit is contained in:
Ralf Wildenhues 2008-06-15 12:24:36 +00:00 • committed by Ralf Wildenhues
parent f13df8faa9
commit 147fc44bcd
3 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,9 @@
2008-06-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* include/Makefile.am: Remove trailing white space, fix typo.
(parallel_headers): Remove duplicate file, sort entries.
* include/Makefile.in: Regenerate.
2008-06-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* src/condition_variable.cc (~condition_variable): Drop unused

39
libstdc++-v3/include/Makefile.am
View file

@ -155,7 +155,7 @@ backward_headers = \
${backward_srcdir}/hash_set \
${backward_srcdir}/hash_fun.h \
${backward_srcdir}/hashtable.h \
${backward_srcdir}/strstream
${backward_srcdir}/strstream
pb_srcdir = ${glibcxx_srcdir}/include/ext/pb_ds
pb_builddir = ./ext/pb_ds
@ -187,7 +187,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.
@ -232,7 +232,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 \
@ -274,7 +274,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 \
@ -315,7 +315,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 \
@ -358,7 +358,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 \
@ -400,7 +400,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 \
@ -442,7 +442,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 \
@ -468,11 +468,11 @@ pb_headers7 = \
${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 \
@ -639,7 +639,7 @@ c_compatibility_srcdir = ${glibcxx_srcdir}/include/c_compatibility
c_compatibility_builddir = .
if GLIBCXX_C_HEADERS_C_STD
c_compatibility_headers =
c_compatibility_headers =
endif
if GLIBCXX_C_HEADERS_C_GLOBAL
@ -647,7 +647,7 @@ c_compatibility_headers = \
${c_compatibility_srcdir}/complex.h \
${c_compatibility_srcdir}/fenv.h \
${c_compatibility_srcdir}/tgmath.h \
${c_compatibility_srcdir}/stdatomic.h
${c_compatibility_srcdir}/stdatomic.h
endif
if GLIBCXX_C_HEADERS_C
@ -710,9 +710,8 @@ parallel_srcdir = ${glibcxx_srcdir}/include/parallel
parallel_builddir = ./parallel
if ENABLE_PARALLEL
parallel_headers = \
${parallel_srcdir}/algorithm \
${parallel_srcdir}/algobase.h \
${parallel_srcdir}/algo.h \
${parallel_srcdir}/algobase.h \
${parallel_srcdir}/algorithm \
${parallel_srcdir}/algorithmfwd.h \
${parallel_srcdir}/balanced_quicksort.h \
@ -738,8 +737,8 @@ parallel_headers = \
${parallel_srcdir}/numericfwd.h \
${parallel_srcdir}/omp_loop.h \
${parallel_srcdir}/omp_loop_static.h \
${parallel_srcdir}/parallel.h \
${parallel_srcdir}/par_loop.h \
${parallel_srcdir}/parallel.h \
${parallel_srcdir}/partial_sum.h \
${parallel_srcdir}/partition.h \
${parallel_srcdir}/queue.h \
@ -753,7 +752,7 @@ parallel_headers = \
${parallel_srcdir}/tags.h \
${parallel_srcdir}/types.h \
${parallel_srcdir}/unique_copy.h \
${parallel_srcdir}/workstealing.h
${parallel_srcdir}/workstealing.h
else
parallel_headers =
endif
@ -788,7 +787,7 @@ host_headers = \
${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
${glibcxx_srcdir}/include/precompiled/extc++.h
# Non-installed host_header files.
COMPATIBILITY_H = config/abi/compatibility.h
@ -804,7 +803,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 \
@ -911,7 +910,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"` ;\
@ -1113,7 +1112,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
# the rest are taken from the original source tree.
if GLIBCXX_HOSTED
install-data-local: install-headers
install-data-local: install-headers
else
install-data-local: install-freestanding-headers
endif

37
libstdc++-v3/include/Makefile.in
View file

@ -408,7 +408,7 @@ backward_headers = \
${backward_srcdir}/hash_set \
${backward_srcdir}/hash_fun.h \
${backward_srcdir}/hashtable.h \
${backward_srcdir}/strstream
${backward_srcdir}/strstream
pb_srcdir = ${glibcxx_srcdir}/include/ext/pb_ds
pb_builddir = ./ext/pb_ds
@ -440,7 +440,7 @@ pb_subdirs = \
# 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.
pb_headers1 = \
@ -484,7 +484,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 \
@ -526,7 +526,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 \
@ -567,7 +567,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 \
@ -610,7 +610,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 \
@ -652,7 +652,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 \
@ -694,7 +694,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 \
@ -720,10 +720,10 @@ pb_headers7 = \
${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 \
@ -892,7 +892,7 @@ c_compatibility_builddir = .
@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/complex.h \
@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/fenv.h \
@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/tgmath.h \
@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/stdatomic.h
@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/stdatomic.h
@GLIBCXX_C_HEADERS_C_STD_TRUE@c_compatibility_headers =
@GLIBCXX_C_HEADERS_C_TRUE@c_compatibility_headers = \
@ -955,9 +955,8 @@ parallel_srcdir = ${glibcxx_srcdir}/include/parallel
parallel_builddir = ./parallel
@ENABLE_PARALLEL_FALSE@parallel_headers =
@ENABLE_PARALLEL_TRUE@parallel_headers = \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithm \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algobase.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algo.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algobase.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithm \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithmfwd.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/balanced_quicksort.h \
@ -983,8 +982,8 @@ parallel_builddir = ./parallel
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numericfwd.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop_static.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/parallel.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/par_loop.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/parallel.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partial_sum.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partition.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/queue.h \
@ -998,7 +997,7 @@ parallel_builddir = ./parallel
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/tags.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/types.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/unique_copy.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/workstealing.h
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/workstealing.h
@GLIBCXX_C_HEADERS_EXTRA_FALSE@c_base_headers_extra =
@ -1022,7 +1021,7 @@ host_headers = \
${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
${glibcxx_srcdir}/include/precompiled/extc++.h
# Non-installed host_header files.
@ -1040,7 +1039,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 \
@ -1311,7 +1310,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"` ;\
@ -1503,7 +1502,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
# host_headers_extra are taken out of the build tree staging area;
# the rest are taken from the original source tree.
@GLIBCXX_HOSTED_TRUE@install-data-local: install-headers
@GLIBCXX_HOSTED_TRUE@install-data-local: install-headers
@GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-headers
# This is a subset of the full install-headers rule. We only need <cstddef>,