3 files changed, 24 insertions, 33 deletions
diff --git a/gnu/lib/libgmp/Makefile b/gnu/lib/libgmp/Makefile
index 37e390f392c3..4621b00710b2 100644
--- a/gnu/lib/libgmp/Makefile
+++ b/gnu/lib/libgmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.20 1998/12/16 04:59:53 imp Exp $
+# $Id: Makefile,v 1.18 1998/05/24 21:51:50 eivind Exp $
 #
 
 LIB=	gmp
@@ -23,13 +23,6 @@ CFLAGS+=	-I${GMPDIR}/mpn/x86
 
 MPN_SRC_ASM=	add_n.S addmul_1.S lshift.S mul_1.S rshift.S sub_n.S submul_1.S
 
-.elif ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
-.PATH:		${GMPDIR}/mpn/mips3 ${GMPDIR}/mpn/generic
-
-CFLAGS+=	-I${GMPDIR}/mpn/mips3
-
-MPN_SRC_ASM=	add_n.s addmul_1.s lshift.s mul_1.s rshift.s sub_n.s submul_1.s
-
 .elif ${MACHINE_ARCH} == "m68k"
 .PATH:		${GMPDIR}/mpn/m68k ${GMPDIR}/mpn/generic
 
@@ -143,5 +136,18 @@ beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${GMPDIR}/gmp.h ${DESTDIR}/usr/include
 
+.S.o:
+	${CC} ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+
+.s.o:
+	${AS} ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+
+.S.po:
+	${CC} -DPROF ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+
+.S.so:
+	${CC} -fpic -DPIC ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+	@${LD} -O ${.TARGET} -x -r ${.TARGET}
+
 .include "Makefile.inc"
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile
index 5f922d26d9a4..f0c1eece40ce 100644
--- a/gnu/lib/libmp/Makefile
+++ b/gnu/lib/libmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.16 1998/08/30 01:57:55 jb Exp $
+# $Id: Makefile,v 1.15 1998/05/15 06:42:37 jb Exp $
 #
 
 LIB=	mp
@@ -22,13 +22,6 @@ CFLAGS+=	-I${GMPDIR}/mpn/x86 -I${GMPDIR}/mpz -DBERKELEY_MP
 
 MPN_SRC_ASM=	add_n.S addmul_1.S lshift.S mul_1.S rshift.S sub_n.S submul_1.S
 
-.elif ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
-.PATH:		${GMPDIR} ${GMPDIR}/mpn ${GMPDIR}/mpn/mips3 ${GMPDIR}/mpn/generic \
-		${GMPDIR}/mpbsd
-
-CFLAGS+=	-I${GMPDIR}/mpn/mips3 -I${GMPDIR}/mpz -DBERKELEY_MP
-
-MPN_SRC_ASM=	add_n.s addmul_1.s lshift.s mul_1.s rshift.s sub_n.s submul_1.s
 .elif ${MACHINE_ARCH} == "m68k"
 .PATH:		${GMPDIR} ${GMPDIR}/mpn ${GMPDIR}/mpn/m68k ${GMPDIR}/mpn/generic \
 		${GMPDIR}/mpbsd
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index b8059d4231fa..891dfa3d7e3d 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.11 1998/12/27 17:25:27 bde Exp $
+# $Id: Makefile,v 1.9 1998/03/20 15:10:59 bde Exp $
 #
 
 GPPDIR=	${.CURDIR}/../../../contrib/libg++
@@ -93,40 +93,32 @@ beforeinstall:
 
 # ======== typeinfoi.o, stdexcepti.o ========
 .for file in typeinfoi stdexcepti
-CLEANFILES+=	${file}.o.tmp ${file}.po.tmp ${file}.so.tmp
 ${file}.o: ${file}.cc
 	${CXX} ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
-	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
-	@mv ${.TARGET}.tmp ${.TARGET}
+	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
-${file}.So: ${file}.cc
+${file}.so: ${file}.cc
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
-	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
-	@mv ${.TARGET}.tmp ${.TARGET}
+	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 ${file}.po: ${file}.cc
 	${CXX} -p ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
-	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
-	@mv ${.TARGET}.tmp ${.TARGET}
+	@${LD} -O ${.TARGET} -X -r ${.TARGET}
 .endfor
 
 # ======== exceptioni.o ========
 .for file in exceptioni
-CLEANFILES+=	${file}.o.tmp ${file}.po.tmp ${file}.so.tmp
 ${file}.o: ${file}.cc
 	${CXX} ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET}
-	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
-	@mv ${.TARGET}.tmp ${.TARGET}
+	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
-${file}.So: ${file}.cc
+${file}.so: ${file}.cc
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET}
-	@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
-	@mv ${.TARGET}.tmp ${.TARGET}
+	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 ${file}.po: ${file}.cc
 	${CXX} -p ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET}
-	@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
-	@mv ${.TARGET}.tmp ${.TARGET}
+	@${LD} -O ${.TARGET} -X -r ${.TARGET}
 .endfor
 
 # ======== cstrmain.o ========