Makefile.in (INTERFACE): New, set to 2.

p
	* Makefile.in (INTERFACE): New, set to 2.
	(ARLIB): Set to libstdc++.a.$(VERSION)
	(ARLINK, MARLINK): New macros.
	(LIBS): Add $(ARLINK).
	($(ARLINK), marlink): New targets.
	(install): Don't check $(libsubdir). Handle versioned libraries.
	* config/linux.ml (ARLIB, MARLINK, SHLIB, MSHLINK): New macros.
	(LIBS): Add marlink $(ARLINK).
	* config/aix.ml (ARLIB): Set to libstdc++-ar.a.$(VERSION)
	(ARLINK): New macros.
	(BUILD_LIBS): Add $(ARLINK).
	* config/dec-osf.ml (LIBS): Add $(ARLINK).
	* config/elf.ml (LIBS): Likewise.
	* config/elfshlibm.ml (LIBS): Likewise.
	* config/hpux.ml (LIBS): Likewise.
	* config/iris5.ml (LIBS): Likewise.
	* config/sol2shm.ml (LIBS): Likewise.
	* config/sunos4.ml (LIBS): Likewise.
	* configure.in: Use ${topsrcdir}/config.if to put
	LIBSTDCXX_INTERFACE, CXX_INTERFACE, LIBC_INTERFACE in
	${package_makefile_frag}.

From-SVN: r22115

diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index 508f1d5b23408c0a7b3e5ea5b6d689a4fa3458bd..6e614907b56bc938ffc9fdc2c9c687793c8025f9 100644 (file)
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -94,6 +94,13 @@ EXTRA_DISTCLEAN='target-mkfrag'
 
 (. ${srcdir}/${TO_TOPDIR}libio/config.shared) >${package_makefile_frag} 2>${package_makefile_rules_frag}
 
+. ${topsrcdir}/config.if
+echo "
+LIBSTDCXX_INTERFACE=${libstdcxx_interface}
+CXX_INTERFACE=${cxx_interface}
+LIBC_INTERFACE=${libc_interface}
+" >> ${package_makefile_frag}
+
 # post-target:
 
 # If cross-compiling, we install in $(tooldir).