From 8257689adf2d3905399d735fe245783d50efb1e3 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@gnu.org>
Date: Sun, 30 Aug 1998 15:18:44 -0600
Subject: [PATCH] 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
---
 libstdc++/config/aix.ml       | 5 +++--
 libstdc++/config/dec-osf.ml   | 2 +-
 libstdc++/config/elfshlibm.ml | 2 +-
 libstdc++/config/hpux.ml      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libstdc++/config/aix.ml b/libstdc++/config/aix.ml
index cd968705e70..dec7a905a34 100644
--- 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 618c6c89fad..a11f373d84c 100644
--- 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 fe2bf3f93bd..826f0bc0917 100644
--- 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 1531fe867f1..a39602a6403 100644
--- 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)
-- 
2.30.2