--- linux/Makefile	2018/04/24 18:05:46	1.1.1.7
+++ linux/Makefile	2018/04/24 18:13:53	1.1.1.12
@@ -1,38 +1,76 @@
 #
-# 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:
+# uncomment this if you want kernel profiling: the profile_shift is the
+# granularity of the profiling (5 = 32-byte granularity)
 #
 
-# KEYBOARD = -DKBD_FINNISH
-KEYBOARD = -DKBD_US
-# KEYBOARD = -DKBD_GR
-# KEYBOARD = -DKBD_FR
-# KEYBOARD = -DKBD_UK
-# KEYBOARD = -DKBD_DK
+PROFILING =# -DPROFILE_SHIFT=2
 
 #
-# uncomment this line if you are using gcc-1.40
+# uncomment the correct keyboard:
 #
-#GCC_OPT = -fcombine-regs -fstrength-reduce
+# 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_SG -DKBDFLAGS=0
+# KEYBOARD = -DKBD_SG_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKBD_SF -DKBDFLAGS=0
+# KEYBOARD = -DKBD_SF_LATIN1 -DKBDFLAGS=0x9F
+# KEYBOARD = -DKDB_NO
 
 #
-# standard CFLAGS
+# comment this line if you don't want the emulation-code
 #
 
-CFLAGS =-Wall -O6 -fomit-frame-pointer $(GCC_OPT)
+MATH_EMULATION = -DKERNEL_MATH_EMULATION
 
 #
-# 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'.
+# Maximum memory used by the kernel. This is normally 16MB - some of the
+# SCSI drivers may have problems with anything else due to DMA limits. The
+# drivers should check, but they don't. The ONLY valid values for
+# MAX_MEGABYTES are 16 and 32 - anything else needs kernel diffs.
+#
+# EVEN IF YOU HAVE > 16MB, YOU SHOULD EDIT THIS ONLY IF YOU ARE 100%
+# SURE YOU AREN'T USING ANY DEVICE THAT DOES UNCHECKED DMA!!  THE
+# FLOPPY DRIVER IS OK, BUT OTHERS MIGHT HAVE PROBLEMS.
 #
 
-# ROOT_DEV = /dev/hdb1
+MAX_MEGABYTES = 16
+
+#
+# standard CFLAGS
+#
+
+CFLAGS =-Wall -O6 -fomit-frame-pointer -DMAX_MEGABYTES=$(MAX_MEGABYTES)
 
 #
 # if you want the ram-disk device, define this to be the
@@ -44,36 +82,56 @@ CFLAGS =-Wall -O6 -fomit-frame-pointer $
 AS86	=as86 -0 -a
 LD86	=ld86 -0
 
+#
+# If you want to preset the SVGA mode, uncomment the next line and
+# set SVGA_MODE to whatever number you want.
+# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
+# The number is the same as you would ordinarily press at bootup.
+#
+SVGA_MODE=	-DSVGA_MODE=1
+
 AS	=as
 LD	=ld
-#LDFLAGS	=-s -x -M
-LDFLAGS	= -M
-CC	=gcc $(RAMDISK)
-MAKE	=make CFLAGS="$(CFLAGS)"
-CPP	=cpp -nostdinc -Iinclude
-
-ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o
-FILESYSTEMS	=fs/minix/minix.o
-DRIVERS		=kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a
+HOSTCC	=gcc -static
+CC	=gcc -DKERNEL
+MAKE	=make
+CPP	=$(CC) -E -DMAX_MEGABYTES=$(MAX_MEGABYTES)
+AR	=ar
+
+ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o net/net.o
+FILESYSTEMS	=fs/minix/minix.o fs/ext/ext.o fs/msdos/msdos.o fs/proc/proc.o
+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
+SUBDIRS		=kernel mm fs net lib
+
+KERNELHDRS	=/usr/src/linux/include
 
 .c.s:
-	$(CC) $(CFLAGS) \
-	-nostdinc -Iinclude -S -o $*.s $<
+	$(CC) $(CFLAGS) -S -o $*.s $<
 .s.o:
 	$(AS) -c -o $*.o $<
 .c.o:
-	$(CC) $(CFLAGS) \
-	-nostdinc -Iinclude -c -o $*.o $<
+	$(CC) $(CFLAGS) -c -o $*.o $<
 
 all:	Version Image
 
+lilo: Image
+	if [ -f /vmlinux ]; then mv /vmlinux /vmlinux.old; fi
+	dd if=Image of=/vmlinux
+	/etc/lilo/lilo -b /dev/hda /vmlinux
+
+linuxsubdirs: dummy
+	@for i in $(SUBDIRS); do (cd $$i && echo $$i && $(MAKE)) || exit; done
+
 Version:
 	@./makever.sh
-	@echo \#define UTS_RELEASE \"0.95c-`cat .version`\" > include/linux/config_rel.h
-	@echo \#define UTS_VERSION \"`date +%D`\" > include/linux/config_ver.h
-	touch include/linux/config.h
+	@echo \#define UTS_RELEASE \"0.98-`cat .version`\" > tools/version.h
+	@echo \#define UTS_VERSION \"`date +%D`\" >> tools/version.h
+	@echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> tools/version.h
+	@echo \#define LINUX_COMPILE_BY \"`whoami`\" >> tools/version.h
+	@echo \#define LINUX_COMPILE_HOST \"`hostname`\" >> tools/version.h
 
 Image: boot/bootsect boot/setup tools/system tools/build
 	cp tools/system system.tmp
@@ -83,54 +141,37 @@ Image: boot/bootsect boot/setup tools/sy
 	sync
 
 disk: Image
-	dd bs=8192 if=Image of=/dev/PS0
+	dd bs=8192 if=Image of=/dev/fd0
 
 tools/build: tools/build.c
-	$(CC) $(CFLAGS) \
+	$(HOSTCC) $(CFLAGS) \
 	-o tools/build tools/build.c
 
 boot/head.o: boot/head.s
 
-tools/system:	boot/head.o init/main.o \
-		$(ARCHIVES) $(FILESYSTEMS) $(DRIVERS) $(MATH) $(LIBS)
-	$(LD) $(LDFLAGS) boot/head.o init/main.o \
-	$(ARCHIVES) \
-	$(FILESYSTEMS) \
-	$(DRIVERS) \
-	$(MATH) \
-	$(LIBS) \
-	-o tools/system > System.map
-
-kernel/math/math.a: dummy
-	(cd kernel/math; $(MAKE) MATH_EMULATION="$(MATH_EMULATION)")
-
-kernel/blk_drv/blk_drv.a: dummy
-	(cd kernel/blk_drv; $(MAKE))
-
-kernel/chr_drv/chr_drv.a: dummy
-	(cd kernel/chr_drv; $(MAKE) KEYBOARD="$(KEYBOARD)")
-
-kernel/kernel.o: dummy
-	(cd kernel; $(MAKE))
-
-mm/mm.o: dummy
-	(cd mm; $(MAKE))
+boot/head.s: boot/head.S
+	$(CPP) -traditional boot/head.S -o boot/head.s
 
-fs/fs.o: dummy
-	(cd fs; $(MAKE))
+tools/version.o: tools/version.c tools/version.h
 
-fs/minix/minix.o: dummy
-	(cd fs/minix; $(MAKE))
+init/main.o: init/main.c
+	$(CC) $(CFLAGS) $(PROFILING) -c -o $*.o $<
 
-lib/lib.a: dummy
-	(cd lib; $(MAKE))
+tools/system:	boot/head.o init/main.o tools/version.o linuxsubdirs
+	$(LD) $(LDFLAGS) -M boot/head.o init/main.o tools/version.o \
+		$(ARCHIVES) \
+		$(FILESYSTEMS) \
+		$(DRIVERS) \
+		$(MATH) \
+		$(LIBS) \
+		-o tools/system > System.map
 
 boot/setup: boot/setup.s
 	$(AS86) -o boot/setup.o boot/setup.s
 	$(LD86) -s -o boot/setup boot/setup.o
 
 boot/setup.s:	boot/setup.S include/linux/config.h
-	$(CPP) -traditional boot/setup.S -o boot/setup.s
+	$(CPP) -traditional $(SVGA_MODE) boot/setup.S -o boot/setup.s
 
 boot/bootsect.s:	boot/bootsect.S include/linux/config.h
 	$(CPP) -traditional boot/bootsect.S -o boot/bootsect.s
@@ -139,35 +180,42 @@ boot/bootsect:	boot/bootsect.s
 	$(AS86) -o boot/bootsect.o boot/bootsect.s
 	$(LD86) -s -o boot/bootsect boot/bootsect.o
 
+fs: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=fs
+
+mm: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=mm
+
+kernel: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=kernel
+
 clean:
 	rm -f Image System.map tmp_make core boot/bootsect boot/setup \
-		boot/bootsect.s boot/setup.s init/main.s
-	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)
+		boot/bootsect.s boot/setup.s boot/head.s init/main.s
+	rm -f init/*.o tools/system tools/build boot/*.o tools/*.o
+	for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean); done
 
 backup: clean
-	(cd .. ; tar cf - linux | compress - > backup.Z)
+	cd .. && tar cf - linux | compress - > backup.Z
 	sync
 
-dep:
+depend dep:
 	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	(for i in init/*.c;do echo -n "init/";$(CPP) -M $$i;done) >> tmp_make
+	for i in init/*.c;do echo -n "init/";$(CPP) -M $$i;done >> tmp_make
 	cp tmp_make Makefile
-	(cd fs; make dep)
-	(cd kernel; make dep)
-	(cd mm; make dep)
+	for i in $(SUBDIRS); do (cd $$i && $(MAKE) dep) || exit; done
 
 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 \
-  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 
+init/main.o : init/main.c /usr/lib/gcc-lib/i386-linux/2.2.2d/include/stdarg.h /usr/include/asm/system.h \
+  /usr/include/asm/io.h /usr/include/linux/mktime.h /usr/include/linux/types.h \
+  /usr/include/linux/fcntl.h /usr/include/linux/config.h /usr/include/linux/config.dist.h \
+  /usr/include/linux/sched.h /usr/include/linux/head.h /usr/include/linux/fs.h \
+  /usr/include/linux/limits.h /usr/include/linux/wait.h /usr/include/linux/dirent.h \
+  /usr/include/linux/vfs.h /usr/include/linux/pipe_fs_i.h /usr/include/linux/minix_fs_i.h \
+  /usr/include/linux/ext_fs_i.h /usr/include/linux/msdos_fs_i.h /usr/include/linux/minix_fs_sb.h \
+  /usr/include/linux/ext_fs_sb.h /usr/include/linux/msdos_fs_sb.h /usr/include/linux/mm.h \
+  /usr/include/linux/kernel.h /usr/include/linux/signal.h /usr/include/linux/time.h \
+  /usr/include/linux/param.h /usr/include/linux/resource.h /usr/include/linux/vm86.h \
+  /usr/include/linux/tty.h /usr/include/linux/termios.h /usr/include/linux/unistd.h