20 files changed, 54 insertions, 191 deletions
diff --git a/src/Make.Darwin-PowerMacintosh b/src/Make.Darwin-PowerMacintosh
deleted file mode 100644
index 69114d96..00000000
--- a/src/Make.Darwin-PowerMacintosh
+++ /dev/null
@@ -1,8 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I${PREFIX}/include
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O
-RANLIB=ranlib
-LD=gcc
diff --git a/src/Make.FreeBSD-386 b/src/Make.FreeBSD-386
deleted file mode 100644
index bf30bc90..00000000
--- a/src/Make.FreeBSD-386
+++ /dev/null
@@ -1,8 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O	# default, can be overriden by Make.$(SYSNAME)
-NAN=nan64.$O
-RANLIB=true
diff --git a/src/Make.HP-UX-9000 b/src/Make.HP-UX-9000
deleted file mode 100644
index 5b5780ec..00000000
--- a/src/Make.HP-UX-9000
+++ /dev/null
@@ -1,7 +0,0 @@
-CC=cc
-CFLAGS=-O -c -Ae -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O
-RANLIB=true
diff --git a/src/Make.Linux-386 b/src/Make.Linux-386
deleted file mode 100644
index 0c38e13a..00000000
--- a/src/Make.Linux-386
+++ /dev/null
@@ -1,8 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O	# default, can be overriden by Make.$(SYSNAME)
-NAN=nan64.$O
-RANLIB=true
diff --git a/src/Make.NetBSD-386 b/src/Make.NetBSD-386
deleted file mode 100644
index bf30bc90..00000000
--- a/src/Make.NetBSD-386
+++ /dev/null
@@ -1,8 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O	# default, can be overriden by Make.$(SYSNAME)
-NAN=nan64.$O
-RANLIB=true
diff --git a/src/Make.OSF1-alpha b/src/Make.OSF1-alpha
deleted file mode 100644
index 3f4e2031..00000000
--- a/src/Make.OSF1-alpha
+++ /dev/null
@@ -1,7 +0,0 @@
-CC=cc
-CFLAGS+=-g -c -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O
-RANLIB=true
diff --git a/src/Make.SunOS-sun4u b/src/Make.SunOS-sun4u
deleted file mode 100644
index 95120ec1..00000000
--- a/src/Make.SunOS-sun4u
+++ /dev/null
@@ -1,3 +0,0 @@
-include Make.SunOS-sun4u-$(CC)
-NAN=nan64.$O
-RANLIB=true
diff --git a/src/Make.SunOS-sun4u-cc b/src/Make.SunOS-sun4u-cc
deleted file mode 100644
index 99da3935..00000000
--- a/src/Make.SunOS-sun4u-cc
+++ /dev/null
@@ -1,5 +0,0 @@
-CC=cc
-CFLAGS+=-g -c -I. -O
-O=o
-AR=ar
-ARFLAGS=rvc
diff --git a/src/Make.SunOS-sun4u-gcc b/src/Make.SunOS-sun4u-gcc
deleted file mode 100644
index fc5c21a9..00000000
--- a/src/Make.SunOS-sun4u-gcc
+++ /dev/null
@@ -1,5 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c
-O=o
-AR=ar
-ARFLAGS=rvc
diff --git a/src/Makecommon b/src/Makecommon
deleted file mode 100644
index b7f1f1ac..00000000
--- a/src/Makecommon
+++ /dev/null
@@ -1,17 +0,0 @@
-.c.$O:
-	@echo cc $*.c
-	@$(CC) $(CFLAGS) -I$(PLAN9)/include $*.c
-
-%.$O: %.c
-	@echo cc $*.c
-	@$(CC) $(CFLAGS) -I$(PLAN9)/include $*.c
-
-$(OFILES): $(HFILES)
-
-clean:
-	rm -f $(CLEANFILES)
-
-nuke:
-	rm -f $(CLEANFILES) $(NUKEFILES)
-
-.phony: all install clean nuke
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 6943b442..00000000
--- a/src/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-LIBS=\
-	lib9\
-	libbio\
-	libdraw\
-	libfmt\
-	libframe\
-	libregexp\
-	libthread\
-	libutf\
-
-CMDS=\
-	cmd/mk\
-	cmd/sam\
-	cmd/samterm\
-
-all clean install nuke:
-	for i in $(LIBS) $(CMDS); \
-	do \
-		(echo $$i; cd $$i; $(MAKE) $@); \
-	done
-
diff --git a/src/Makehdr b/src/Makehdr
deleted file mode 100644
index 0d0b09bd..00000000
--- a/src/Makehdr
+++ /dev/null
@@ -1,23 +0,0 @@
-# this works in gnu make
-SYSNAME:=${shell uname}
-OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'}
-
-# this works in bsd make
-SYSNAME!=uname
-OBJTYPE!=uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'
-
-# the gnu rules will mess up bsd but not vice versa,
-# hence the gnu rules come first.
-
-X11=/usr/X11R6
-LDFLAGS=
-CFLAGS=
-
-BIN=$(PLAN9)/bin
-
-include $(PLAN9)/src/Make.$(SYSNAME)-$(OBJTYPE)
-LDFLAGS+=-L$(PLAN9)/lib
-
-CLEANFILES=*.$O
-NUKEFILES=
-
diff --git a/src/Makemany b/src/Makemany
deleted file mode 100644
index d9a0b7e1..00000000
--- a/src/Makemany
+++ /dev/null
@@ -1,15 +0,0 @@
-all: $(TARG)
-
-a.%: %.o $(OFILES)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-CLEANFILES+=$(TARG)
-NUKEFILES+=$(BIN)/$(TARG)
-
-include $(PLAN9)/src/Makecommon
-
-install: $(TARG)
-	for i in $(TARG); do cp a.$$i $(BIN); done
-
-
-
diff --git a/src/Makeone b/src/Makeone
deleted file mode 100644
index 752e3b11..00000000
--- a/src/Makeone
+++ /dev/null
@@ -1,13 +0,0 @@
-all: $(TARG)
-
-$(TARG): $(OFILES)
-	$(CC) -o $(TARG) $(OFILES) $(LDFLAGS)
-
-CLEANFILES+=$(TARG)
-NUKEFILES+=$(BIN)/$(TARG)
-
-include $(PLAN9)/src/Makecommon
-
-install: $(TARG)
-	cp $(TARG) $(BIN)
-
diff --git a/src/Makesyslib b/src/Makesyslib
deleted file mode 100644
index 55adea97..00000000
--- a/src/Makesyslib
+++ /dev/null
@@ -1,9 +0,0 @@
-all install: $(PLAN9)/lib/$(LIB)
-
-$(PLAN9)/lib/$(LIB): $(OFILES)
-	$(AR) $(ARFLAGS) $(PLAN9)/lib/$(LIB) $(OFILES)
-	$(RANLIB) $(PLAN9)/lib/$(LIB)
-
-include $(PLAN9)/src/Makecommon
-
-NUKEFILES+=$(PLAN9)/lib/$(LIB)
diff --git a/src/libframe/Makefile b/src/libframe/mkfile
index 3e981035..7ca23013 100644
--- a/src/libframe/Makefile
+++ b/src/libframe/mkfile
@@ -1,5 +1,5 @@
 PLAN9=../..
-include $(PLAN9)/src/Makehdr
+<$PLAN9/src/mkhdr
 
 LIB=libframe.a
 
@@ -15,8 +15,8 @@ OFILES=\
 	frutil.$O\
 
 HFILES=\
-	$(PLAN9)/include/frame.h\
-	$(PLAN9)/include/draw.h\
+	$PLAN9/include/frame.h\
+	$PLAN9/include/draw.h\
 
-include $(PLAN9)/src/Makesyslib
+<$PLAN9/src/mksyslib
 
diff --git a/src/libip/mkfile b/src/libip/mkfile
new file mode 100644
index 00000000..b8330d85
--- /dev/null
+++ b/src/libip/mkfile
@@ -0,0 +1,20 @@
+PLAN9=../..
+<$PLAN9/src/mkhdr
+
+LIB=libip.a
+OFILES=\
+	eipfmt.$O\
+	parseip.$O\
+	parseether.$O\
+	myetheraddr.$O\
+	myipaddr.$O\
+	classmask.$O\
+	bo.$O\
+	readipifc.$O\
+	ipaux.$O\
+	ptclbsum.$O\
+
+HFILES=\
+	ip.h
+
+<$PLAN9/src/mksyslib
diff --git a/src/libregexp/Makefile b/src/libregexp/Makefile
deleted file mode 100644
index 7fdd7f95..00000000
--- a/src/libregexp/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-PLAN9=../..
-include $(PLAN9)/src/Makehdr
-
-LIB=libregexp9.a
-
-OFILES=\
-	regcomp.$O\
-	regerror.$O\
-	regexec.$O\
-	regsub.$O\
-	regaux.$O\
-	rregaux.$O\
-	rregexec.$O\
-	rregsub.$O\
-
-HFILES=\
-	$(PLAN9)/include/regexp9.h\
-	regcomp.h\
-
-include $(PLAN9)/src/Makesyslib
-
-test: test.$O $(LIB)
-	$(CC) -o test test.$O $(LIB) -L/usr/local/lib -lfmt -lutf
-
-test2: test2.$O $(LIB)
-	$(CC) -o test2 test2.$O $(LIB) -L/usr/local/lib -lfmt -lutf
-
diff --git a/src/libregexp/mkfile b/src/libregexp/mkfile
new file mode 100644
index 00000000..8cb740cc
--- /dev/null
+++ b/src/libregexp/mkfile
@@ -0,0 +1,27 @@
+PLAN9=../..
+<$PLAN9/src/mkhdr
+
+LIB=libregexp9.a
+
+OFILES=\
+	regcomp.$O\
+	regerror.$O\
+	regexec.$O\
+	regsub.$O\
+	regaux.$O\
+	rregaux.$O\
+	rregexec.$O\
+	rregsub.$O\
+
+HFILES=\
+	$PLAN9/include/regexp9.h\
+	regcomp.h\
+
+<$PLAN9/src/mksyslib
+
+test: test.$O $LIB
+	$CC -o test test.$O $LIB -L/usr/local/lib -lfmt -lutf
+
+test2: test2.$O $LIB
+	$CC -o test2 test2.$O $LIB -L/usr/local/lib -lfmt -lutf
+
diff --git a/src/libutf/Makefile b/src/libutf/mkfile
index 283b73d3..46c92fef 100644
--- a/src/libutf/Makefile
+++ b/src/libutf/mkfile
@@ -1,5 +1,5 @@
 PLAN9=../..
-include $(PLAN9)/src/Makehdr
+<$PLAN9/src/mkhdr
 
 LIB=libutf.a
 
@@ -26,6 +26,6 @@ OFILES=\
 	utfutf.$O\
 
 HFILES=\
-	$(PLAN9)/include/utf.h\
+	$PLAN9/include/utf.h\
 
-include $(PLAN9)/src/Makesyslib
+<$PLAN9/src/mksyslib