diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2012-09-28 19:48:27 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-09-28 19:48:27 +0000 |
commit | 495de4f4cb2e9de61fe73a1000837e2f9001404d (patch) | |
tree | 220225b3fe0e271cb0e91fa0e6adaf94734504af /libstdc++-v3/include/Makefile.in | |
parent | 92aecb446a29e14e637cbe8d13d95b44610b7ff5 (diff) | |
download | gcc-495de4f4cb2e9de61fe73a1000837e2f9001404d.zip gcc-495de4f4cb2e9de61fe73a1000837e2f9001404d.tar.gz gcc-495de4f4cb2e9de61fe73a1000837e2f9001404d.tar.bz2 |
acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Remove ENABLE_PARALLEL.
2012-09-28 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Remove ENABLE_PARALLEL.
* include/Makefile.am: Same.
* src/c++98/Makefile.am: Same.
* src/Makefile.am: Same.
* Makefile.in: Regenerated.
* aclocal.m4: Same.
* configure: Same.
* doc/Makefile.in: Same.
* include/Makefile.in: Same.
* libsupc++/Makefile.in: Same.
* po/Makefile.in: Same.
* python/Makefile.in: Same.
* src/Makefile.in: Same.
* testsuite/Makefile.in: Same.
* src/c++11/Makefile.in: Same.
* src/c++98/Makefile.in: Same.
* src/c++98/compatibility-debug_list-2.cc: Update comments.
* src/c++98/compatibility-debug_list.cc: Same.
* src/c++98/compatibility-list-2.cc: Renamed to src/c++98/list-aux-2.cc
* src/c++98/compatibility-list.cc: Renamed to src/c++98/list-aux.cc
* src/c++98/compatibility-parallel_list-2.cc: Renamed to
src/c++98/list_associated-2.cc.
* src/c++98/compatibility-parallel_list.cc: Renamed to
src/c++98/list_associated.cc.
From-SVN: r191837
Diffstat (limited to 'libstdc++-v3/include/Makefile.in')
-rw-r--r-- | libstdc++-v3/include/Makefile.in | 137 |
1 files changed, 53 insertions, 84 deletions
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index ebebf1b..0855f4e 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +15,6 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,11 +66,6 @@ CONFIG_CLEAN_VPATH_FILES = depcomp = am__depfiles_maybe = SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac ABI_TWEAKS_SRCDIR = @ABI_TWEAKS_SRCDIR@ ACLOCAL = @ACLOCAL@ ALLOCATOR_H = @ALLOCATOR_H@ @@ -1011,51 +989,50 @@ debug_headers = \ # Parallel mode headers parallel_srcdir = ${glibcxx_srcdir}/include/parallel parallel_builddir = ./parallel -@ENABLE_PARALLEL_FALSE@parallel_headers = -@ENABLE_PARALLEL_TRUE@parallel_headers = \ -@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 \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/base.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/basic_iterator.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/checkers.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compatibility.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compiletime_settings.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/equally_split.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/features.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find_selectors.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each_selectors.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/iterator.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/list_partition.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/losertree.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/merge.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiseq_selection.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_merge.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_mergesort.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numeric \ -@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}/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 \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/quicksort.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_number.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_shuffle.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/search.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/set_operations.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/settings.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/sort.h \ -@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 +parallel_headers = \ + ${parallel_srcdir}/algo.h \ + ${parallel_srcdir}/algobase.h \ + ${parallel_srcdir}/algorithm \ + ${parallel_srcdir}/algorithmfwd.h \ + ${parallel_srcdir}/balanced_quicksort.h \ + ${parallel_srcdir}/base.h \ + ${parallel_srcdir}/basic_iterator.h \ + ${parallel_srcdir}/checkers.h \ + ${parallel_srcdir}/compatibility.h \ + ${parallel_srcdir}/compiletime_settings.h \ + ${parallel_srcdir}/equally_split.h \ + ${parallel_srcdir}/features.h \ + ${parallel_srcdir}/find.h \ + ${parallel_srcdir}/find_selectors.h \ + ${parallel_srcdir}/for_each.h \ + ${parallel_srcdir}/for_each_selectors.h \ + ${parallel_srcdir}/iterator.h \ + ${parallel_srcdir}/list_partition.h \ + ${parallel_srcdir}/losertree.h \ + ${parallel_srcdir}/merge.h \ + ${parallel_srcdir}/multiseq_selection.h \ + ${parallel_srcdir}/multiway_merge.h \ + ${parallel_srcdir}/multiway_mergesort.h \ + ${parallel_srcdir}/numeric \ + ${parallel_srcdir}/numericfwd.h \ + ${parallel_srcdir}/omp_loop.h \ + ${parallel_srcdir}/omp_loop_static.h \ + ${parallel_srcdir}/par_loop.h \ + ${parallel_srcdir}/parallel.h \ + ${parallel_srcdir}/partial_sum.h \ + ${parallel_srcdir}/partition.h \ + ${parallel_srcdir}/queue.h \ + ${parallel_srcdir}/quicksort.h \ + ${parallel_srcdir}/random_number.h \ + ${parallel_srcdir}/random_shuffle.h \ + ${parallel_srcdir}/search.h \ + ${parallel_srcdir}/set_operations.h \ + ${parallel_srcdir}/settings.h \ + ${parallel_srcdir}/sort.h \ + ${parallel_srcdir}/tags.h \ + ${parallel_srcdir}/types.h \ + ${parallel_srcdir}/unique_copy.h \ + ${parallel_srcdir}/workstealing.h # Profile mode headers @@ -1212,7 +1189,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/fragment.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1248,15 +1224,10 @@ install-am: all-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -1702,10 +1673,8 @@ 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 - parallel_headers_install='${parallel_headers}';\ - test -z "$$parallel_headers_install" || \ - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${parallel_builddir};\ - for file in $$parallel_headers_install; do \ + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${parallel_builddir} + for file in ${parallel_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${parallel_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${profile_builddir} for file in ${profile_headers}; do \ |