diff options
Diffstat (limited to 'libstdc++-v3/include/Makefile.am')
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 5e5abba74b3..844629ceb6b 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1,6 +1,7 @@ ## Makefile for the include subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## Process this file with automake to produce Makefile.in. @@ -482,21 +483,23 @@ tr1_headers = \ ${tr1_srcdir}/bind_repeat.h \ ${tr1_srcdir}/bind_iterate.h \ ${tr1_srcdir}/boost_shared_ptr.h \ - ${tr1_srcdir}/mu_iterate.h \ + ${tr1_srcdir}/common.h \ + ${tr1_srcdir}/complex \ ${tr1_srcdir}/functional \ ${tr1_srcdir}/functional_iterate.h \ + ${tr1_srcdir}/hashtable \ ${tr1_srcdir}/memory \ + ${tr1_srcdir}/mu_iterate.h \ ${tr1_srcdir}/ref_fwd.h \ ${tr1_srcdir}/ref_wrap_iterate.h \ ${tr1_srcdir}/repeat.h \ ${tr1_srcdir}/tuple \ ${tr1_srcdir}/tuple_iterate.h \ - ${tr1_srcdir}/utility \ ${tr1_srcdir}/type_traits \ ${tr1_srcdir}/type_traits_fwd.h \ - ${tr1_srcdir}/hashtable \ ${tr1_srcdir}/unordered_set \ - ${tr1_srcdir}/unordered_map + ${tr1_srcdir}/unordered_map \ + ${tr1_srcdir}/utility # This is the common subset of files that all three "C" header models use. @@ -611,6 +614,7 @@ endif host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR) host_builddir = ./${host_alias}/bits +host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits host_headers = \ ${host_srcdir}/ctype_base.h \ ${host_srcdir}/ctype_inline.h \ @@ -644,6 +648,7 @@ thread_host_headers = \ pch_input = ${host_builddir}/stdc++.h pch_output_builddir = ${host_builddir}/stdc++.h.gch +pch_output_installdir = ${host_installdir}/stdc++.h.gch pch_source = ${glibcxx_srcdir}/include/stdc++.h PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS) if GLIBCXX_BUILD_PCH @@ -916,9 +921,9 @@ endif # are copied here. install-freestanding-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${host_builddir} + $(mkinstalldirs) $(DESTDIR)${host_installdir} for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \ - $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${host_builddir}; done + $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} $(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir} $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} @@ -978,15 +983,15 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${debug_builddir} for file in ${debug_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${debug_builddir}; done - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${host_builddir} + $(mkinstalldirs) $(DESTDIR)${host_installdir} for file in ${host_headers} ${host_headers_extra} \ ${thread_host_headers}; do \ - $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${host_builddir}; done + $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done install-pch: - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${pch_output_builddir} + $(mkinstalldirs) $(DESTDIR)${pch_output_installdir} for file in ${pch_output_builddir}/*; do \ - $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${pch_output_builddir}; done + $(INSTALL_DATA) $$file $(DESTDIR)${pch_output_installdir}; done # By adding these files here, automake will remove them for 'make clean' CLEANFILES = ${pch_input} ${pch_output_builddir}/* |