Makefile.am (CLEANFILES): Remove PCH files in target directory.

2003-05-02  Benjamin Kosnik  <bkoz@redhat.com>

	* include/Makefile.am (CLEANFILES): Remove PCH files in target
	directory.
	* include/Makefile.in: Regenerate.

From-SVN: r66403

3 files changed, 282 insertions, 23 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cc86e86..d47f26d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/Makefile.am (CLEANFILES): Remove PCH files in target
+	directory.
+	* include/Makefile.in: Regenerate.
+
 2003-05-02  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/std/std_sstream.h (str()): Tidy.
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 78a233c..9d4b0b7 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -554,7 +554,7 @@ install-pch:
 	  $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${pch_output_builddir}; done
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = *.gch 
+CLEANFILES = ${pch_input} ${pch_output_builddir}/*
 
 # Stop implicit '.o' make rules from ever stomping on extensionless
 # headers, in the improbable case where some foolish, crack-addled
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 243c22c..076770f 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -154,78 +154,331 @@ INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
 # Standard C++ includes.
 std_srcdir = ${glibcpp_srcdir}/include/std
 std_builddir = .
-std_headers =  	${std_srcdir}/std_algorithm.h 	${std_srcdir}/std_bitset.h 	${std_srcdir}/std_complex.h 	${std_srcdir}/std_deque.h 	${std_srcdir}/std_fstream.h 	${std_srcdir}/std_functional.h 	${std_srcdir}/std_iomanip.h 	${std_srcdir}/std_ios.h 	${std_srcdir}/std_iosfwd.h 	${std_srcdir}/std_iostream.h 	${std_srcdir}/std_istream.h 	${std_srcdir}/std_iterator.h 	${std_srcdir}/std_limits.h 	${std_srcdir}/std_list.h 	${std_srcdir}/std_locale.h 	${std_srcdir}/std_map.h 	${std_srcdir}/std_memory.h 	${std_srcdir}/std_numeric.h 	${std_srcdir}/std_ostream.h 	${std_srcdir}/std_queue.h 	${std_srcdir}/std_set.h 	${std_srcdir}/std_sstream.h 	${std_srcdir}/std_stack.h 	${std_srcdir}/std_stdexcept.h 	${std_srcdir}/std_streambuf.h 	${std_srcdir}/std_string.h 	${std_srcdir}/std_utility.h 	${std_srcdir}/std_valarray.h 	${std_srcdir}/std_vector.h
+std_headers = \
+	${std_srcdir}/std_algorithm.h \
+	${std_srcdir}/std_bitset.h \
+	${std_srcdir}/std_complex.h \
+	${std_srcdir}/std_deque.h \
+	${std_srcdir}/std_fstream.h \
+	${std_srcdir}/std_functional.h \
+	${std_srcdir}/std_iomanip.h \
+	${std_srcdir}/std_ios.h \
+	${std_srcdir}/std_iosfwd.h \
+	${std_srcdir}/std_iostream.h \
+	${std_srcdir}/std_istream.h \
+	${std_srcdir}/std_iterator.h \
+	${std_srcdir}/std_limits.h \
+	${std_srcdir}/std_list.h \
+	${std_srcdir}/std_locale.h \
+	${std_srcdir}/std_map.h \
+	${std_srcdir}/std_memory.h \
+	${std_srcdir}/std_numeric.h \
+	${std_srcdir}/std_ostream.h \
+	${std_srcdir}/std_queue.h \
+	${std_srcdir}/std_set.h \
+	${std_srcdir}/std_sstream.h \
+	${std_srcdir}/std_stack.h \
+	${std_srcdir}/std_stdexcept.h \
+	${std_srcdir}/std_streambuf.h \
+	${std_srcdir}/std_string.h \
+	${std_srcdir}/std_utility.h \
+	${std_srcdir}/std_valarray.h \
+	${std_srcdir}/std_vector.h
 
 # Renamed at build time. 
-std_headers_rename =  	algorithm 	bitset 	complex 	deque 	fstream 	functional 	iomanip 	ios 	iosfwd 	iostream 	istream 	iterator 	limits 	list 	locale 	map 	memory 	numeric 	ostream 	queue 	set 	sstream 	stack 	stdexcept 	streambuf 	string 	utility 	valarray 	vector
+std_headers_rename = \
+	algorithm \
+	bitset \
+	complex \
+	deque \
+	fstream \
+	functional \
+	iomanip \
+	ios \
+	iosfwd \
+	iostream \
+	istream \
+	iterator \
+	limits \
+	list \
+	locale \
+	map \
+	memory \
+	numeric \
+	ostream \
+	queue \
+	set \
+	sstream \
+	stack \
+	stdexcept \
+	streambuf \
+	string \
+	utility \
+	valarray \
+	vector
 
 
 bits_srcdir = ${glibcpp_srcdir}/include/bits
 bits_builddir = ./bits
-bits_headers =  	${bits_srcdir}/basic_ios.h 	${bits_srcdir}/basic_ios.tcc 	${bits_srcdir}/basic_string.h 	${bits_srcdir}/basic_string.tcc 	${bits_srcdir}/boost_concept_check.h 	${bits_srcdir}/char_traits.h 	${bits_srcdir}/codecvt.h 	${bits_srcdir}/concept_check.h 	${bits_srcdir}/cpp_type_traits.h 	${bits_srcdir}/demangle.h 	${bits_srcdir}/deque.tcc 	${bits_srcdir}/fpos.h 	${bits_srcdir}/fstream.tcc 	${bits_srcdir}/functexcept.h 	${bits_srcdir}/gslice.h 	${bits_srcdir}/gslice_array.h 	${bits_srcdir}/indirect_array.h 	${bits_srcdir}/ios_base.h 	${bits_srcdir}/istream.tcc 	${bits_srcdir}/list.tcc 	${bits_srcdir}/locale_classes.h 	${bits_srcdir}/locale_facets.h 	${bits_srcdir}/locale_facets.tcc 	${bits_srcdir}/localefwd.h 	${bits_srcdir}/mask_array.h 	${bits_srcdir}/ostream.tcc 	${bits_srcdir}/pthread_allocimpl.h 	${bits_srcdir}/stream_iterator.h 	${bits_srcdir}/streambuf_iterator.h 	${bits_srcdir}/slice_array.h 	${bits_srcdir}/sstream.tcc 	${bits_srcdir}/stl_algo.h 	${bits_srcdir}/stl_algobase.h 	${bits_srcdir}/stl_alloc.h 	${bits_srcdir}/stl_bvector.h 	${bits_srcdir}/stl_construct.h 	${bits_srcdir}/stl_deque.h 	${bits_srcdir}/stl_function.h 	${bits_srcdir}/stl_heap.h 	${bits_srcdir}/stl_iterator.h 	${bits_srcdir}/stl_iterator_base_funcs.h 	${bits_srcdir}/stl_iterator_base_types.h 	${bits_srcdir}/stl_list.h 	${bits_srcdir}/stl_map.h 	${bits_srcdir}/stl_multimap.h 	${bits_srcdir}/stl_multiset.h 	${bits_srcdir}/stl_numeric.h 	${bits_srcdir}/stl_pair.h 	${bits_srcdir}/stl_pthread_alloc.h 	${bits_srcdir}/stl_queue.h 	${bits_srcdir}/stl_raw_storage_iter.h 	${bits_srcdir}/stl_relops.h 	${bits_srcdir}/stl_set.h 	${bits_srcdir}/stl_stack.h 	${bits_srcdir}/stl_tempbuf.h 	${bits_srcdir}/stl_threads.h 	${bits_srcdir}/stl_tree.h 	${bits_srcdir}/stl_uninitialized.h 	${bits_srcdir}/stl_vector.h 	${bits_srcdir}/streambuf.tcc 	${bits_srcdir}/stringfwd.h 	${bits_srcdir}/type_traits.h 	${bits_srcdir}/valarray_array.h 	${bits_srcdir}/valarray_array.tcc 	${bits_srcdir}/valarray_before.h 	${bits_srcdir}/valarray_after.h 	${bits_srcdir}/vector.tcc
+bits_headers = \
+	${bits_srcdir}/basic_ios.h \
+	${bits_srcdir}/basic_ios.tcc \
+	${bits_srcdir}/basic_string.h \
+	${bits_srcdir}/basic_string.tcc \
+	${bits_srcdir}/boost_concept_check.h \
+	${bits_srcdir}/char_traits.h \
+	${bits_srcdir}/codecvt.h \
+	${bits_srcdir}/concept_check.h \
+	${bits_srcdir}/cpp_type_traits.h \
+	${bits_srcdir}/demangle.h \
+	${bits_srcdir}/deque.tcc \
+	${bits_srcdir}/fpos.h \
+	${bits_srcdir}/fstream.tcc \
+	${bits_srcdir}/functexcept.h \
+	${bits_srcdir}/gslice.h \
+	${bits_srcdir}/gslice_array.h \
+	${bits_srcdir}/indirect_array.h \
+	${bits_srcdir}/ios_base.h \
+	${bits_srcdir}/istream.tcc \
+	${bits_srcdir}/list.tcc \
+	${bits_srcdir}/locale_classes.h \
+	${bits_srcdir}/locale_facets.h \
+	${bits_srcdir}/locale_facets.tcc \
+	${bits_srcdir}/localefwd.h \
+	${bits_srcdir}/mask_array.h \
+	${bits_srcdir}/ostream.tcc \
+	${bits_srcdir}/pthread_allocimpl.h \
+	${bits_srcdir}/stream_iterator.h \
+	${bits_srcdir}/streambuf_iterator.h \
+	${bits_srcdir}/slice_array.h \
+	${bits_srcdir}/sstream.tcc \
+	${bits_srcdir}/stl_algo.h \
+	${bits_srcdir}/stl_algobase.h \
+	${bits_srcdir}/stl_alloc.h \
+	${bits_srcdir}/stl_bvector.h \
+	${bits_srcdir}/stl_construct.h \
+	${bits_srcdir}/stl_deque.h \
+	${bits_srcdir}/stl_function.h \
+	${bits_srcdir}/stl_heap.h \
+	${bits_srcdir}/stl_iterator.h \
+	${bits_srcdir}/stl_iterator_base_funcs.h \
+	${bits_srcdir}/stl_iterator_base_types.h \
+	${bits_srcdir}/stl_list.h \
+	${bits_srcdir}/stl_map.h \
+	${bits_srcdir}/stl_multimap.h \
+	${bits_srcdir}/stl_multiset.h \
+	${bits_srcdir}/stl_numeric.h \
+	${bits_srcdir}/stl_pair.h \
+	${bits_srcdir}/stl_pthread_alloc.h \
+	${bits_srcdir}/stl_queue.h \
+	${bits_srcdir}/stl_raw_storage_iter.h \
+	${bits_srcdir}/stl_relops.h \
+	${bits_srcdir}/stl_set.h \
+	${bits_srcdir}/stl_stack.h \
+	${bits_srcdir}/stl_tempbuf.h \
+	${bits_srcdir}/stl_threads.h \
+	${bits_srcdir}/stl_tree.h \
+	${bits_srcdir}/stl_uninitialized.h \
+	${bits_srcdir}/stl_vector.h \
+	${bits_srcdir}/streambuf.tcc \
+	${bits_srcdir}/stringfwd.h \
+	${bits_srcdir}/type_traits.h \
+	${bits_srcdir}/valarray_array.h \
+	${bits_srcdir}/valarray_array.tcc \
+	${bits_srcdir}/valarray_before.h \
+	${bits_srcdir}/valarray_after.h \
+	${bits_srcdir}/vector.tcc
 
 
 backward_srcdir = ${glibcpp_srcdir}/include/backward
 backward_builddir = ./backward
-backward_headers =  	${backward_srcdir}/complex.h 	${backward_srcdir}/iomanip.h 	${backward_srcdir}/istream.h 	${backward_srcdir}/ostream.h 	${backward_srcdir}/stream.h 	${backward_srcdir}/streambuf.h 	${backward_srcdir}/algo.h 	${backward_srcdir}/algobase.h 	${backward_srcdir}/alloc.h 	${backward_srcdir}/bvector.h 	${backward_srcdir}/defalloc.h 	${backward_srcdir}/deque.h 	${backward_srcdir}/function.h 	${backward_srcdir}/hash_map.h 	${backward_srcdir}/hash_set.h 	${backward_srcdir}/hashtable.h 	${backward_srcdir}/heap.h 	${backward_srcdir}/iostream.h 	${backward_srcdir}/iterator.h 	${backward_srcdir}/list.h 	${backward_srcdir}/map.h 	${backward_srcdir}/multimap.h 	${backward_srcdir}/new.h 	${backward_srcdir}/multiset.h 	${backward_srcdir}/pair.h 	${backward_srcdir}/queue.h 	${backward_srcdir}/rope.h 	${backward_srcdir}/set.h 	${backward_srcdir}/slist.h 	${backward_srcdir}/stack.h 	${backward_srcdir}/tempbuf.h 	${backward_srcdir}/tree.h 	${backward_srcdir}/vector.h 	${backward_srcdir}/fstream.h 	${backward_srcdir}/strstream 	${backward_srcdir}/backward_warning.h
+backward_headers = \
+	${backward_srcdir}/complex.h \
+	${backward_srcdir}/iomanip.h \
+	${backward_srcdir}/istream.h \
+	${backward_srcdir}/ostream.h \
+	${backward_srcdir}/stream.h \
+	${backward_srcdir}/streambuf.h \
+	${backward_srcdir}/algo.h \
+	${backward_srcdir}/algobase.h \
+	${backward_srcdir}/alloc.h \
+	${backward_srcdir}/bvector.h \
+	${backward_srcdir}/defalloc.h \
+	${backward_srcdir}/deque.h \
+	${backward_srcdir}/function.h \
+	${backward_srcdir}/hash_map.h \
+	${backward_srcdir}/hash_set.h \
+	${backward_srcdir}/hashtable.h \
+	${backward_srcdir}/heap.h \
+	${backward_srcdir}/iostream.h \
+	${backward_srcdir}/iterator.h \
+	${backward_srcdir}/list.h \
+	${backward_srcdir}/map.h \
+	${backward_srcdir}/multimap.h \
+	${backward_srcdir}/new.h \
+	${backward_srcdir}/multiset.h \
+	${backward_srcdir}/pair.h \
+	${backward_srcdir}/queue.h \
+	${backward_srcdir}/rope.h \
+	${backward_srcdir}/set.h \
+	${backward_srcdir}/slist.h \
+	${backward_srcdir}/stack.h \
+	${backward_srcdir}/tempbuf.h \
+	${backward_srcdir}/tree.h \
+	${backward_srcdir}/vector.h \
+	${backward_srcdir}/fstream.h \
+	${backward_srcdir}/strstream \
+	${backward_srcdir}/backward_warning.h
 
 
 ext_srcdir = ${glibcpp_srcdir}/include/ext
 ext_builddir = ./ext
-ext_headers =  	${ext_srcdir}/algorithm 	${ext_srcdir}/enc_filebuf.h 	${ext_srcdir}/stdio_filebuf.h 	${ext_srcdir}/functional 	${ext_srcdir}/hash_map 	${ext_srcdir}/hash_set 	${ext_srcdir}/iterator 	${ext_srcdir}/memory 	${ext_srcdir}/numeric 	${ext_srcdir}/rb_tree 	${ext_srcdir}/rope 	${ext_srcdir}/ropeimpl.h 	${ext_srcdir}/slist 	${ext_srcdir}/stl_hash_fun.h 	${ext_srcdir}/stl_hashtable.h 	${ext_srcdir}/stl_rope.h
+ext_headers = \
+	${ext_srcdir}/algorithm \
+	${ext_srcdir}/enc_filebuf.h \
+	${ext_srcdir}/stdio_filebuf.h \
+	${ext_srcdir}/functional \
+	${ext_srcdir}/hash_map \
+	${ext_srcdir}/hash_set \
+	${ext_srcdir}/iterator \
+	${ext_srcdir}/memory \
+	${ext_srcdir}/numeric \
+	${ext_srcdir}/rb_tree \
+	${ext_srcdir}/rope \
+	${ext_srcdir}/ropeimpl.h \
+	${ext_srcdir}/slist \
+	${ext_srcdir}/stl_hash_fun.h \
+	${ext_srcdir}/stl_hashtable.h \
+	${ext_srcdir}/stl_rope.h
 
 
 # This is the common subset of files that all three "C" header models use.
 c_base_srcdir = @C_INCLUDE_DIR@
 c_base_builddir = .
-c_base_headers =  	${c_base_srcdir}/std_cassert.h 	${c_base_srcdir}/std_cctype.h 	${c_base_srcdir}/std_cerrno.h 	${c_base_srcdir}/std_cfloat.h 	${c_base_srcdir}/std_ciso646.h 	${c_base_srcdir}/std_climits.h 	${c_base_srcdir}/std_clocale.h 	${c_base_srcdir}/std_cmath.h 	${c_base_srcdir}/std_csetjmp.h 	${c_base_srcdir}/std_csignal.h 	${c_base_srcdir}/std_cstdarg.h 	${c_base_srcdir}/std_cstddef.h 	${c_base_srcdir}/std_cstdio.h 	${c_base_srcdir}/std_cstdlib.h 	${c_base_srcdir}/std_cstring.h 	${c_base_srcdir}/std_ctime.h 	${c_base_srcdir}/std_cwchar.h 	${c_base_srcdir}/std_cwctype.h 
-
-c_base_headers_rename =  	cassert 	cctype 	cerrno 	cfloat 	ciso646 	climits 	clocale 	cmath 	csetjmp 	csignal 	cstdarg 	cstddef 	cstdio 	cstdlib 	cstring 	ctime 	cwchar 	cwctype 
+c_base_headers = \
+	${c_base_srcdir}/std_cassert.h \
+	${c_base_srcdir}/std_cctype.h \
+	${c_base_srcdir}/std_cerrno.h \
+	${c_base_srcdir}/std_cfloat.h \
+	${c_base_srcdir}/std_ciso646.h \
+	${c_base_srcdir}/std_climits.h \
+	${c_base_srcdir}/std_clocale.h \
+	${c_base_srcdir}/std_cmath.h \
+	${c_base_srcdir}/std_csetjmp.h \
+	${c_base_srcdir}/std_csignal.h \
+	${c_base_srcdir}/std_cstdarg.h \
+	${c_base_srcdir}/std_cstddef.h \
+	${c_base_srcdir}/std_cstdio.h \
+	${c_base_srcdir}/std_cstdlib.h \
+	${c_base_srcdir}/std_cstring.h \
+	${c_base_srcdir}/std_ctime.h \
+	${c_base_srcdir}/std_cwchar.h \
+	${c_base_srcdir}/std_cwctype.h 
+
+c_base_headers_rename = \
+	cassert \
+	cctype \
+	cerrno \
+	cfloat \
+	ciso646 \
+	climits \
+	clocale \
+	cmath \
+	csetjmp \
+	csignal \
+	cstdarg \
+	cstddef \
+	cstdio \
+	cstdlib \
+	cstring \
+	ctime \
+	cwchar \
+	cwctype 
 
 
 # "C" compatibility headers.
 c_compatibility_srcdir = ${glibcpp_srcdir}/include/c_compatibility
 c_compatibility_builddir = .
-c_compatibility_headers =  	${c_compatibility_srcdir}/assert.h 	${c_compatibility_srcdir}/ctype.h 	${c_compatibility_srcdir}/errno.h 	${c_compatibility_srcdir}/float.h 	${c_compatibility_srcdir}/iso646.h 	${c_compatibility_srcdir}/limits.h 	${c_compatibility_srcdir}/locale.h 	${c_compatibility_srcdir}/math.h 	${c_compatibility_srcdir}/setjmp.h 	${c_compatibility_srcdir}/signal.h 	${c_compatibility_srcdir}/stdarg.h 	${c_compatibility_srcdir}/stddef.h 	${c_compatibility_srcdir}/stdio.h 	${c_compatibility_srcdir}/stdlib.h 	${c_compatibility_srcdir}/string.h 	${c_compatibility_srcdir}/time.h 	${c_compatibility_srcdir}/wchar.h 	${c_compatibility_srcdir}/wctype.h 
-
-@GLIBCPP_C_HEADERS_C_STD_TRUE@c_base_headers_extra = ${c_base_srcdir}/cmath.tcc 
+c_compatibility_headers = \
+	${c_compatibility_srcdir}/assert.h \
+	${c_compatibility_srcdir}/ctype.h \
+	${c_compatibility_srcdir}/errno.h \
+	${c_compatibility_srcdir}/float.h \
+	${c_compatibility_srcdir}/iso646.h \
+	${c_compatibility_srcdir}/limits.h \
+	${c_compatibility_srcdir}/locale.h \
+	${c_compatibility_srcdir}/math.h \
+	${c_compatibility_srcdir}/setjmp.h \
+	${c_compatibility_srcdir}/signal.h \
+	${c_compatibility_srcdir}/stdarg.h \
+	${c_compatibility_srcdir}/stddef.h \
+	${c_compatibility_srcdir}/stdio.h \
+	${c_compatibility_srcdir}/stdlib.h \
+	${c_compatibility_srcdir}/string.h \
+	${c_compatibility_srcdir}/time.h \
+	${c_compatibility_srcdir}/wchar.h \
+	${c_compatibility_srcdir}/wctype.h 
+
+@GLIBCPP_C_HEADERS_C_STD_TRUE@c_base_headers_extra = @GLIBCPP_C_HEADERS_C_STD_TRUE@${c_base_srcdir}/cmath.tcc 
 @GLIBCPP_C_HEADERS_C_STD_FALSE@c_base_headers_extra = 
-@GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${c_compatibility_headers}
+@GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = @GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE@${c_compatibility_headers}
 @GLIBCPP_C_HEADERS_COMPATIBILITY_FALSE@c_compatibility_headers_extra = 
 
 target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
 target_builddir = ./${target_alias}/bits
-target_headers =  	${target_srcdir}/ctype_base.h 	${target_srcdir}/ctype_inline.h 	${target_srcdir}/ctype_noninline.h 	${target_srcdir}/os_defines.h 	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h 
+target_headers = \
+	${target_srcdir}/ctype_base.h \
+	${target_srcdir}/ctype_inline.h \
+	${target_srcdir}/ctype_noninline.h \
+	${target_srcdir}/os_defines.h \
+	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h 
 
 
 # Non-installed target_header files.
-target_headers_noinst =  	${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@
+target_headers_noinst = \
+	${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@
 
 
 # These target_headers_extra files are all built with ad hoc naming rules.
-target_headers_extra =  	${target_builddir}/basic_file.h 	${target_builddir}/c++config.h 	${target_builddir}/c++io.h 	${target_builddir}/c++locale.h 	${target_builddir}/messages_members.h 	${target_builddir}/time_members.h 	${target_builddir}/codecvt_specializations.h
+target_headers_extra = \
+	${target_builddir}/basic_file.h \
+	${target_builddir}/c++config.h \
+	${target_builddir}/c++io.h \
+	${target_builddir}/c++locale.h \
+	${target_builddir}/messages_members.h \
+	${target_builddir}/time_members.h \
+	${target_builddir}/codecvt_specializations.h
 
 
-thread_target_headers =  	${target_builddir}/gthr.h 	${target_builddir}/gthr-single.h 	${target_builddir}/gthr-posix.h 	${target_builddir}/gthr-default.h
+thread_target_headers = \
+	${target_builddir}/gthr.h \
+	${target_builddir}/gthr-single.h \
+	${target_builddir}/gthr-posix.h \
+	${target_builddir}/gthr-default.h
 
 
 pch_input = ${target_builddir}/stdc++.h
 pch_output_builddir = ${target_builddir}/stdc++.h.gch
 pch_source = ${glibcpp_srcdir}/include/stdc++.h
 PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
-@GLIBCPP_BUILD_PCH_TRUE@pch_build = ${pch_input}
+@GLIBCPP_BUILD_PCH_TRUE@pch_build = @GLIBCPP_BUILD_PCH_TRUE@${pch_input}
 @GLIBCPP_BUILD_PCH_FALSE@pch_build = 
-@GLIBCPP_BUILD_PCH_TRUE@pch_install = install-pch
+@GLIBCPP_BUILD_PCH_TRUE@pch_install = @GLIBCPP_BUILD_PCH_TRUE@install-pch
 @GLIBCPP_BUILD_PCH_FALSE@pch_install = 
 
 # List of all timestamp files.  By keeping only one copy of this list, both
 # CLEANFILES and all-local are kept up-to-date.
-allstamped =  	stamp-std stamp-bits stamp-c_base stamp-c_compatibility 	stamp-backward stamp-ext stamp-target 
+allstamped = \
+	stamp-std stamp-bits stamp-c_base stamp-c_compatibility \
+	stamp-backward stamp-ext stamp-target 
 
 
 # List of all files that are created by explicit building, editing, or
 # catenation.
-allcreated =  	${target_builddir}/c++config.h 	${thread_target_headers} 	${pch_build}
+allcreated = \
+	${target_builddir}/c++config.h \
+	${thread_target_headers} \
+	${pch_build}
 
 
 # Target includes for threads
@@ -243,7 +496,7 @@ uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 gxx_include_dir = @gxx_include_dir@
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = *.gch 
+CLEANFILES = ${pch_input} ${pch_output_builddir}/*
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in