summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorglass <glass@NetBSD.org>1993-05-27 16:53:49 +0000
committerglass <glass@NetBSD.org>1993-05-27 16:53:49 +0000
commit6cbb2d4ece9f45d3c93474aef5fb7d6e9461f0c8 (patch)
tree098a0d632647a6eb312b32fd2fe98681a8273fb5 /usr.bin/make
parent99c3a88ce4cb7b0ba31d36627319829dff88582b (diff)
some compatibility fixes to ease bootstrapping:
Makefile.dist is now a decent Makefile and not one of these cc *.c disasters RANLIBMAG now defaults if not otherwise defined
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/Makefile.dist26
-rw-r--r--usr.bin/make/arch.c4
2 files changed, 24 insertions, 6 deletions
diff --git a/usr.bin/make/Makefile.dist b/usr.bin/make/Makefile.dist
index c311d7e9903..1149e60facc 100644
--- a/usr.bin/make/Makefile.dist
+++ b/usr.bin/make/Makefile.dist
@@ -1,7 +1,21 @@
# a very simple makefile...
-pmake:
- @echo 'make started.'
- cc -I. -c *.c
- cd lst.lib; cc -I.. -c *.c
- cc *.o lst.lib/*.o -o pmake
- @echo 'make completed.'
+
+CFLAGS = -I. -DMACHINE=\"sun3\"
+
+MAKESRC = arch.c buf.c compat.c cond.c dir.c hash.c job.c main.c make.c \
+ parse.c str.c suff.c targ.c var.c
+MAKEOBJS = arch.o buf.o compat.o cond.o dir.o hash.o job.o main.o make.o \
+ parse.o str.o suff.o targ.o var.o
+
+
+all: make
+
+lst.lib/liblst.a:
+ cd lst.lib ; make -f Makefile.dist
+
+make: $(MAKEOBJS) lst.lib/liblst.a
+ $(CC) -o make $(MAKEOBJS) lst.lib/liblst.a
+
+clean:
+ rm -f $(MAKEOBJS) make
+ cd lst.lib ; make -f Makefile.dist clean
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index ad5a60374d4..434397bd3d0 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -96,6 +96,10 @@ static char sccsid[] = "@(#)arch.c 5.7 (Berkeley) 12/28/90";
#include "make.h"
#include "hash.h"
+#ifndef RANLIBMAG
+#define RANLIBMAG "__.SYMDEF"
+#endif
+
static Lst archives; /* Lst of archives we've already examined */
typedef struct Arch {