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

#
	* 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: r22117

5 files changed, 10 insertions, 5 deletions

diff --git a/libstdc++/config/elf.ml b/libstdc++/config/elf.ml
index 2a5f336..bd711de 100644
--- a/libstdc++/config/elf.ml
+++ b/libstdc++/config/elf.ml
@@ -1,7 +1,7 @@
 # Elf without shared libm -- we have to link with the archive library, even
 # for programs that don't use complex.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 SHFLAGS = -h $(SHLIB)
 DEPLIBS = ../$(SHLIB)
 LDLIBS  = -L.. -lstdc++ -lm
diff --git a/libstdc++/config/irix5.ml b/libstdc++/config/irix5.ml
index 6b33445..055c832 100644
--- a/libstdc++/config/irix5.ml
+++ b/libstdc++/config/irix5.ml
@@ -1,6 +1,6 @@
 # We don't need -fpic on IRIX, 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/linux.ml b/libstdc++/config/linux.ml
index 7e6eece..14dcb45 100644
--- a/libstdc++/config/linux.ml
+++ b/libstdc++/config/linux.ml
@@ -1,6 +1,11 @@
 # Elf with shared libm, so we can link it into the shared libstdc++.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK) mshlink
+ARLIB   = libstdc++-$(LIBSTDCXX_INTERFACE)$(LIBC_INTERFACE)$(CXX_INTERFACE)-$(VERSION).a
+MARLINK = libstdc++$(LIBC_INTERFACE)$(CXX_INTERFACE).a.$(LIBSTDCXX_INTERFACE)
+SHLIB   = libstdc++-$(LIBSTDCXX_INTERFACE)$(LIBC_INTERFACE)$(CXX_INTERFACE)-$(VERSION).so
+MSHLINK = libstdc++$(LIBC_INTERFACE)$(CXX_INTERFACE).so.$(LIBSTDCXX_INTERFACE)
+
+LIBS    = $(ARLIB) marlink $(ARLINK) $(SHLIB) mshlink $(SHLINK)
 SHFLAGS = -Wl,-soname,$(MSHLINK)
 SHDEPS  = -lm
 DEPLIBS = ../$(SHLIB)
diff --git a/libstdc++/config/sol2shm.ml b/libstdc++/config/sol2shm.ml
index f02650c..e87f079 100644
--- a/libstdc++/config/sol2shm.ml
+++ b/libstdc++/config/sol2shm.ml
@@ -1,6 +1,6 @@
 # Solaris2 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/sunos4.ml b/libstdc++/config/sunos4.ml
index 0abc13c..3c5de27 100644
--- a/libstdc++/config/sunos4.ml
+++ b/libstdc++/config/sunos4.ml
@@ -2,7 +2,7 @@
 # library, even for programs that don't use complex.
 # SunOS requires a version number in shared library filenames.
 
-LIBS    = $(ARLIB) $(SHLIB)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB)
 SHFLAGS = $(PICFLAG)
 DEPLIBS = ../$(SHLIB)
 LDLIBS	= -L.. -lstdc++ -lm