--- linux/Makefile 2018/04/24 18:05:46 1.1.1.7 +++ linux/Makefile 2018/04/24 18:10:21 1.1.1.10 @@ -1,38 +1,51 @@ # -# 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: # - -# KEYBOARD = -DKBD_FINNISH -KEYBOARD = -DKBD_US -# KEYBOARD = -DKBD_GR -# KEYBOARD = -DKBD_FR -# KEYBOARD = -DKBD_UK -# KEYBOARD = -DKBD_DK +# 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 # -# uncomment this line if you are using gcc-1.40 -# -#GCC_OPT = -fcombine-regs -fstrength-reduce - -# -# 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'. +# standard CFLAGS # -# ROOT_DEV = /dev/hdb1 +CFLAGS =-Wall -O6 -fomit-frame-pointer # # if you want the ram-disk device, define this to be the @@ -46,32 +59,37 @@ LD86 =ld86 -0 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 -nostdinc -I$(KERNELHDRS) +MAKE =make +CPP =$(CC) -E +AR =ar + +ARCHIVES =kernel/kernel.o mm/mm.o fs/fs.o net/net.o +FILESYSTEMS =fs/minix/minix.o fs/ext/ext.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 $< .s.o: $(AS) -c -o $*.o $< .c.o: - $(CC) $(CFLAGS) \ - -nostdinc -Iinclude -c -o $*.o $< + $(CC) $(CFLAGS) -c -o $*.o $< all: Version Image +subdirs: dummy + for i in $(SUBDIRS); do (cd $$i; $(MAKE)); done + Version: @./makever.sh - @echo \#define UTS_RELEASE \"0.95c-`cat .version`\" > include/linux/config_rel.h + @echo \#define UTS_RELEASE \"0.96c-`cat .version`\" > include/linux/config_rel.h @echo \#define UTS_VERSION \"`date +%D`\" > include/linux/config_ver.h touch include/linux/config.h @@ -86,44 +104,19 @@ disk: Image dd bs=8192 if=Image of=/dev/PS0 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)) - -fs/fs.o: dummy - (cd fs; $(MAKE)) - -fs/minix/minix.o: dummy - (cd fs/minix; $(MAKE)) - -lib/lib.a: dummy - (cd lib; $(MAKE)) +tools/system: boot/head.o init/main.o subdirs + $(LD) $(LDFLAGS) -M boot/head.o init/main.o \ + $(ARCHIVES) \ + $(FILESYSTEMS) \ + $(DRIVERS) \ + $(MATH) \ + $(LIBS) \ + -o tools/system > System.map boot/setup: boot/setup.s $(AS86) -o boot/setup.o boot/setup.s @@ -143,31 +136,28 @@ 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) + 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); 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/src/linux/include/stddef.h /usr/src/linux/include/stdarg.h \ + /usr/src/linux/include/time.h /usr/src/linux/include/sys/types.h /usr/src/linux/include/asm/system.h \ + /usr/src/linux/include/asm/io.h /usr/src/linux/include/linux/fcntl.h /usr/src/linux/include/linux/config.h \ + /usr/src/linux/include/linux/config_rel.h /usr/src/linux/include/linux/config_ver.h \ + /usr/src/linux/include/linux/config.dist.h /usr/src/linux/include/linux/sched.h \ + /usr/src/linux/include/linux/head.h /usr/src/linux/include/linux/fs.h /usr/src/linux/include/sys/dirent.h \ + /usr/src/linux/include/limits.h /usr/src/linux/include/sys/vfs.h /usr/src/linux/include/linux/mm.h \ + /usr/src/linux/include/linux/kernel.h /usr/src/linux/include/signal.h /usr/src/linux/include/sys/param.h \ + /usr/src/linux/include/sys/time.h /usr/src/linux/include/sys/resource.h /usr/src/linux/include/linux/tty.h \ + /usr/src/linux/include/termios.h /usr/src/linux/include/linux/unistd.h