--- linux/Makefile	2018/04/24 18:05:46	1.1.1.7
+++ linux/Makefile	2018/04/24 18:06:49	1.1.1.8
@@ -1,19 +1,45 @@
 #
-# comment this line if you don't want the emulation-code
+# 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 FLOPPY is used by 'build'.
 #
 
-MATH_EMULATION = -DKERNEL_MATH_EMULATION
+ROOT_DEV = /dev/hdb1
 
 #
 # uncomment the correct keyboard:
 #
+# The value of KBDFLAGS should be or'ed together from the following
+# bits, depending on which features you want enabled.
+# 0x80 - Off: the Alt key will set bit 7 if pressed together with
+#             another key.
+#        On:  the Alt key will NOT set the high bit; an escape
+#             character is prepended instead.
+# The least significant bits control if the following keys are "dead".
+# The key is dead by default if the bit is on.
+# 0x01 - backquote (`)
+# 0x02 - accent acute
+# 0x04 - circumflex (^)
+# 0x08 - tilde (~)
+# 0x10 - dieresis (umlaut)
+
+KEYBOARD = -DKBD_FINNISH -DKBDFLAGS=0
+# KEYBOARD = -DKBD_FINNISH_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKBD_US -DKBDFLAGS=0
+# KEYBOARD = -DKBD_GR -DKBDFLAGS=0
+# KEYBOARD = -DKBD_GR_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKBD_FR -DKBDFLAGS=0
+# KEYBOARD = -DKBD_FR_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKBD_UK -DKBDFLAGS=0
+# KEYBOARD = -DKBD_DK -DKBDFLAGS=0
+# KEYBOARD = -DKBD_DK_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKBD_DVORAK -DKBDFLAGS=0
 
-# KEYBOARD = -DKBD_FINNISH
-KEYBOARD = -DKBD_US
-# KEYBOARD = -DKBD_GR
-# KEYBOARD = -DKBD_FR
-# KEYBOARD = -DKBD_UK
-# KEYBOARD = -DKBD_DK
+#
+# comment this line if you don't want the emulation-code
+#
+
+MATH_EMULATION = -DKERNEL_MATH_EMULATION
 
 #
 # uncomment this line if you are using gcc-1.40
@@ -27,14 +53,6 @@ KEYBOARD = -DKBD_US
 CFLAGS =-Wall -O6 -fomit-frame-pointer $(GCC_OPT)
 
 #
-# 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 FLOPPY is used by 'build'.
-#
-
-# ROOT_DEV = /dev/hdb1
-
-#
 # if you want the ram-disk device, define this to be the
 # size in blocks.
 #
@@ -52,9 +70,10 @@ CC	=gcc $(RAMDISK)
 MAKE	=make CFLAGS="$(CFLAGS)"
 CPP	=cpp -nostdinc -Iinclude
 
-ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o
+ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o net/net.o
 FILESYSTEMS	=fs/minix/minix.o
-DRIVERS		=kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a
+DRIVERS		=kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a \
+		 kernel/blk_drv/scsi/scsi.a
 MATH		=kernel/math/math.a
 LIBS		=lib/lib.a
 
@@ -71,7 +90,7 @@ all:	Version Image
 
 Version:
 	@./makever.sh
-	@echo \#define UTS_RELEASE \"0.95c-`cat .version`\" > include/linux/config_rel.h
+	@echo \#define UTS_RELEASE \"0.96a-`cat .version`\" > include/linux/config_rel.h
 	@echo \#define UTS_VERSION \"`date +%D`\" > include/linux/config_ver.h
 	touch include/linux/config.h
 
@@ -86,7 +105,7 @@ disk: Image
 	dd bs=8192 if=Image of=/dev/PS0
 
 tools/build: tools/build.c
-	$(CC) $(CFLAGS) \
+	$(CC) -static $(CFLAGS) \
 	-o tools/build tools/build.c
 
 boot/head.o: boot/head.s
@@ -107,6 +126,9 @@ kernel/math/math.a: dummy
 kernel/blk_drv/blk_drv.a: dummy
 	(cd kernel/blk_drv; $(MAKE))
 
+kernel/blk_drv/scsi/scsi.a: dummy
+	(cd kernel/blk_drv/scsi; $(MAKE))
+
 kernel/chr_drv/chr_drv.a: dummy
 	(cd kernel/chr_drv; $(MAKE) KEYBOARD="$(KEYBOARD)")
 
@@ -119,6 +141,9 @@ mm/mm.o: dummy
 fs/fs.o: dummy
 	(cd fs; $(MAKE))
 
+net/net.o: dummy
+	(cd net; $(MAKE))
+
 fs/minix/minix.o: dummy
 	(cd fs/minix; $(MAKE))
 
@@ -147,6 +172,7 @@ clean:
 	(cd fs;make clean)
 	(cd kernel;make clean)
 	(cd lib;make clean)
+	(cd net;make clean)
 
 backup: clean
 	(cd .. ; tar cf - linux | compress - > backup.Z)
@@ -159,15 +185,16 @@ dep:
 	(cd fs; make dep)
 	(cd kernel; make dep)
 	(cd mm; make dep)
+	(cd net;make dep)
+	(cd lib; make dep)
 
 dummy:
 
 ### Dependencies:
-init/main.o : init/main.c include/unistd.h include/sys/stat.h \
-  include/sys/types.h include/sys/time.h include/time.h include/sys/times.h \
-  include/sys/utsname.h include/sys/param.h include/sys/resource.h \
-  include/utime.h include/linux/tty.h include/termios.h include/linux/sched.h \
-  include/linux/head.h include/linux/fs.h include/sys/dirent.h \
+init/main.o : init/main.c include/stddef.h include/stdarg.h include/fcntl.h include/sys/types.h \
+  include/time.h include/asm/system.h include/asm/io.h include/linux/config.h \
+  include/linux/config_rel.h include/linux/config_ver.h include/linux/config.dist.h \
+  include/linux/sched.h include/linux/head.h include/linux/fs.h include/sys/dirent.h \
   include/limits.h include/linux/mm.h include/linux/kernel.h include/signal.h \
-  include/asm/system.h include/asm/io.h include/stddef.h include/stdarg.h \
-  include/fcntl.h include/string.h 
+  include/sys/param.h include/sys/time.h include/sys/resource.h include/linux/tty.h \
+  include/termios.h include/linux/unistd.h