Remove several explicit rules. The two for exceptioni.o and typeionfoi.o

aren't needed as those files aren't part of libstdc++ any longer.  Another
isn't needed as Cygnus doesn't compile with -frtti.

Noticed by:	bde & my initial mispelling of ".So".
This commit is contained in:
obrien 1999-04-25 16:59:54 +00:00
parent 0db133d0e1
commit 435c4089d3

View File

@ -1,5 +1,5 @@
#
# $Id: Makefile,v 1.18 1999/04/08 09:13:39 obrien Exp $
# $Id: Makefile,v 1.19 1999/04/15 08:08:56 obrien Exp $
#
EGCSDIR= ${.CURDIR}/../../../contrib/egcs
@ -20,8 +20,6 @@ CXXFLAGS+= -nostdinc++ -fno-implicit-templates
LDADD+= -lm
DPADD+= ${LIBM}
DIR= ${EGCSDIR}/libstdc++
HDRS= cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime \
cwchar cwctype fstream iomanip iosfwd iostream stdexcept string \
@ -87,46 +85,6 @@ CLEANFILES+= dummy.h dummy.c dummy.C
# Lots of special cases
# ======== typeinfoi.o, stdexcepti.o ========
.for file in typeinfoi stdexcepti
CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp
${file}.o: ${file}.cc
${CXX} -nostdinc++ ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
${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}
${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}
.endfor
# ======== exceptioni.o ========
.for file in exceptioni
CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp
${file}.o: ${file}.cc
${CXX} ${CXXFLAGS} -O0 -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
${file}.So: ${file}.cc
${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -O0 -c ${DIR}/${file}.cc \
-o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
${file}.po: ${file}.cc
${CXX} -p ${CXXFLAGS} -O0 -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
.endfor
# ======== cstrmain.o ========
SRCS+= cstrmain.cc
CLEANFILES+= cstrmain.cc