Reorg

src/cmd/samterm/Make.Darwin-PowerMacintosh

@@ -1,6 +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

src/cmd/samterm/Make.FreeBSD-386

@@ -1,7 +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

src/cmd/samterm/Make.HP-UX-9000

@@ -1,6 +0,0 @@
-CC=cc
-CFLAGS=-O -c -Ae -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O

src/cmd/samterm/Make.Linux-386

@@ -1,7 +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

src/cmd/samterm/Make.NetBSD-386

@@ -1,7 +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

src/cmd/samterm/Make.OSF1-alpha

@@ -1,6 +0,0 @@
-CC=cc
-CFLAGS+=-g -c -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O

src/cmd/samterm/Make.SunOS-sun4u

@@ -1,2 +0,0 @@
-include Make.SunOS-sun4u-$(CC)
-NAN=nan64.$O

src/cmd/samterm/Make.SunOS-sun4u-cc

@@ -1,6 +0,0 @@
-CC=cc
-CFLAGS+=-g -c -I. -O
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O

src/cmd/samterm/Make.SunOS-sun4u-gcc

@@ -1,6 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O

src/cmd/samterm/Makefile

@@ -1,22 +1,5 @@
-
-# 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.
-
-include Make.$(SYSNAME)-$(OBJTYPE)
-
-PREFIX=/usr/local
-
-NUKEFILES=
-
-TGZFILES=
+9SRC=..
+include $(9SRC)/Makehdr
 
 TARG=samterm
 OFILES=\
@@ -33,62 +16,12 @@ OFILES=\
 HFILES=\
 	samterm.h\
 	flayer.h\
-	$(PREFIX)/include/frame.h\
+	../sam/sam.h\
+	../sam/mesg.h\
+	$(9SRC)/include/frame.h\
+	$(9SRC)/include/draw.h\
 
-all: $(TARG)
+CFLAGS+=-I../sam
+LDFLAGS+=-lframe -ldraw -lthread -l9 -lregexp9 -lbio -lfmt -lutf -L$(X11)/lib -lX11 -lm
 
-install:
-	install -c -m 0755 samterm $(PREFIX)/bin/samterm
-
-
-$(TARG): $(OFILES)
-	$(CC) -o $(TARG) $(OFILES) -L$(PREFIX)/lib -lframe -ldraw -lthread -l9 -lregexp9 -lbio -lfmt -lutf -L/usr/X11R6/lib -lX11 -lm -ldraw
-
-
-.c.$O:
-	$(CC) $(CFLAGS) -I/usr/X11R6/include -I../sam -I$(PREFIX)/include $*.c
-
-%.$O: %.c
-	$(CC) $(CFLAGS) -I/usr/X11R6/include -I../sam -I$(PREFIX)/include $*.c
-
-
-$(OFILES): $(HFILES)
-
-tgz:
-	rm -rf $(NAME)-$(VERSION)
-	mkdir $(NAME)-$(VERSION)
-	cp Makefile Make.* README LICENSE NOTICE *.[ch137] rpm.spec bundle.ports $(TGZFILES) $(NAME)-$(VERSION)
-	tar cf - $(NAME)-$(VERSION) | gzip >$(NAME)-$(VERSION).tgz
-	rm -rf $(NAME)-$(VERSION)
-
-clean:
-	rm -f $(OFILES) $(LIB)
-
-nuke:
-	rm -f $(OFILES) *.tgz *.rpm $(NUKEFILES)
-
-rpm:
-	make tgz
-	cp $(NAME)-$(VERSION).tgz /usr/src/RPM/SOURCES
-	rpm -ba rpm.spec
-	cp /usr/src/RPM/SRPMS/$(NAME)-$(VERSION)-1.src.rpm .
-	cp /usr/src/RPM/RPMS/i586/$(NAME)-$(VERSION)-1.i586.rpm .
-	scp *.rpm rsc@amsterdam.lcs.mit.edu:public_html/software
-
-PORTDIR=/usr/ports/$(PORTPLACE)
-
-ports:
-	make tgz
-	rm -rf $(PORTDIR)
-	mkdir $(PORTDIR)
-	cp $(NAME)-$(VERSION).tgz /usr/ports/distfiles
-	cat bundle.ports | (cd $(PORTDIR) && awk '$$1=="---" && $$3=="---" { ofile=$$2; next} {if(ofile) print >ofile}')
-	(cd $(PORTDIR); make makesum)
-	(cd $(PORTDIR); make)
-	(cd $(PORTDIR); /usr/local/bin/portlint)
-	rm -rf $(PORTDIR)/work
-	shar `find $(PORTDIR)` > ports.shar
-	(cd $(PORTDIR); tar cf - *) | gzip >$(NAME)-$(VERSION)-ports.tgz
-	scp *.tgz rsc@amsterdam.lcs.mit.edu:public_html/software
-
-.phony: all clean nuke install tgz rpm ports
+include ../Makeone

src/cmd/samterm/Makefile.MID

@@ -1,22 +0,0 @@
-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\
-	$(PREFIX)/include/frame.h\
-
-all: $(TARG)
-
-install:
-	install -c -m 0755 samterm $(PREFIX)/bin/samterm
-

src/cmd/samterm/mkfile

@@ -1,9 +0,0 @@
-all:V: Makefile Make.FreeBSD-386 Make.Linux-386 Make.HP-UX-9000 Make.OSF1-alpha \
-	Make.SunOS-sun4u Make.SunOS-sun4u-cc Make.SunOS-sun4u-gcc \
-	Make.NetBSD-386 Make.Darwin-PowerMacintosh
-
-Makefile:D: ../libutf/Makefile.TOP Makefile.MID ../libutf/Makefile.CMD ../libutf/Makefile.BOT
-	cat $prereq >$target
-
-Make.%: ../libutf/Make.%
-	cp $prereq $target