From 4fbfdd7acd4bf4fc71b1329230e05fc761907566 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sun, 23 Nov 2003 17:54:24 +0000
Subject: make -> mk

---
 src/cmd/mk/Makefile      | 37 -------------------------------------
 src/cmd/mk/mkfile        | 37 +++++++++++++++++++++++++++++++++++++
 src/cmd/samterm/Makefile | 29 -----------------------------
 src/cmd/samterm/mkfile   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 66 deletions(-)
 delete mode 100644 src/cmd/mk/Makefile
 create mode 100644 src/cmd/mk/mkfile
 delete mode 100644 src/cmd/samterm/Makefile
 create mode 100644 src/cmd/samterm/mkfile

diff --git a/src/cmd/mk/Makefile b/src/cmd/mk/Makefile
deleted file mode 100644
index 8cf31d74..00000000
--- a/src/cmd/mk/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-PLAN9=../../..
-include $(PLAN9)/src/Makehdr
-
-TARG=mk
-
-OFILES=\
-	arc.$O\
-	archive.$O\
-	bufblock.$O\
-	env.$O\
-	file.$O\
-	graph.$O\
-	job.$O\
-	lex.$O\
-	main.$O\
-	match.$O\
-	mk.$O\
-	parse.$O\
-	recipe.$O\
-	rule.$O\
-	run.$O\
-	sh.$O\
-	shprint.$O\
-	symtab.$O\
-	var.$O\
-	varsub.$O\
-	word.$O\
-	unix.$O\
-
-HFILES=\
-	mk.h\
-	fns.h\
-
-LDFLAGS+=-lregexp9 -lbio -l9 -lfmt -lutf
-
-include $(PLAN9)/src/Makeone
-
diff --git a/src/cmd/mk/mkfile b/src/cmd/mk/mkfile
new file mode 100644
index 00000000..e755629b
--- /dev/null
+++ b/src/cmd/mk/mkfile
@@ -0,0 +1,37 @@
+PLAN9=../../..
+<$PLAN9/src/mkhdr
+
+TARG=mk
+
+OFILES=\
+	arc.$O\
+	archive.$O\
+	bufblock.$O\
+	env.$O\
+	file.$O\
+	graph.$O\
+	job.$O\
+	lex.$O\
+	main.$O\
+	match.$O\
+	mk.$O\
+	parse.$O\
+	recipe.$O\
+	rule.$O\
+	run.$O\
+	sh.$O\
+	shprint.$O\
+	symtab.$O\
+	var.$O\
+	varsub.$O\
+	word.$O\
+	unix.$O\
+
+HFILES=\
+	mk.h\
+	fns.h\
+
+LDFLAGS=$LDFLAGS -lregexp9 -lbio -lfmt -lutf
+
+<$PLAN9/src/mkone
+
diff --git a/src/cmd/samterm/Makefile b/src/cmd/samterm/Makefile
deleted file mode 100644
index 73256599..00000000
--- a/src/cmd/samterm/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-PLAN9=../../..
-include $(PLAN9)/src/Makehdr
-
-TARG=samterm
-OFILES=\
-	main.$O\
-	icons.$O\
-	menu.$O\
-	mesg.$O\
-	rasp.$O\
-	scroll.$O\
-	flayer.$O\
-	io.$O\
-	plan9.$O\
-
-HFILES=\
-	samterm.h\
-	flayer.h\
-	../sam/sam.h\
-	../sam/mesg.h\
-	$(PLAN9)/include/frame.h\
-	$(PLAN9)/include/draw.h\
-
-CFLAGS+=-I../sam
-LDFLAGS+=-lframe -ldraw -lthread -l9 -lregexp9 -lbio -lfmt -lutf -L$(X11)/lib -lX11 -lm
-
-samterm: $(PLAN9)/lib/libdraw.a
-
-include $(PLAN9)/src/Makeone
diff --git a/src/cmd/samterm/mkfile b/src/cmd/samterm/mkfile
new file mode 100644
index 00000000..a6b9a60e
--- /dev/null
+++ b/src/cmd/samterm/mkfile
@@ -0,0 +1,30 @@
+PLAN9=../../..
+<$PLAN9/src/mkhdr
+
+TARG=samterm
+OFILES=\
+	main.$O\
+	icons.$O\
+	menu.$O\
+	mesg.$O\
+	rasp.$O\
+	scroll.$O\
+	flayer.$O\
+	io.$O\
+	plan9.$O\
+
+HFILES=\
+	samterm.h\
+	flayer.h\
+	../sam/sam.h\
+	../sam/mesg.h\
+	$PLAN9/include/frame.h\
+	$PLAN9/include/draw.h\
+
+CFLAGS=$CFLAGS -I../sam
+LDFLAGS=$LDFLAGS -lframe -ldraw -lthread -l9 -lregexp9 \
+	-lbio -lfmt -lutf -L$X11/lib -lX11 -lm
+
+o.samterm: $PLAN9/lib/libdraw.a
+
+<$PLAN9/src/mkone
-- 
cgit v1.2.3