--- linux/Makefile 2018/04/24 18:06:49 1.1.1.8 +++ linux/Makefile 2018/04/24 18:11:55 1.1.1.11 @@ -34,6 +34,9 @@ KEYBOARD = -DKBD_FINNISH -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 = -DKDB_NO # # comment this line if you don't want the emulation-code @@ -42,15 +45,10 @@ KEYBOARD = -DKBD_FINNISH -DKBDFLAGS=0 MATH_EMULATION = -DKERNEL_MATH_EMULATION # -# uncomment this line if you are using gcc-1.40 -# -#GCC_OPT = -fcombine-regs -fstrength-reduce - -# # standard CFLAGS # -CFLAGS =-Wall -O6 -fomit-frame-pointer $(GCC_OPT) +CFLAGS =-Wall -O6 -fomit-frame-pointer # # if you want the ram-disk device, define this to be the @@ -62,35 +60,47 @@ 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 +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 +FILESYSTEMS =fs/minix/minix.o fs/ext/ext.o fs/msdos/msdos.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 +linuxsubdirs: dummy + @for i in $(SUBDIRS); do (cd $$i; echo $$i; $(MAKE)) || exit; done + Version: @./makever.sh - @echo \#define UTS_RELEASE \"0.96a-`cat .version`\" > include/linux/config_rel.h + @echo \#define UTS_RELEASE \"0.97-`cat .version`\" > include/linux/config_rel.h @echo \#define UTS_VERSION \"`date +%D`\" > include/linux/config_ver.h touch include/linux/config.h @@ -102,60 +112,29 @@ 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) -static $(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/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)") - -kernel/kernel.o: dummy - (cd kernel; $(MAKE)) - -mm/mm.o: dummy - (cd mm; $(MAKE)) - -fs/fs.o: dummy - (cd fs; $(MAKE)) - -net/net.o: dummy - (cd net; $(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 linuxsubdirs + $(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 $(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 @@ -164,37 +143,36 @@ 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 + 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) - (cd net;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) - (cd net;make dep) - (cd lib; make dep) + for i in $(SUBDIRS); do (cd $$i; $(MAKE) dep) || exit; done dummy: ### Dependencies: -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/sys/param.h include/sys/time.h include/sys/resource.h include/linux/tty.h \ - include/termios.h include/linux/unistd.h +init/main.o : init/main.c /usr/src/linux/include/stdarg.h /usr/src/linux/include/time.h \ + /usr/src/linux/include/asm/system.h /usr/src/linux/include/asm/io.h /usr/src/linux/include/linux/types.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/linux/limits.h /usr/src/linux/include/linux/wait.h /usr/src/linux/include/linux/dirent.h \ + /usr/src/linux/include/linux/vfs.h /usr/src/linux/include/linux/minix_fs_sb.h \ + /usr/src/linux/include/linux/ext_fs_sb.h /usr/src/linux/include/linux/msdos_fs_sb.h \ + /usr/src/linux/include/linux/mm.h /usr/src/linux/include/linux/kernel.h /usr/src/linux/include/linux/signal.h \ + /usr/src/linux/include/linux/time.h /usr/src/linux/include/linux/param.h /usr/src/linux/include/linux/resource.h \ + /usr/src/linux/include/linux/tty.h /usr/src/linux/include/linux/termios.h /usr/src/linux/include/linux/unistd.h