Makefile.am (bits_headers): Remove ${bits_host_headers}.

2013-05-19  Matthias Klose  <doko@ubuntu.com>

        * include/Makefile.am (bits_headers): Remove ${bits_host_headers}.
        (ext_headers): Remove ${ext_host_headers}.
        (stamp-${host_alias}): Create ${host_builddir}/../ext.
        (stamp-host): Link ${bits_host_headers} and ${ext_host_headers}.
        (install-headers): Install ${bits_host_headers} and ${ext_host_headers}.
        * include/Makefile.in: Regenerate.

From-SVN: r199072

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a59c5d6b9b5ec0ea70b9ff31e69e1fc83d1d9049..d4f57c81c5de3ec0d13d3b317bbfff71b5c920d4 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2013-05-19  Matthias Klose  <doko@ubuntu.com>
+
+       * include/Makefile.am (bits_headers): Remove ${bits_host_headers}.
+       (ext_headers): Remove ${ext_host_headers}.
+       (stamp-${host_alias}): Create ${host_builddir}/../ext.
+       (stamp-host): Link ${bits_host_headers} and ${ext_host_headers}.
+       (install-headers): Install ${bits_host_headers} and ${ext_host_headers}.
+       * include/Makefile.in: Regenerate.
+
 2013-05-18  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * include/std/system_error (error_category::error_category()): LWG

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index cbf4f1a549da7039b99ee4c6f166f106e141957a..e8ef7066bcd9bbc1443681ed83061f94728a213f 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -172,8 +172,7 @@ bits_headers = \
        ${bits_srcdir}/valarray_array.tcc \
        ${bits_srcdir}/valarray_before.h \
        ${bits_srcdir}/valarray_after.h \
-       ${bits_srcdir}/vector.tcc \
-       ${bits_host_headers}
+       ${bits_srcdir}/vector.tcc
 
 bits_host_headers = \
        ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
@@ -536,8 +535,7 @@ ext_headers = \
        ${ext_srcdir}/vstring.tcc \
        ${ext_srcdir}/vstring_fwd.h \
        ${ext_srcdir}/vstring_util.h \
-       ${ext_compat_headers} \
-       ${ext_host_headers}
+       ${ext_compat_headers}
 
 ext_compat_headers = \
        ${backward_srcdir}/hash_set \
@@ -1050,13 +1048,14 @@ stamp-profile-impl: ${profile_impl_headers}
 
 stamp-${host_alias}:
        @-mkdir -p ${host_builddir}
+       @-mkdir -p ${host_builddir}/../ext
        @$(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}
+stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
        @cd ${host_builddir} && {\
-         $(LN_S) ${host_headers} . || true ;\
+         $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
@@ -1066,6 +1065,9 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
          $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
        } 2>/dev/null
+       @cd ${host_builddir}/../ext && {\
+         $(LN_S) ${ext_host_headers} . || true ;\
+       } 2>/dev/null
        $(STAMP) stamp-host
 
 # Host includes dynamic.
@@ -1292,9 +1294,12 @@ install-headers:
        for file in ${profile_impl_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
-       for file in ${host_headers} ${host_headers_extra} \
+       for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
         ${thread_host_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
+       $(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
+       for file in ${ext_host_headers}; do \
+         $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
 
 # By adding these files here, automake will remove them for 'make clean'
 CLEANFILES = ${pch_output} ${pch_output_anchors} stamp-host

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index b34e174603b0a056b390a4e347249579e6d6bcac..2ba9433bd7d5560826d1ec3f8afe505171ddd84e 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -434,8 +434,7 @@ bits_headers = \
        ${bits_srcdir}/valarray_array.tcc \
        ${bits_srcdir}/valarray_before.h \
        ${bits_srcdir}/valarray_after.h \
-       ${bits_srcdir}/vector.tcc \
-       ${bits_host_headers}
+       ${bits_srcdir}/vector.tcc
 
 bits_host_headers = \
        ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
@@ -796,8 +795,7 @@ ext_headers = \
        ${ext_srcdir}/vstring.tcc \
        ${ext_srcdir}/vstring_fwd.h \
        ${ext_srcdir}/vstring_util.h \
-       ${ext_compat_headers} \
-       ${ext_host_headers}
+       ${ext_compat_headers}
 
 ext_compat_headers = \
        ${backward_srcdir}/hash_set \
@@ -1463,13 +1461,14 @@ stamp-profile-impl: ${profile_impl_headers}
 
 stamp-${host_alias}:
        @-mkdir -p ${host_builddir}
+       @-mkdir -p ${host_builddir}/../ext
        @$(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}
+stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
        @cd ${host_builddir} && {\
-         $(LN_S) ${host_headers} . || true ;\
+         $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
@@ -1479,6 +1478,9 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
          $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
        } 2>/dev/null
+       @cd ${host_builddir}/../ext && {\
+         $(LN_S) ${ext_host_headers} . || true ;\
+       } 2>/dev/null
        $(STAMP) stamp-host
 
 # Host includes dynamic.
@@ -1690,9 +1692,12 @@ install-headers:
        for file in ${profile_impl_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
-       for file in ${host_headers} ${host_headers_extra} \
+       for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
         ${thread_host_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
+       $(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
+       for file in ${ext_host_headers}; do \
+         $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
 
 # To remove directories.
 clean-local: