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

e
	* 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: r22116

diff --git a/libstdc++/config/aix.ml b/libstdc++/config/aix.ml
index cd968705e705265f7a9f49eccae91499aa8fa231..dec7a905a34363b03d5dc5877db6c6020d7c465e 100644 (file)
--- a/libstdc++/config/aix.ml
+++ b/libstdc++/config/aix.ml
@@ -1,8 +1,9 @@
 # AIX has wierd shared/non-shared libraries.
 
-ARLIB   = libstdc++-ar.a 
+ARLIB   = libstdc++-ar.a.$(VERSION)
+ARLINK  = libstdc++-ar.a
 SHLINK   = libstdc++.a
-LIBS     = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS     = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 DEPLIBS  = ../$(SHLIB)
 SHDEPS   = -lm
 SHFLAGS  = -Wl,-unix

diff --git a/libstdc++/config/dec-osf.ml b/libstdc++/config/dec-osf.ml
index 618c6c89fad81b0757a1a3ddff572f7b894ba5aa..a11f373d84c144d69bd2f54b2b63b86d7d8a3a5e 100644 (file)
--- a/libstdc++/config/dec-osf.ml
+++ b/libstdc++/config/dec-osf.ml
@@ -1,6 +1,6 @@
 # We don't need -fpic on the alpha, so let's install both the shared and
 # non-shared versions.
 
-LIBS     = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS     = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 DEPLIBS  = ../$(SHLIB)
 SHDEPS   = -lm

diff --git a/libstdc++/config/elfshlibm.ml b/libstdc++/config/elfshlibm.ml
index fe2bf3f93bd30d32a0750cfc135b257684f8e218..826f0bc0917ed6f7bcb0d8f346c1f41e06343150 100644 (file)
--- a/libstdc++/config/elfshlibm.ml
+++ b/libstdc++/config/elfshlibm.ml
@@ -1,6 +1,6 @@
 # Elf with shared libm, so we can link it into the shared libstdc++.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 SHFLAGS = -h $(SHLIB)
 SHDEPS  = -lm
 DEPLIBS = ../$(SHLIB)

diff --git a/libstdc++/config/hpux.ml b/libstdc++/config/hpux.ml
index 1531fe867f113458b41d2a47857d4d833f7ef0dc..a39602a640323b6cfb0e9a38afcc004872d294d8 100644 (file)
--- a/libstdc++/config/hpux.ml
+++ b/libstdc++/config/hpux.ml
@@ -1,6 +1,6 @@
 # HPUX uses the .sl suffix for shared libraries.
 
 SHLIB   = libstdc++.sl
-LIBS    = $(ARLIB) $(SHLIB)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB)
 DEPLIBS = ../$(SHLIB)
 SHFLAGS = $(PICFLAG)