From 0b84fdb5c1f7d24e4f521443a859a6e217c2cd4e Mon Sep 17 00:00:00 2001
From: glass <glass@NetBSD.org>
Date: Mon, 9 May 1994 06:36:20 +0000
Subject: [PATCH] bootstrap improvements

---
 usr.bin/make/Makefile.boot    | 9 ++++-----
 usr.bin/make/lst.lib/Makefile | 5 ++---
 usr.bin/make/make.h           | 8 +++++++-
 usr.bin/make/util.c           | 4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/usr.bin/make/Makefile.boot b/usr.bin/make/Makefile.boot
index 398a6932dcee..7d9c8e648283 100644
--- a/usr.bin/make/Makefile.boot
+++ b/usr.bin/make/Makefile.boot
@@ -1,20 +1,19 @@
 # a very simple makefile...
-#	$Id: Makefile.boot,v 1.3 1994/04/17 03:09:49 glass Exp $
+#	$Id: Makefile.boot,v 1.4 1994/05/09 06:36:20 glass Exp $
 #
 # You only want to use this if you aren't running NetBSD.
 #
 # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture
 #
-CC=gcc
-CFLAGS=-Wall -I. -g -O  -DMACHINE=\"sparc\" -DMACHINE_ARCH=\"sparc\" \
+CFLAGS= -I. -DMACHINE=\"sparc\" -DMACHINE_ARCH=\"sparc\" \
 	-DMAKE_BOOTSTRAP
 
 OBJ=arch.o buf.o compat.o cond.o dir.o for.o hash.o job.o main.o make.o \
     parse.o str.o suff.o targ.o var.o util.o
 
-pmake: ${OBJ}
+bmake: ${OBJ}
 	@echo 'make of make and make.0 started.'
 	(cd lst.lib; make)
-	${CC} *.o lst.lib/*.o -o pmake
+	${CC} *.o lst.lib/*.o -o bmake
 #	nroff -h -man make.1 > make.0
 #	@echo 'make of make and make.0 completed.'
diff --git a/usr.bin/make/lst.lib/Makefile b/usr.bin/make/lst.lib/Makefile
index 84ab758803ef..90ccb75bff26 100644
--- a/usr.bin/make/lst.lib/Makefile
+++ b/usr.bin/make/lst.lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1994/03/05 00:35:26 cgd Exp $
+#	$Id: Makefile,v 1.2 1994/05/09 06:36:24 glass Exp $
 
 OBJ=lstAppend.o lstDupl.o lstInit.o lstOpen.o lstAtEnd.o lstEnQueue.o \
     lstInsert.o lstAtFront.o lstIsAtEnd.o lstClose.o lstFind.o lstIsEmpty.o \
@@ -6,6 +6,5 @@ OBJ=lstAppend.o lstDupl.o lstInit.o lstOpen.o lstAtEnd.o lstEnQueue.o \
     lstDatum.o lstForEach.o lstMember.o lstSucc.o lstDeQueue.o \
     lstForEachFrom.o lstDestroy.o lstNext.o 
 
-CC=gcc -Wall
-CFLAGS=-I.. -O
+CFLAGS=-I..
 all: ${OBJ}
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 4b84651019bd..c9db9345ddee 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)make.h	5.13 (Berkeley) 3/1/91
- *	$Id: make.h,v 1.4 1994/04/17 03:09:51 glass Exp $
+ *	$Id: make.h,v 1.5 1994/05/09 06:36:21 glass Exp $
  */
 
 /*-
@@ -53,6 +53,12 @@
 #include <ctype.h>
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
+#else
+#if defined(__STDC__) || defined(__cplusplus)
+#define	__P(protos)	protos		/* full-blown ANSI C */
+#else
+#define	__P(protos)	()		/* traditional C preprocessor */    
+#endif
 #endif
 #if __STDC__
 #include <stdlib.h>
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 6e2f777dba83..7ddfa041d19d 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -1,10 +1,10 @@
 /*
  * Missing stuff from OS's
  *
- *	$Id: util.c,v 1.1 1994/03/05 00:35:16 cgd Exp $
+ *	$Id: util.c,v 1.2 1994/05/09 06:36:22 glass Exp $
  */
 #include <stdio.h>
-#include <sys/cdefs.h>
+#include "make.h"
 
 #if !__STDC__
 # ifndef const