--- researchv9/sys/boot/stand/Makefile	2018/04/24 17:21:59	1.1
+++ researchv9/sys/boot/stand/Makefile	2018/04/24 17:31:00	1.1.1.2
@@ -26,18 +26,6 @@ ALL=	libsa.a srt0.o boot tpboot copy tpc
 
 all: ${ALL}
 
-sun2:	FRC
-	rm Makefile
-	ln -s Makefile.sun2 Makefile
-	make clean;make
-
-sun3:	FRC
-	rm Makefile
-	ln -s Makefile.sun3 Makefile
-	make clean;make
-
-FRC:
-
 s3map.o: s3map.s
 	rm -f tmp.c s3map.i s3map.o
 	cp s3map.s tmp.c
@@ -69,26 +57,17 @@ readfile.o: readfile.c
 # Standalone, generic boot program -- get it from anywhere, it will
 # boot anything.  "tpboot" has the a.out header stripped off so you
 # can write it on the first file of a tape.
-boot:	boot.o readfile.o srt0.o libsa.a
-	ld -N -T ${BRELOC} -o boot srt0.o boot.o readfile.o libsa.a -lc
+BFILES=	srt0.o boot.o sys.o devio.o prf.o s3map.o standalloc.o \
+	common.o conf.o idprom.o getidprom.o readfile.o sd.o \
+	si.o sc.o spinning.o chklabel.o stubs.o probe.o st.o
 
-sboot:	sboot.o readfile.o srt0.o libsa.a
-	ld -N -T ${BRELOC} -o sboot srt0.o sboot.o readfile.o libsa.a -lc
+boot:	$(BFILES)
+	ld -N -T ${BRELOC} -o boot $(BFILES) -lc
 
-tpboot:	tpboot.o readfile.o srt0.o libsa.a
+tpboot:	tpboot.o readfile.o srt0.o libs.a
 	ld -N -T ${BRELOC} srt0.o tpboot.o readfile.o libsa.a -lc
 	cp a.out b.out; strip b.out; dd if=b.out of=tpboot ibs=32 skip=1; ${RM} b.out
 
-tpboot.o: boot.c
-	cp boot.c tpboot.c; chmod +w tpboot.c
-	cc -c ${CFLAGS} -DJUSTASK tpboot.c
-	${RM} tpboot.c
-
-sboot.o: boot.c
-	cp boot.c sboot.c; chmod +w sboot.c
-	cc -c ${CFLAGS} -DJUSTASK sboot.c
-	${RM} sboot.c
-
 # Standalone copy program for copying eg, tape->disk
 copy:	copy.o srt0.o libsa.a
 	ld -N -T ${LOAD} -o copy srt0.o copy.o libsa.a -lc
@@ -97,61 +76,15 @@ copy:	copy.o srt0.o libsa.a
 tpcopy:	copy.o srt0.o libsa.a
 	ld -T ${LOAD} -o tpcopy srt0.o copy.o libsa.a -lc
 
-# sys version for 2nd stage which uses RAM driver and needs 3rd stage
-sysxx.o: sys.c
-	${RM} sysxx.c sysxx.o
-	cp sys.c sysxx.c
-	${CC} -c ${CFLAGS} -DBOOTBLOCK sysxx.c
-	${RM} sysxx.c
-
 # getting booted from anywhere (generic = pr for Prom)
 
-bootpr: srt0.o bootxx.o readfile.o confpr.o sysxx.o libsa.a sizecheck
-	ld -N -T ${BRELOC} srt0.o bootxx.o readfile.o confpr.o sysxx.o \
-		libsa.a -lc
+bootpr: srt0.o bootxx.o readfile.o sys.o devio.o prf.o s3map.o \
+	standalloc.o common.o
+	ld -N -T ${BRELOC} srt0.o bootxx.o readfile.o sys.o \
+		devio.o prf.o s3map.o standalloc.o common.o -lc
 	sizecheck
 	cp a.out b.out;strip b.out;dd if=b.out of=bootpr ibs=32 skip=1
 
-
-bootxy: srt0.o bootxx.o readfile.o confxy.o sysxx.o xy.boot.o libsa.a sizecheck
-	ld -N -T ${BRELOC} srt0.o bootxx.o readfile.o confxy.o sysxx.o \
-		xy.boot.o libsa.a -lc
-	sizecheck
-	cp a.out b.out;strip b.out;dd if=b.out of=bootxy ibs=32 skip=1
-
-xy.boot.o: xy.c
-	rm -f tmp.c tmp.o xy.boot.o
-	cp xy.c tmp.c
-	cc -c ${CFLAGS} -DBOOTBLOCK tmp.c
-	mv tmp.o xy.boot.o
-
-confxy.o: confxx.c
-	cc -c ${CFLAGS} -Dxxdriver=xydriver confxx.c
-	mv confxx.o confxy.o
-
-bootsd: bootpr
-	cp bootpr bootsd
-
-big.bootsd: srt0.o bootxx.o readfile.o confsd.o sysxx.o sd.boot.o libsa.a sizecheck
-	ld -N -T ${BRELOC} srt0.o bootxx.o readfile.o confsd.o sd.boot.o \
-		sysxx.o libsa.a -lc
-	sizecheck
-	cp a.out b.out;strip b.out;dd if=b.out of=bootsd ibs=32 skip=1
-
-sd.boot.o: sd.c
-	rm -f tmp.c tmp.o sd.boot.o
-	cp sd.c tmp.c
-	cc -c ${CFLAGS} -DBOOTBLOCK tmp.c
-	mv tmp.o sd.boot.o
-
-confsd.o: confxx.c
-	cc -c ${CFLAGS} -Dxxdriver=sddriver confxx.c
-	mv confxx.o confsd.o
-
-sizecheck: SCCS/s.sizecheck
-	sccs get sizecheck
-	chmod +x sizecheck
-
 # various flavors of tftp-bootable ND booters
 
 ndboot.sun3.private: boot
@@ -169,11 +102,6 @@ ndboot.sun3.pub1: boot
 	echo 'ndbootdev?w 41' | adb -w b.out
 	strip b.out; dd if=b.out of=$@ ibs=32 skip=1; ${RM} b.out
 
-# misc
-installboot.sh:
-	sccs get installboot.sh
-
-
 # Test program: sacat (standalone cat)
 
 sacat: sacat.o srt0.o libsa.a