diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2005-09-12 23:09:41 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@redhat.com> | 2005-09-12 23:09:41 +0000 |
commit | 227226cb251e4cb750470a61d2edf3eb82e6840a (patch) | |
tree | 1a9b3c6df6c5e84aac4482fb4c5c4168b1846558 /libstdc++-v3/include/Makefile.am | |
parent | eb5657e35d30cdcfe6414213e3b6d2ab123d0cd5 (diff) |
2005-09-12 Benjamin Kosnik <bkoz@redhat.com>
David Edelsohn <dje@gcc.gnu.org>
PR libstdc++/22554
PR libstdc++/23734
* include/Makefile.am (assoc_headers): Break into five sub values.
(install-headers): Use them.
(stamp-assoc): Same.
* include/Makefile.in: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@104196 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/Makefile.am')
-rw-r--r-- | libstdc++-v3/include/Makefile.am | 60 |
1 files changed, 52 insertions, 8 deletions
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index e4fa84d288f..185a8f36c78 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -225,7 +225,10 @@ assoc_subdirs = \ ${assoc_builddir}/detail/rb_tree_map_ \ ${assoc_builddir}/detail/lu_map_ -assoc_headers = \ +# The ability for make and the underlying host to deal with this +# unweildy list as one entire entity is not a sure thing, and may +# cause build errors. Thus, split one list into five smaller ones. +assoc_headers1 = \ ${assoc_srcdir}/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/type_utils.hpp \ ${assoc_srcdir}/detail/order_statistics_imp.hpp \ @@ -259,7 +262,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/ds_trait_imp.hpp \ ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \ - ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp + +assoc_headers2 = \ ${assoc_srcdir}/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp \ ${assoc_srcdir}/detail/cc_ht_map_/find_store_hash_fn_imps.hpp \ ${assoc_srcdir}/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp \ @@ -308,7 +313,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/gp_ht_map_/gp_ht_map_.hpp \ ${assoc_srcdir}/detail/gp_ht_map_/iterator_fn_imps.hpp \ ${assoc_srcdir}/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp \ - ${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp \ + ${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp + +assoc_headers3 = \ ${assoc_srcdir}/detail/tree_policy/order_statistics_imp.hpp \ ${assoc_srcdir}/detail/tree_policy/null_node_updator_imp.hpp \ ${assoc_srcdir}/detail/types_traits.hpp \ @@ -345,7 +352,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp \ - ${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp + +assoc_headers4 = \ ${assoc_srcdir}/detail/assoc_cntnr_base.hpp \ ${assoc_srcdir}/detail/ms_category_imp.hpp \ ${assoc_srcdir}/detail/hash_types_traits.hpp \ @@ -383,7 +392,9 @@ assoc_headers = \ ${assoc_srcdir}/detail/ov_tree_map_/info_fn_imps.hpp \ ${assoc_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \ ${assoc_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \ - ${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \ + ${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp + +assoc_headers5 = \ ${assoc_srcdir}/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp \ ${assoc_srcdir}/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp \ ${assoc_srcdir}/detail/hash_fn/linear_probe_fn_imp.hpp \ @@ -729,12 +740,29 @@ stamp-ext: ${ext_headers} # Have to deal with nested include directories, gah! Strip off source # directory before making the link. -stamp-assoc: ${assoc_headers} +# XXX check ${assoc_headers} +stamp-assoc: @if [ ! -d "${assoc_builddir}" ]; then \ mkdir -p ${assoc_subdirs} ;\ fi ;\ if [ ! -f stamp-assoc ]; then \ - (cd ${assoc_builddir} && for h in $?; do \ + (cd ${assoc_builddir} && for h in ${assoc_headers1}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers2}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers3}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers4}; do \ + build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(LN_S) $$h $${build_name} || true ;\ + done) ;\ + (cd ${assoc_builddir} && for h in ${assoc_headers5}; do \ build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\ $(LN_S) $$h $${build_name} || true ;\ done) ;\ @@ -894,7 +922,23 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${assoc_builddir} for dir in ${assoc_subdirs}; do \ $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done - for file in ${assoc_headers}; do \ + for file in ${assoc_headers1}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers2}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers3}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers4}; do \ + install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ + relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ + $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done + for file in ${assoc_headers5}; do \ install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \ relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\ $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done |