--- linux/Makefile	2018/04/24 18:00:41	1.1.1.1
+++ linux/Makefile	2018/04/24 18:00:41	1.1.1.2
@@ -1,8 +1,4 @@
-#
-# Makefile for linux.
-# If you don't have '-mstring-insns' in your gcc (and nobody but me has :-)
-# remove them from the CFLAGS defines.
-#
+ROOTDEV= /dev/hd3
 
 AS86	=as -0 -a
 CC86	=cc -0
@@ -13,9 +9,10 @@ LD	=gld
 LDFLAGS	=-s -x -M
 CC	=gcc
 CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer -fcombine-regs
-CPP	=gcc -E -nostdinc -Iinclude
+CPP	=cpp -nostdinc -Iinclude
 
 ARCHIVES=kernel/kernel.o mm/mm.o fs/fs.o
+DRIVERS =kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a
 LIBS	=lib/lib.a
 
 .c.s:
@@ -29,8 +26,8 @@ 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 $(ROOTDEV) > Image
 	sync
 
 tools/build: tools/build.c
@@ -41,12 +38,19 @@ tools/build: tools/build.c
 boot/head.o: boot/head.s
 
 tools/system:	boot/head.o init/main.o \
-		$(ARCHIVES) $(LIBS)
+		$(ARCHIVES) $(DRIVERS) $(LIBS)
 	$(LD) $(LDFLAGS) boot/head.o init/main.o \
 	$(ARCHIVES) \
+	$(DRIVERS) \
 	$(LIBS) \
 	-o tools/system > System.map
 
+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,16 +63,22 @@ fs/fs.o:
 lib/lib.a:
 	(cd lib; make)
 
-boot/boot:	boot/boot.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
+#boot/setup: boot/setup.s
+#	$(AS86) -o boot/setup.o boot/setup.s
+#	$(LD86) -s -o boot/setup boot/setup.o
+
+#boot/bootsect:	tmp.s
+#	$(AS86) -o boot/bootsect.o tmp.s
+#	rm -f tmp.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/bootsect.s >> tmp.s
 
 clean:
-	rm -f Image System.map tmp_make boot/boot core
+	rm -f Image System.map tmp_make core
 	rm -f init/*.o boot/*.o tools/system tools/build
 	(cd mm;make clean)
 	(cd fs;make clean)
@@ -92,5 +102,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