The new bsd.incs.mk is powerful enough to handle this wrinkle.

8 files changed, 100 insertions, 213 deletions

diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 5e29228..be99457 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -50,13 +50,105 @@ strstream-fixed.cc:	${SRCDIR}/src/strstream.cc
 
 CLEANFILES+=	strstream-fixed.cc
 
-INCSDIR=	${INCLUDEDIR}/g++
-BUILDHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
-
-BASELINKS!=	awk '$$0 !~ /^\#/ {print "include/" $$1, $$2}' ${.CURDIR}/includes.map
-CONFIGLINKS!=	awk '$$0 !~ /^\#/ {print "config/" $$1, $$2}' ${.CURDIR}/configs.map
-CPULINKS!=	awk '$$0 !~ /^\#/ {print "config/" $$1, $$2}' ${.CURDIR}/${MACHINE_ARCH}.map
-INCLUDES=	${BASELINKS} ${CONFIGLINKS} ${CPULINKS}
+INCSGROUPS=	BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
+		TARGETHDRS THRHDRS
+
+BITSHDRS=	basic_ios.h basic_ios.tcc basic_string.h basic_string.tcc \
+		boost_concept_check.h char_traits.h codecvt.h concept_check.h \
+		cpp_type_traits.h fpos.h fstream.tcc functexcept.h \
+		generic_shadow.h gslice.h gslice_array.h indirect_array.h \
+		ios_base.h istream.tcc locale_facets.h locale_facets.tcc \
+		localefwd.h mask_array.h ostream.tcc pthread_allocimpl.h \
+		slice.h slice_array.h sstream.tcc stl_algo.h stl_algobase.h \
+		stl_alloc.h stl_bvector.h stl_construct.h stl_deque.h \
+		stl_function.h stl_heap.h stl_iterator.h \
+		stl_iterator_base_funcs.h stl_iterator_base_types.h \
+		stl_list.h stl_map.h stl_multimap.h stl_multiset.h \
+		stl_numeric.h stl_pair.h stl_pthread_alloc.h stl_queue.h \
+		stl_raw_storage_iter.h stl_relops.h stl_set.h stl_stack.h \
+		stl_tempbuf.h stl_threads.h stl_tree.h stl_uninitialized.h \
+		stl_vector.h stream_iterator.h streambuf.tcc \
+		streambuf_iterator.h stringfwd.h type_traits.h \
+		valarray_array.h valarray_array.tcc valarray_meta.h
+BITSHDRS:=	${BITSHDRS:S;^;${SRCDIR}/include/bits/;}
+BITSHDRSDIR=	${INCLUDEDIR}/g++/bits
+
+BKWHDRS=	algo.h algobase.h alloc.h backward_warning.h bvector.h \
+		complex.h defalloc.h deque.h fstream.h function.h \
+		hash_map.h hash_set.h hashtable.h heap.h iomanip.h \
+		iostream.h istream.h iterator.h list.h map.h multimap.h \
+		multiset.h new.h ostream.h pair.h queue.h rope.h set.h \
+		slist.h stack.h stream.h streambuf.h strstream strstream.h \
+		tempbuf.h tree.h vector.h
+BKWHDRS:=	${BKWHDRS:S;^;${SRCDIR}/include/backward/;}
+BKWHDRSDIR=	${INCLUDEDIR}/g++/backward
+
+EXTHDRS=	algorithm enc_filebuf.h functional hash_map hash_set \
+		iterator memory numeric rb_tree rope ropeimpl.h slist \
+		stdio_filebuf.h stl_hash_fun.h stl_hashtable.h stl_rope.h
+EXTHDRS:=	${EXTHDRS:S;^;${SRCDIR}/include/ext/;}
+EXTHDRSDIR=	${INCLUDEDIR}/g++/ext
+
+# This is the common subset of files that all three "C" header models use.
+BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
+		std_ciso646.h std_climits.h std_clocale.h std_cmath.h \
+		std_csetjmp.h std_csignal.h std_cstdarg.h std_cstddef.h \
+		std_cstdio.h std_cstdlib.h std_cstring.h std_ctime.h \
+		std_cwchar.h std_cwctype.h
+.for h in ${BASEHDRS}
+BASEHDRSNAME_$h=${h:R:S;^std_;;}
+.endfor
+BASEHDRS:=	${BASEHDRS:S;^;${SRCDIR}/include/c_std/;}
+BASEHDRSDIR=	${INCLUDEDIR}/g++
+
+# Some of the different "C" header models need extra files.
+BASEXHDRS=	${SRCDIR}/include/c_std/cmath.tcc
+BASEXHDRSDIR=	${INCLUDEDIR}/g++/bits
+
+STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
+		std_fstream.h std_functional.h std_iomanip.h std_ios.h \
+		std_iosfwd.h std_iostream.h std_istream.h std_iterator.h \
+		std_limits.h std_list.h std_locale.h std_map.h std_memory.h \
+		std_numeric.h std_ostream.h std_queue.h std_set.h \
+		std_sstream.h std_stack.h std_stdexcept.h std_streambuf.h \
+		std_string.h std_utility.h std_valarray.h std_vector.h
+.for h in ${STDHDRS}
+STDHDRSNAME_$h=${h:R:S;^std_;;}
+.endfor
+STDHDRS:=	${STDHDRS:S;^;${SRCDIR}/include/std/;}
+STDHDRSDIR=	${INCLUDEDIR}/g++
+
+TARGETHDRS=	io/basic_file_stdio.h io/c_io_stdio.h \
+		locale/generic/c_locale.h \
+		locale/generic/codecvt_specializations.h \
+		locale/generic/messages_members.h \
+		os/bsd/freebsd/bits/ctype_base.h \
+		os/bsd/freebsd/bits/ctype_inline.h \
+		os/bsd/freebsd/bits/ctype_noninline.h \
+		os/bsd/freebsd/bits/os_defines.h
+TARGETHDRS:=	${TARGETHDRS:S;^;${SRCDIR}/config/;}
+TARGETHDRS+=	${.CURDIR}/c++config.h
+TARGETHDRSNAME_basic_file_stdio.h= basic_file.h
+TARGETHDRSNAME_c_io_stdio.h= c++io.h
+TARGETHDRSNAME_c_locale.h= c++locale.h
+TARGETHDRSDIR=	${INCLUDEDIR}/g++/bits
+
+MARCHHDRS=	atomicity.h cpu_limits.h
+.if ${MACHINE_ARCH} == "sparc64"
+MARCHDIR=	${SRCDIR}/config/cpu/sparc/${MACHINE_ARCH}/bits
+.else
+MARCHDIR=	${SRCDIR}/config/cpu/${MACHINE_ARCH}/bits
+.endif
+.for h in ${MARCHHDRS}
+.if exists(${MARCHDIR}/${h})
+TARGETHDRS+=	${MARCHDIR}/${h}
+.else
+TARGETHDRS+=	${SRCDIR}/config/cpu/generic/bits/${h}
+.endif
+.endfor
+
+THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
+THRHDRSDIR=	${INCLUDEDIR}/g++/bits
 
 gthr.h: ${GCCDIR}/gthr.h
 	sed -e '/^#/s/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*\)/_GLIBCPP_\1/g' \
@@ -81,21 +173,6 @@ gthr-default.h: ${GCCDIR}/gthr-posix.h
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < ${GCCDIR}/gthr-posix.h > gthr-default.h
 
-CLEANFILES+=	${BUILDHDRS}
-buildincludes:	${BUILDHDRS}
-
-installincludes:
-	@set ${INCLUDES}; \
-	while test $$# -ge 2; do \
-		l=${SRCDIR}/$$1; \
-		shift; \
-		t=$$1; \
-		shift; \
-		${ECHO} $$l -\> ${DESTDIR}${INCSDIR}/$$t; \
-		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		     $$l ${DESTDIR}${INCSDIR}/$$t; \
-	done; true
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    ${BUILDHDRS} ${.CURDIR}/c++config.h ${DESTDIR}${INCSDIR}/bits
+CLEANFILES+=	${THRHDRS}
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libstdc++/alpha.map b/gnu/lib/libstdc++/alpha.map
deleted file mode 100644
index 4865ef5..0000000
--- a/gnu/lib/libstdc++/alpha.map
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-cpu/alpha/bits/atomicity.h	bits/atomicity.h
-cpu/alpha/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/configs.map b/gnu/lib/libstdc++/configs.map
deleted file mode 100644
index 7f6cb86..0000000
--- a/gnu/lib/libstdc++/configs.map
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-io/basic_file_stdio.h				bits/basic_file.h
-io/c_io_stdio.h					bits/c++io.h
-locale/generic/c_locale.h			bits/c++locale.h
-locale/generic/codecvt_specializations.h	bits/codecvt_specializations.h
-locale/generic/messages_members.h		bits/messages_members.h
-os/bsd/freebsd/bits/ctype_base.h		bits/ctype_base.h
-os/bsd/freebsd/bits/ctype_inline.h		bits/ctype_inline.h
-os/bsd/freebsd/bits/ctype_noninline.h		bits/ctype_noninline.h
-os/bsd/freebsd/bits/os_defines.h		bits/os_defines.h
diff --git a/gnu/lib/libstdc++/i386.map b/gnu/lib/libstdc++/i386.map
deleted file mode 100644
index d4e0837..0000000
--- a/gnu/lib/libstdc++/i386.map
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-cpu/i386/bits/atomicity.h	bits/atomicity.h
-cpu/i386/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/ia64.map b/gnu/lib/libstdc++/ia64.map
deleted file mode 100644
index 931668d..0000000
--- a/gnu/lib/libstdc++/ia64.map
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-cpu/ia64/bits/atomicity.h	bits/atomicity.h
-cpu/ia64/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/includes.map b/gnu/lib/libstdc++/includes.map
deleted file mode 100644
index 77d69b2..0000000
--- a/gnu/lib/libstdc++/includes.map
+++ /dev/null
@@ -1,165 +0,0 @@
-# $FreeBSD$
-backward/algo.h			backward/algo.h
-backward/algobase.h		backward/algobase.h
-backward/alloc.h		backward/alloc.h
-backward/backward_warning.h	backward/backward_warning.h
-backward/bvector.h		backward/bvector.h
-backward/complex.h		backward/complex.h
-backward/defalloc.h		backward/defalloc.h
-backward/deque.h		backward/deque.h
-backward/fstream.h		backward/fstream.h
-backward/function.h		backward/function.h
-backward/hash_map.h		backward/hash_map.h
-backward/hash_set.h		backward/hash_set.h
-backward/hashtable.h		backward/hashtable.h
-backward/heap.h			backward/heap.h
-backward/iomanip.h		backward/iomanip.h
-backward/iostream.h		backward/iostream.h
-backward/istream.h		backward/istream.h
-backward/iterator.h		backward/iterator.h
-backward/list.h			backward/list.h
-backward/map.h			backward/map.h
-backward/multimap.h		backward/multimap.h
-backward/multiset.h		backward/multiset.h
-backward/new.h			backward/new.h
-backward/ostream.h		backward/ostream.h
-backward/pair.h			backward/pair.h
-backward/queue.h		backward/queue.h
-backward/rope.h			backward/rope.h
-backward/set.h			backward/set.h
-backward/slist.h		backward/slist.h
-backward/stack.h		backward/stack.h
-backward/stream.h		backward/stream.h
-backward/streambuf.h		backward/streambuf.h
-backward/strstream		backward/strstream
-backward/strstream.h		backward/strstream.h
-backward/tempbuf.h		backward/tempbuf.h
-backward/tree.h			backward/tree.h
-backward/vector.h		backward/vector.h
-bits/basic_ios.h		bits/basic_ios.h
-bits/basic_ios.tcc		bits/basic_ios.tcc
-bits/basic_string.h		bits/basic_string.h
-bits/basic_string.tcc		bits/basic_string.tcc
-bits/boost_concept_check.h	bits/boost_concept_check.h
-bits/char_traits.h		bits/char_traits.h
-bits/codecvt.h			bits/codecvt.h
-bits/concept_check.h		bits/concept_check.h
-bits/cpp_type_traits.h		bits/cpp_type_traits.h
-bits/fpos.h			bits/fpos.h
-bits/fstream.tcc		bits/fstream.tcc
-bits/functexcept.h		bits/functexcept.h
-bits/generic_shadow.h		bits/generic_shadow.h
-bits/gslice.h			bits/gslice.h
-bits/gslice_array.h		bits/gslice_array.h
-bits/indirect_array.h		bits/indirect_array.h
-bits/ios_base.h			bits/ios_base.h
-bits/istream.tcc		bits/istream.tcc
-bits/locale_facets.h		bits/locale_facets.h
-bits/locale_facets.tcc		bits/locale_facets.tcc
-bits/localefwd.h		bits/localefwd.h
-bits/mask_array.h		bits/mask_array.h
-bits/ostream.tcc		bits/ostream.tcc
-bits/pthread_allocimpl.h	bits/pthread_allocimpl.h
-bits/slice.h			bits/slice.h
-bits/slice_array.h		bits/slice_array.h
-bits/sstream.tcc		bits/sstream.tcc
-bits/stl_algo.h			bits/stl_algo.h
-bits/stl_algobase.h		bits/stl_algobase.h
-bits/stl_alloc.h		bits/stl_alloc.h
-bits/stl_bvector.h		bits/stl_bvector.h
-bits/stl_construct.h		bits/stl_construct.h
-bits/stl_deque.h		bits/stl_deque.h
-bits/stl_function.h		bits/stl_function.h
-bits/stl_heap.h			bits/stl_heap.h
-bits/stl_iterator.h		bits/stl_iterator.h
-bits/stl_iterator_base_funcs.h	bits/stl_iterator_base_funcs.h
-bits/stl_iterator_base_types.h	bits/stl_iterator_base_types.h
-bits/stl_list.h			bits/stl_list.h
-bits/stl_map.h			bits/stl_map.h
-bits/stl_multimap.h		bits/stl_multimap.h
-bits/stl_multiset.h		bits/stl_multiset.h
-bits/stl_numeric.h		bits/stl_numeric.h
-bits/stl_pair.h			bits/stl_pair.h
-bits/stl_pthread_alloc.h	bits/stl_pthread_alloc.h
-bits/stl_queue.h		bits/stl_queue.h
-bits/stl_raw_storage_iter.h	bits/stl_raw_storage_iter.h
-bits/stl_relops.h		bits/stl_relops.h
-bits/stl_set.h			bits/stl_set.h
-bits/stl_stack.h		bits/stl_stack.h
-bits/stl_tempbuf.h		bits/stl_tempbuf.h
-bits/stl_threads.h		bits/stl_threads.h
-bits/stl_tree.h			bits/stl_tree.h
-bits/stl_uninitialized.h	bits/stl_uninitialized.h
-bits/stl_vector.h		bits/stl_vector.h
-bits/stream_iterator.h		bits/stream_iterator.h
-bits/streambuf.tcc		bits/streambuf.tcc
-bits/streambuf_iterator.h	bits/streambuf_iterator.h
-bits/stringfwd.h		bits/stringfwd.h
-bits/type_traits.h		bits/type_traits.h
-bits/valarray_array.h		bits/valarray_array.h
-bits/valarray_array.tcc		bits/valarray_array.tcc
-bits/valarray_meta.h		bits/valarray_meta.h
-c_std/cmath.tcc			bits/cmath.tcc
-c_std/std_cassert.h		cassert
-c_std/std_cctype.h		cctype
-c_std/std_cerrno.h		cerrno
-c_std/std_cfloat.h		cfloat
-c_std/std_ciso646.h		ciso646
-c_std/std_climits.h		climits
-c_std/std_clocale.h		clocale
-c_std/std_cmath.h		cmath
-c_std/std_csetjmp.h		csetjmp
-c_std/std_csignal.h		csignal
-c_std/std_cstdarg.h		cstdarg
-c_std/std_cstddef.h		cstddef
-c_std/std_cstdio.h		cstdio
-c_std/std_cstdlib.h		cstdlib
-c_std/std_cstring.h		cstring
-c_std/std_ctime.h		ctime
-c_std/std_cwchar.h		cwchar
-c_std/std_cwctype.h		cwctype
-ext/algorithm			ext/algorithm
-ext/enc_filebuf.h		ext/enc_filebuf.h
-ext/functional			ext/functional
-ext/hash_map			ext/hash_map
-ext/hash_set			ext/hash_set
-ext/iterator			ext/iterator
-ext/memory			ext/memory
-ext/numeric			ext/numeric
-ext/rb_tree			ext/rb_tree
-ext/rope			ext/rope
-ext/ropeimpl.h			ext/ropeimpl.h
-ext/slist			ext/slist
-ext/stdio_filebuf.h		ext/stdio_filebuf.h
-ext/stl_hash_fun.h		ext/stl_hash_fun.h
-ext/stl_hashtable.h		ext/stl_hashtable.h
-ext/stl_rope.h			ext/stl_rope.h
-std/std_algorithm.h		algorithm
-std/std_bitset.h		bitset
-std/std_complex.h		complex
-std/std_deque.h			deque
-std/std_fstream.h		fstream
-std/std_functional.h		functional
-std/std_iomanip.h		iomanip
-std/std_ios.h			ios
-std/std_iosfwd.h		iosfwd
-std/std_iostream.h		iostream
-std/std_istream.h		istream
-std/std_iterator.h		iterator
-std/std_limits.h		limits
-std/std_list.h			list
-std/std_locale.h		locale
-std/std_map.h			map
-std/std_memory.h		memory
-std/std_numeric.h		numeric
-std/std_ostream.h		ostream
-std/std_queue.h			queue
-std/std_set.h			set
-std/std_sstream.h		sstream
-std/std_stack.h			stack
-std/std_stdexcept.h		stdexcept
-std/std_streambuf.h		streambuf
-std/std_string.h		string
-std/std_utility.h		utility
-std/std_valarray.h		valarray
-std/std_vector.h		vector
diff --git a/gnu/lib/libstdc++/powerpc.map b/gnu/lib/libstdc++/powerpc.map
deleted file mode 100644
index 9d9c1c9..0000000
--- a/gnu/lib/libstdc++/powerpc.map
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-cpu/powerpc/bits/atomicity.h	bits/atomicity.h
-cpu/powerpc/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/sparc64.map b/gnu/lib/libstdc++/sparc64.map
deleted file mode 100644
index 5b9ccba..0000000
--- a/gnu/lib/libstdc++/sparc64.map
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-cpu/sparc/sparc64/bits/atomicity.h	bits/atomicity.h
-cpu/generic/bits/cpu_limits.h		bits/cpu_limits.h