stl_config.h: Remove file.

2001-02-20  Phil Edwards  <pme@sources.redhat.com>

	* include/bits/stl_config.h:  Remove file.
	* src/Makefile.am (base_headers):  Remove from list.
	* configure:  Regenerate.
	* Makefile.in:  Ditto.
	* libio/Makefile.in:  Ditto.
	* libmath/Makefile.in:  Ditto.
	* libsupc++/Makefile.in:  Ditto.
	* src/Makefile.in:  Ditto.

	* include/bits/c++config:  Move relevant macros to here.
	* include/backward/alloc.h:  Include c++config.h instead.
	* include/backward/function.h:  Ditto.
	* include/backward/heap.h:  Ditto.
	* include/backward/pair.h:  Ditto.
	* include/bits/pthread_allocimpl.h:  Ditto.
	* include/bits/std_functional.h:  Ditto.
	* include/bits/std_iterator.h:  Ditto.
	* include/bits/std_numeric.h:  Ditto.
	* include/bits/std_utility.h:  Ditto.
	* include/bits/stl_algobase.h:  Ditto.
	* include/bits/type_traits.h:  Ditto.
	* src/stl-inst.cc:  Ditto.

From-SVN: r39931

3 files changed, 128 insertions, 31 deletions

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index a5cfa38..6283b5f 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.71 2001/02/07 20:26:24 bkoz Exp $
+## $Id: Makefile.am,v 1.72 2001/02/16 00:43:41 bkoz Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -98,7 +98,7 @@ base_headers = \
 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
 	bits/type_traits.h bits/std_algorithm.h \
 	bits/concept_checks.h bits/container_concepts.h \
-	bits/sequence_concepts.h bits/stl_config.h bits/stl_construct.h
+	bits/sequence_concepts.h bits/stl_construct.h
 
 backward_headers = \
 	backward/complex.h backward/iomanip.h backward/istream.h \
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 7c6ccbe..c515e1c6 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -125,11 +125,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
-CONFIG_CXXFLAGS =  	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
+CONFIG_CXXFLAGS = \
+	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
 
 
 # Warning flags to use.
-WARN_CXXFLAGS =  	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
+WARN_CXXFLAGS = \
+	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
 
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -141,35 +143,121 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
-INCLUDES =  	-nostdinc++ 	-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include 	$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) 	$(TOPLEVEL_INCLUDES)	
-
-
-base_headers =  	bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h 	bits/stringfwd.h bits/std_string.h bits/basic_string.h 	bits/basic_string.tcc 	bits/generic_shadow.h bits/std_utility.h 	bits/std_complex.h 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h 	bits/std_fstream.h bits/std_iomanip.h 	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc 	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h 	bits/std_istream.h bits/istream.tcc bits/std_locale.h 	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc 	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h 	bits/streambuf.tcc bits/basic_file.h 	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h 	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h 	bits/stl_threads.h bits/stl_iterator_base.h 	bits/std_bitset.h bits/std_deque.h bits/std_functional.h 	bits/std_iterator.h bits/std_list.h 	bits/std_map.h bits/std_memory.h bits/std_numeric.h 	bits/std_queue.h bits/std_set.h bits/std_stack.h 	bits/std_stdexcept.h bits/functexcept.h bits/std_vector.h 	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h 	bits/stl_deque.h bits/stl_function.h 	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h 	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h 	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h 	bits/stl_relops.h bits/stl_set.h 	bits/stl_stack.h bits/stl_tempbuf.h 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h 	bits/type_traits.h bits/std_algorithm.h 	bits/concept_checks.h bits/container_concepts.h 	bits/sequence_concepts.h bits/stl_config.h bits/stl_construct.h
-
-
-backward_headers =  	backward/complex.h backward/iomanip.h backward/istream.h 	backward/ostream.h backward/stream.h backward/streambuf.h 	backward/algo.h backward/algobase.h backward/alloc.h 	backward/bvector.h backward/defalloc.h backward/deque.h 	backward/function.h backward/hash_map.h backward/hash_set.h 	backward/hashtable.h backward/heap.h backward/iterator.h 	backward/list.h backward/map.h backward/multimap.h backward/new.h 	backward/multiset.h backward/pair.h backward/iostream.h 	backward/rope.h backward/set.h backward/slist.h backward/stack.h 	backward/tempbuf.h backward/tree.h backward/vector.h 	backward/fstream.h backward/strstream.h backward/strstream
-
-
-ext_headers =  	ext/ropeimpl.h ext/stl_rope.h 	ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h 	ext/hash_map ext/hash_set ext/rope ext/slist 	ext/tree ext/bvector 
-
-
-c_base_headers =  	bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h 	bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h 	bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h 	bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h 	bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h 	bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
-
-@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = 	assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h 	signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h 	wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h 	features.h langinfo.h 	bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h 	bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h 	bits/wrap_features.h bits/wrap_langinfo.h 	sys/cdefs.h 
+INCLUDES = \
+	-nostdinc++ \
+	-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
+	$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
+	$(TOPLEVEL_INCLUDES)	
+
+
+base_headers = \
+	bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
+	bits/stringfwd.h bits/std_string.h bits/basic_string.h \
+	bits/basic_string.tcc \
+	bits/generic_shadow.h bits/std_utility.h \
+	bits/std_complex.h \
+	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
+	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \
+	bits/gslice.h bits/gslice_array.h bits/indirect_array.h \
+	bits/std_fstream.h bits/std_iomanip.h \
+	bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc \
+	bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h \
+	bits/std_istream.h bits/istream.tcc bits/std_locale.h \
+	bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc \
+	bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h \
+	bits/streambuf.tcc bits/basic_file.h \
+	bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h \
+	bits/stl_pthread_alloc.h bits/pthread_allocimpl.h \
+	bits/stl_threads.h bits/stl_iterator_base.h \
+	bits/std_bitset.h bits/std_deque.h bits/std_functional.h \
+	bits/std_iterator.h bits/std_list.h \
+	bits/std_map.h bits/std_memory.h bits/std_numeric.h \
+	bits/std_queue.h bits/std_set.h bits/std_stack.h \
+	bits/std_stdexcept.h bits/functexcept.h bits/std_vector.h \
+	bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h \
+	bits/stl_deque.h bits/stl_function.h \
+	bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h \
+	bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h \
+	bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h \
+	bits/stl_relops.h bits/stl_set.h \
+	bits/stl_stack.h bits/stl_tempbuf.h \
+	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
+	bits/type_traits.h bits/std_algorithm.h \
+	bits/concept_checks.h bits/container_concepts.h \
+	bits/sequence_concepts.h bits/stl_construct.h
+
+
+backward_headers = \
+	backward/complex.h backward/iomanip.h backward/istream.h \
+	backward/ostream.h backward/stream.h backward/streambuf.h \
+	backward/algo.h backward/algobase.h backward/alloc.h \
+	backward/bvector.h backward/defalloc.h backward/deque.h \
+	backward/function.h backward/hash_map.h backward/hash_set.h \
+	backward/hashtable.h backward/heap.h backward/iterator.h \
+	backward/list.h backward/map.h backward/multimap.h backward/new.h \
+	backward/multiset.h backward/pair.h backward/iostream.h \
+	backward/rope.h backward/set.h backward/slist.h backward/stack.h \
+	backward/tempbuf.h backward/tree.h backward/vector.h \
+	backward/fstream.h backward/strstream.h backward/strstream
+
+
+ext_headers = \
+	ext/ropeimpl.h ext/stl_rope.h \
+	ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h \
+	ext/hash_map ext/hash_set ext/rope ext/slist \
+	ext/tree ext/bvector 
+
+
+c_base_headers = \
+	bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h \
+	bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h \
+	bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h \
+	bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h \
+	bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h \
+	bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
+
+@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = @GLIBCPP_USE_CSHADOW_TRUE@\
+@GLIBCPP_USE_CSHADOW_TRUE@	assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	features.h langinfo.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	bits/wrap_features.h bits/wrap_langinfo.h \
+@GLIBCPP_USE_CSHADOW_TRUE@	sys/cdefs.h 
 @GLIBCPP_USE_CSHADOW_FALSE@c_shadow_headers = 
 
-std_headers =  	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 	cassert cctype cerrno cfloat climits clocale ciso646 	cmath csetjmp csignal cstdarg cstddef cstdio cstdlib 	cstring ctime cwchar cwctype
-
-@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = 	$(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
+std_headers = \
+	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 \
+	cassert cctype cerrno cfloat climits clocale ciso646 \
+	cmath csetjmp csignal cstdarg cstddef cstdio cstdlib \
+	cstring ctime cwchar cwctype
+
+@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = @GLIBCPP_NEED_LIBIO_TRUE@\
+@GLIBCPP_NEED_LIBIO_TRUE@	$(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
 @GLIBCPP_NEED_LIBIO_FALSE@libio_headers = 
 
-build_headers =  	bits/std_limits.h 	bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.h 	bits/atomicity.h bits/os_defines.h 	bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h 
+build_headers = \
+	bits/std_limits.h \
+	bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.h \
+	bits/atomicity.h bits/os_defines.h \
+	bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h 
 
 
-sources =  	limitsMEMBERS.cc 	stdexcept.cc functexcept.cc bitset.cc         globals.cc 	c++io.cc ios.cc complex_io.cc strstream.cc 	c++locale.cc locale.cc localename.cc codecvt.cc 	locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
+sources = \
+	limitsMEMBERS.cc \
+	stdexcept.cc functexcept.cc bitset.cc \
+        globals.cc \
+	c++io.cc ios.cc complex_io.cc strstream.cc \
+	c++locale.cc locale.cc localename.cc codecvt.cc \
+	locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
 
 
-wstring_sources =  	wstring-inst.cc
+wstring_sources = \
+	wstring-inst.cc
 
 VPATH =  $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR)  $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
 
@@ -180,13 +268,16 @@ libstdc___la_SOURCES = $(sources)
 
 libinst_wstring_la_SOURCES = $(wstring_sources)
 
-libstdc___la_LIBADD =  	../libmath/libmath.la @libio_la@ 	../libsupc++/libsupc++convenience.la 	@libinst_wstring_la@
+libstdc___la_LIBADD = \
+	../libmath/libmath.la @libio_la@ \
+	../libsupc++/libsupc++convenience.la \
+	@libinst_wstring_la@
 
 
 libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
 
 libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
-@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = $(top_builddir)/stamp-cshadow
+@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = @GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow
 @GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H = 
 
 # Check for various configure bits that change where the headers get installed.
@@ -205,7 +296,12 @@ c_incdir = @C_INCLUDE_DIR@
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion call for it. (ie, --enable-debug)
-AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS) 
+AM_CXXFLAGS = \
+	-fno-implicit-templates \
+	$(LIBSUPCXX_CXXFLAGS) \
+	$(WARN_CXXFLAGS) \
+	$(OPTIMIZE_CXXFLAGS) \
+	$(CONFIG_CXXFLAGS) 
 
 
 # libstdc++ libtool notes
@@ -226,14 +322,16 @@ AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS)
 # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
 # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
 # attempt to infer which configuration to use
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) 	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
+	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
 
 
 # 3) We have a problem when building the shared libstdc++ object if
 # the rules automake generates would be used.  We cannot allow CXX to
 # be used in libtool since this would add -lstdc++ to the link line
 # which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
+	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff --git a/libstdc++-v3/src/stl-inst.cc b/libstdc++-v3/src/stl-inst.cc
index e64e5d0..319aebb 100644
--- a/libstdc++-v3/src/stl-inst.cc
+++ b/libstdc++-v3/src/stl-inst.cc
@@ -32,7 +32,6 @@
 //
 
 #include <bits/c++config.h>
-#include <bits/stl_config.h>
 #include <bits/stl_alloc.h>
 #include <bits/std_vector.h>