Clean-up clean target.

Remove old stuff (duplicates)
and misleading LIBIBERTY setting (handled by the x-openbsd fragment)

1 files changed, 15 insertions, 28 deletions

diff --git a/gnu/egcs/gcc/Makefile.bsd-wrapper b/gnu/egcs/gcc/Makefile.bsd-wrapper
index 1c5a0b1aa7c..7906a8d343a 100644
--- a/gnu/egcs/gcc/Makefile.bsd-wrapper
+++ b/gnu/egcs/gcc/Makefile.bsd-wrapper
@@ -1,19 +1,24 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.2 1999/05/28 01:20:53 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.3 1999/05/28 16:15:12 espie Exp $
 
 MAN=		cccp.1 gcc.1 
 MLINKS+=	gcc.1 cc.1
 MLINKS+=	cccp.1 cpp.1
 
-.if !defined(BOOTSTRAP)
+.if defined(BOOTSTRAP)
+LANGUAGES=--enable-languages=c
+.else
+LANGUAGES=--enable-languages='c,c++,objc,f77' 
 MAN+= cp/g++.1 f/g77.1
 MLINKS+=	g++.1 c++.1
 .endif
 
-GPP_INC_DIR=	/usr/include/g++
+GXX_INCDIR=	/usr/include/g++
 GNUCFLAGS=	CFLAGS="${CFLAGS} ${COPTS} -DOPENBSD_NATIVE"
-CLEANFILES=	.gdbinit cp/.gdbinit *.info* bi-parser.c bi-parser.h \
+CLEANFILES=	.gdbinit */.gdbinit *.info* \
 		c-parse.c c-parse.h c-parse.y cexp.c cp/parse.c cp/parse.h \
-		f/.gdbinit f/*.info* objc-parse.c objc-parse.y target_path
+		f/*.info* objc-parse.c objc-parse.y target_path \
+		genrtl.c genrtl.h fixinc.sh fixinc/Makefile \
+		po/Makefile  po/Makefile.in  po/POTFILES
 
 CXX_HEADERS=	${.CURDIR}/cp/inc/typeinfo ${.CURDIR}/cp/inc/exception \
 		${.CURDIR}/cp/inc/new ${.CURDIR}/cp/inc/new.h
@@ -26,11 +31,6 @@ M_ARCH=		mips
 M_ARCH=		${MACHINE_ARCH}
 .endif
 
-.if defined(BOOTSTRAP)
-LANGUAGES=--enable-languages=c
-.else
-LANGUAGES=--enable-languages='c,c++,objc,f77' 
-.endif
 
 GCCARCH=	${M_ARCH}-unknown-openbsd`uname -r`
 
@@ -55,18 +55,6 @@ CF=	--cache-file=${GLOBAL_AUTOCONF_CACHE}
 CF=
 .endif
 
-config: .FORCE
-.ifndef GLOBAL_AUTOCONF_CACHE
-	-rm -f config.cache
-.endif
-	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
-	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-	/bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
-		--prefix=/usr -mandir='$$(prefix)/share/man' \
-		--with-local-prefix=/usr ${CF} \
-		${LANGUAGES} --enable-cpp --disable-nls \
-		--with-gxx-include-dir=${GPP_INC_DIR} ${GCCARCH}
-
 config.status: Makefile.in configure c-parse.in
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
@@ -74,14 +62,14 @@ config.status: Makefile.in configure c-parse.in
 		--prefix=/usr --mandir='$$(prefix)/share/man' \
 		--with-local-prefix=/usr ${CF} \
 		${LANGUAGES} --enable-cpp --disable-nls \
-		--with-gxx-include-dir=${GPP_INC_DIR} ${GCCARCH} && touch config.status
+		--with-gxx-include-dir=${GXX_INCDIR} ${GCCARCH} && touch config.status
 
 includes:
 	@-for i in ${CXX_HEADERS}; do \
 		j=`basename $$i` \
-		cmp -s $$i ${DESTDIR}/${GPP_INC_DIR}/$$j || \
+		cmp -s $$i ${DESTDIR}/${GXX_INCDIR}/$$j || \
 		    ${INSTALL} ${INSTALL_COPY} -m 444 $$i \
-		    ${DESTDIR}/${GPP_INC_DIR}; \
+		    ${DESTDIR}/${GXX_INCDIR}; \
 	done
 
 .ifdef NOMAN
@@ -105,7 +93,6 @@ install:	maninstall target_path
 		infodir=${DESTDIR}/usr/share/info \
 		build_infodir=. \
 		tooldir=/tmp assertdir=/tmp \
-		LIBIBERTY=-liberty \
 		INSTALL_TARGET='install-common $$(INSTALL_HEADERS) \
 		     $$(INSTALL_LIBGCC) install-info \
 		     intl.install lang.install-normal' \
@@ -131,9 +118,9 @@ install:	maninstall target_path
 #	ln -fs `cat target-path`/cpp \
 #		${DESTDIR}/usr/libexec
 
-clean cleandir:
-	rm -f ${CLEANFILES}
+clean cleandir: 
 	-@if [ -e Makefile ]; then ${MAKE} distclean; fi
+	-rm -f ${CLEANFILES}
 
 depend:
 	# Nothing here so far...