From 9dc3ac78a5cfc685256f8d28c38f48964b79a7bf Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 2 Nov 2005 00:34:23 +0000 Subject: Remove the NetBSD specific Makefile.in for bmake. It was not used anyways since yesterday's update (since it overwrites it). --- bootstrap/bootstrap | 7 +-- bootstrap/mods/bmake/Makefile.in | 118 --------------------------------------- 2 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 bootstrap/mods/bmake/Makefile.in diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index b016dd64ea7..ef3fd3dc007 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.42 2005/11/01 01:06:02 reed Exp $ +# $NetBSD: bootstrap,v 1.43 2005/11/02 00:34:23 reed Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -640,11 +640,6 @@ if [ -f mods/mk/$opsys.bsd.sys.mk ]; then run_cmd "$cpprog mods/mk/$opsys.bsd.sys.mk $prefix/share/mk/bsd.sys.mk" fi -case "$opsys" in -NetBSD) run_cmd "$cpprog mods/bmake/Makefile.in ${wrkdir}/bmake/Makefile.in" - ;; -esac - if [ "$need_bsd_install" = "yes" ]; then echo_msg "Installing BSD compatible install script" run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 755 $wrkdir/install-sh $prefix/bin/install-sh" diff --git a/bootstrap/mods/bmake/Makefile.in b/bootstrap/mods/bmake/Makefile.in deleted file mode 100644 index ab28fa158f9..00000000000 --- a/bootstrap/mods/bmake/Makefile.in +++ /dev/null @@ -1,118 +0,0 @@ -# $NetBSD: Makefile.in,v 1.2 2004/08/23 03:44:34 jlam Exp $ -# @(#)Makefile 5.2 (Berkeley) 12/28/90 - -# $Id: Makefile.in,v 1.2 2004/08/23 03:44:34 jlam Exp $ - -# you can use this Makefile if you have an earlier version of bmake. -prefix= @prefix@ -srcdir= @srcdir@ -CC?= @CC@ -BUILD_DATE!= date +%Y%m%d -MAKE_VERSION:= bmake-3.1.12 ${BUILD_DATE} -MACHINE=@machine@ -MACHINE_ARCH=@machine_arch@ - -CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} ${CFLAGS_${.TARGET:T}} -CFLAGS_main.o= "-DMAKE_VERSION=\"${MAKE_VERSION}\"" -LDFLAGS= @LDFLAGS@ -LIBOBJS= @LIBOBJS@ -LDADD= @LIBS@ - -PROG= bmake -SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \ - make.c parse.c str.c suff.c targ.c trace.c var.c util.c -SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \ - lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \ - lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \ - lstInit.c lstInsert.c lstIsAtEnd.c lstIsEmpty.c lstLast.c \ - lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c - -.if !empty(LIBOBJS) -SRCS+= ${LIBOBJS:.o=.c} -.endif - -.PATH: ${srcdir} -.PATH: ${srcdir}/lst.lib - -WFORMAT= 1 -OS!= uname -s -ARCH!= uname -m - -#.if (${OS} == "NetBSD") && make(install) && exists(${DESTDIR}/usr/share/doc) -#SUBDIR= PSD.doc -#.endif - -.if (${OS} != "NetBSD" && ${OS} != "FreeBSD" && ${OS} != "OpenBSD") -# XXX not sure if we still want this given that configure -# lets us force or not the definition of MACHINE. -CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\"" -NOMAN=no -SRCS+= getenv.c -INSTALL?=${srcdir}/install-sh -.if (${MACHINE} == "sun386") -# even I don't have one of these anymore :-) -CFLAGS+= -DPORTAR -.elif (${MACHINE} != "sunos") -SRCS+= sigcompat.c -CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART -.endif -.endif - -CFLAGS_main.o+= "-D@force_machine@MACHINE=\"${MACHINE}\"" "-DMACHINE_ARCH=\"${MACHINE_ARCH}\"" - -EXTRACT_MAN=no - -MAN=${PROG}.1 -.if (${PROG} != "make") -${MAN}: make.1 - @echo making ${PROG}.1 - @sed -e '/^.Nm/s/make/${PROG}/' -e '/^.Sh HISTORY/,$$d' ${srcdir}/make.1 > $@ - @(echo ".Sh HISTORY"; echo ".Nm"; echo "is derrived from NetBSD's"; echo ".Xr make 1 ."; echo It uses autoconf to facilitate portability to other platforms.) >> $@ - -.endif - -.if exists(${srcdir}/../Makefile.inc) -.include "${srcdir}/../Makefile.inc" -.endif -.-include "prog.mk" -.ifdef OBJS -# prog.mk likely found. -.include "subdir.mk" -.else -.include "bsd.prog.mk" -.include "bsd.subdir.mk" -.endif - -# Force these -BINDIR= ${prefix}/bin -MANDIR= ${prefix}/man - -.if ${OS} == "FreeBSD" -# freebsd's bsd.man.mk works differently -MAN1=${MAN} -MANDIR= ${prefix}/man/man -MANDEST= ${MANDIR}1 -.endif -MANDEST?= ${MANDIR} - -arch.o: config.h -# make sure that MAKE_VERSION gets updated. -main.o: ${SRCS} ${MAKEFILE} - -MK?=${prefix}/share/mk -MKSRC?=${srcdir}/mk - -beforeinstall: - test -d ${DESTDIR}${BINDIR} || ${INSTALL} -m 775 -d ${DESTDIR}${BINDIR} - test -d ${DESTDIR}${MANDEST} || ${INSTALL} -m 775 -d ${DESTDIR}${MANDEST} - -install-mk: -.if exists(${MKSRC}/bsd.prog.mk) - test -d ${DESTDIR}${MK} || ${INSTALL} -m 775 -d ${DESTDIR}${MK} - ${INSTALL} -c -m 644 ${MKSRC}/[ac-z]*.mk ${DESTDIR}${MK} - test -s ${DESTDIR}${MK}/bsd.own.mk || ${INSTALL} -c -m 644 ${MKSRC}/bsd*.mk ${DESTDIR}${MK} - test -s ${DESTDIR}${MK}/sys.mk || ${INSTALL} -c -m 644 mk/sys.mk ${DESTDIR}${MK} - test -s ${DESTDIR}${MK}/sys.mk || ${INSTALL} -c -m 644 ${MKSRC}/${MACHINE}.sys.mk ${DESTDIR}${MK}/sys.mk -.else - @echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false -.endif -- cgit v1.2.3