--- linux/Makefile	2018/04/24 18:00:41	1.1.1.1
+++ linux/Makefile	2018/04/24 18:01:42	1.1.1.3
@@ -1,21 +1,30 @@
 #
-# Makefile for linux.
-# If you don't have '-mstring-insns' in your gcc (and nobody but me has :-)
-# remove them from the CFLAGS defines.
+# if you want the ram-disk device, define this to be the
+# size in blocks.
 #
+RAMDISK = #-DRAMDISK=512
 
-AS86	=as -0 -a
-CC86	=cc -0
-LD86	=ld -0
+AS86	=as86 -0 -a
+LD86	=ld86 -0
 
 AS	=gas
 LD	=gld
 LDFLAGS	=-s -x -M
-CC	=gcc
-CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer -fcombine-regs
-CPP	=gcc -E -nostdinc -Iinclude
+CC	=gcc $(RAMDISK)
+CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer \
+-fcombine-regs -mstring-insns
+CPP	=cpp -nostdinc -Iinclude
+
+#
+# ROOT_DEV specifies the default root-device when making the image.
+# This can be either FLOPPY, /dev/xxxx or empty, in which case the
+# default of /dev/hd6 is used by 'build'.
+#
+ROOT_DEV=/dev/hd6
 
 ARCHIVES=kernel/kernel.o mm/mm.o fs/fs.o
+DRIVERS =kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a
+MATH	=kernel/math/math.a
 LIBS	=lib/lib.a
 
 .c.s:
@@ -29,24 +38,37 @@ LIBS	=lib/lib.a
 
 all:	Image
 
-Image: boot/boot tools/system tools/build
-	tools/build boot/boot tools/system > Image
+Image: boot/bootsect boot/setup tools/system tools/build
+	tools/build boot/bootsect boot/setup tools/system $(ROOT_DEV) > Image
 	sync
 
+disk: Image
+	dd bs=8192 if=Image of=/dev/PS0
+
 tools/build: tools/build.c
 	$(CC) $(CFLAGS) \
 	-o tools/build tools/build.c
-	chmem +65000 tools/build
 
 boot/head.o: boot/head.s
 
 tools/system:	boot/head.o init/main.o \
-		$(ARCHIVES) $(LIBS)
+		$(ARCHIVES) $(DRIVERS) $(MATH) $(LIBS)
 	$(LD) $(LDFLAGS) boot/head.o init/main.o \
 	$(ARCHIVES) \
+	$(DRIVERS) \
+	$(MATH) \
 	$(LIBS) \
 	-o tools/system > System.map
 
+kernel/math/math.a:
+	(cd kernel/math; make)
+
+kernel/blk_drv/blk_drv.a:
+	(cd kernel/blk_drv; make)
+
+kernel/chr_drv/chr_drv.a:
+	(cd kernel/chr_drv; make)
+
 kernel/kernel.o:
 	(cd kernel; make)
 
@@ -59,24 +81,29 @@ fs/fs.o:
 lib/lib.a:
 	(cd lib; make)
 
-boot/boot:	boot/boot.s tools/system
+boot/setup: boot/setup.s
+	$(AS86) -o boot/setup.o boot/setup.s
+	$(LD86) -s -o boot/setup boot/setup.o
+
+boot/bootsect:	boot/bootsect.s
+	$(AS86) -o boot/bootsect.o boot/bootsect.s
+	$(LD86) -s -o boot/bootsect boot/bootsect.o
+
+tmp.s:	boot/bootsect.s tools/system
 	(echo -n "SYSSIZE = (";ls -l tools/system | grep system \
 		| cut -c25-31 | tr '\012' ' '; echo "+ 15 ) / 16") > tmp.s
-	cat boot/boot.s >> tmp.s
-	$(AS86) -o boot/boot.o tmp.s
-	rm -f tmp.s
-	$(LD86) -s -o boot/boot boot/boot.o
+	cat boot/bootsect.s >> tmp.s
 
 clean:
-	rm -f Image System.map tmp_make boot/boot core
-	rm -f init/*.o boot/*.o tools/system tools/build
+	rm -f Image System.map tmp_make core boot/bootsect boot/setup
+	rm -f init/*.o tools/system tools/build boot/*.o
 	(cd mm;make clean)
 	(cd fs;make clean)
 	(cd kernel;make clean)
 	(cd lib;make clean)
 
 backup: clean
-	(cd .. ; tar cf - linux | compress16 - > backup.Z)
+	(cd .. ; tar cf - linux | compress - > backup.Z)
 	sync
 
 dep:
@@ -92,5 +119,5 @@ init/main.o : init/main.c include/unistd
   include/sys/types.h include/sys/times.h include/sys/utsname.h \
   include/utime.h include/time.h include/linux/tty.h include/termios.h \
   include/linux/sched.h include/linux/head.h include/linux/fs.h \
-  include/linux/mm.h include/asm/system.h include/asm/io.h include/stddef.h \
-  include/stdarg.h include/fcntl.h 
+  include/linux/mm.h include/signal.h include/asm/system.h include/asm/io.h \
+  include/stddef.h include/stdarg.h include/fcntl.h