--- linux/Makefile	2018/04/24 18:01:42	1.1.1.3
+++ linux/Makefile	2018/04/24 18:02:35	1.1.1.4
@@ -21,6 +21,7 @@ CPP	=cpp -nostdinc -Iinclude
 # default of /dev/hd6 is used by 'build'.
 #
 ROOT_DEV=/dev/hd6
+SWAP_DEV=/dev/hd2
 
 ARCHIVES=kernel/kernel.o mm/mm.o fs/fs.o
 DRIVERS =kernel/blk_drv/blk_drv.a kernel/chr_drv/chr_drv.a
@@ -39,7 +40,8 @@ LIBS	=lib/lib.a
 all:	Image
 
 Image: boot/bootsect boot/setup tools/system tools/build
-	tools/build boot/bootsect boot/setup tools/system $(ROOT_DEV) > Image
+	tools/build boot/bootsect boot/setup tools/system $(ROOT_DEV) \
+		$(SWAP_DEV) > Image
 	sync
 
 disk: Image
@@ -85,17 +87,19 @@ 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
+
+boot/bootsect.s:	boot/bootsect.S include/linux/config.h
+	$(CPP) -traditional boot/bootsect.S -o boot/bootsect.s
+
 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/bootsect.s >> tmp.s
-
 clean:
-	rm -f Image System.map tmp_make core boot/bootsect boot/setup
+	rm -f Image System.map tmp_make core boot/bootsect boot/setup \
+		boot/bootsect.s boot/setup.s
 	rm -f init/*.o tools/system tools/build boot/*.o
 	(cd mm;make clean)
 	(cd fs;make clean)
@@ -116,8 +120,10 @@ dep:
 
 ### Dependencies:
 init/main.o : init/main.c include/unistd.h include/sys/stat.h \
-  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/signal.h include/asm/system.h include/asm/io.h \
-  include/stddef.h include/stdarg.h include/fcntl.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/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