2005-09-12 David Edelsohn <dje@gcc.gnu.org>

	PR libstdc++/22554
	PR libstdc++/23734
	* include/Makefile.am (stamp-assoc): Install each subgroup
	of headers separately.
	* include/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104238 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dedb911..be0f9e7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-12  David Edelsohn  <dje@gcc.gnu.org>
+
+       PR libstdc++/22554
+       PR libstdc++/23734
+       * include/Makefile.am (stamp-assoc): Install each subgroup
+       of headers separately.
+       * include/Makefile.in: Regenerate.
+       
 2005-09-12  Benjamin Kosnik  <bkoz@redhat.com>
 
        * testsuite/ext/mt_allocator/22309_thread.cc: Remove dg-do run.
@@ -5,7 +13,7 @@
        shared only for linux.
        
 2005-09-12  Benjamin Kosnik  <bkoz@redhat.com>
-           David Edelsohn <dje@gcc.gnu.org>
+           David Edelsohn  <dje@gcc.gnu.org>
 
        PR libstdc++/22554
        PR libstdc++/23734

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 185a8f3..ed39973 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -744,29 +744,37 @@ stamp-ext: ${ext_headers}
 stamp-assoc:
        @if [ ! -d "${assoc_builddir}" ]; then \
            mkdir -p ${assoc_subdirs} ;\
-       fi ;\
-       if [ ! -f stamp-assoc ]; then \
-         (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) ;\
-       fi ;\
+       fi 
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
        $(STAMP) stamp-assoc
 
 stamp-tr1: ${tr1_headers}

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 081f3e2..7b8b7e7 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1120,29 +1120,37 @@ stamp-ext: ${ext_headers}
 stamp-assoc:
        @if [ ! -d "${assoc_builddir}" ]; then \
            mkdir -p ${assoc_subdirs} ;\
-       fi ;\
-       if [ ! -f stamp-assoc ]; then \
-         (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) ;\
-       fi ;\
+       fi 
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
+       @if [ ! -f stamp-assoc ]; then \
+           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 ;\
+       fi
        $(STAMP) stamp-assoc
 
 stamp-tr1: ${tr1_headers}