Diff markup
>> 001
>> 002
>> 003
>> 004
>> 005
>> 006
>> 007
>> 008
>> 009
>> 010
>> 011
>> 012
>> 013
>> 014
>> 015
>> 016
>> 017
001 CC=gcc 018 CC=gcc
002 CFLAGS = -Wall -nostdlib -nostdinc -ffreestan !! 019 LD=ld
003 LDFLAGS = --warn-common !! 020 CFLAGS = -Wall -nostdinc -ffreestanding -DKERNEL_SOS
>> 021 LDFLAGS = --warn-common -nostdlib
004 OBJECTS = bootstrap/multiboot.o 022 OBJECTS = bootstrap/multiboot.o \
005 hwcore/idt.o hwcore/gdt.o 023 hwcore/idt.o hwcore/gdt.o \
006 hwcore/exception.o hwcore/exception_ 024 hwcore/exception.o hwcore/exception_wrappers.o \
007 hwcore/irq.o hwcore/irq_wrappers.o h 025 hwcore/irq.o hwcore/irq_wrappers.o hwcore/i8259.o \
008 hwcore/paging.o 026 hwcore/paging.o \
009 hwcore/i8254.o drivers/x86_videomem. 027 hwcore/i8254.o drivers/x86_videomem.o drivers/bochs.o \
010 hwcore/cpu_context.o hwcore/cpu_cont 028 hwcore/cpu_context.o hwcore/cpu_context_switch.o \
011 sos/kmem_vmm.o sos/kmem_slab.o sos/k 029 sos/kmem_vmm.o sos/kmem_slab.o sos/kmalloc.o \
012 sos/physmem.o sos/klibc.o 030 sos/physmem.o sos/klibc.o \
013 sos/assert.o sos/main.o !! 031 sos/thread.o sos/kwaitq.o \
>> 032 sos/time.o sos/sched.o sos/ksynch.o \
>> 033 sos/assert.o sos/main.o sos/mouse_sim.o
014 034
015 KERNEL_OBJ = sos.elf 035 KERNEL_OBJ = sos.elf
016 MULTIBOOT_IMAGE = fd.img 036 MULTIBOOT_IMAGE = fd.img
017 PWD := $(shell pwd) 037 PWD := $(shell pwd)
018 038
019 039
020 all: $(MULTIBOOT_IMAGE) 040 all: $(MULTIBOOT_IMAGE)
021 041
022 $(MULTIBOOT_IMAGE): $(KERNEL_OBJ) 042 $(MULTIBOOT_IMAGE): $(KERNEL_OBJ)
023 ./support/build_image.sh $@ $< 043 ./support/build_image.sh $@ $<
024 044
025 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds 045 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds
026 $(LD) $(LDFLAGS) -T ./support/sos.lds 046 $(LD) $(LDFLAGS) -T ./support/sos.lds -o $@ $(OBJECTS)
027 -nm -C $@ | cut -d ' ' -f 1,3 > sos.ma 047 -nm -C $@ | cut -d ' ' -f 1,3 > sos.map
028 size $@ 048 size $@
029 049
030 -include .mkvars 050 -include .mkvars
031 051
032 # Create objects from C source code 052 # Create objects from C source code
033 %.o: %.c 053 %.o: %.c
034 $(CC) -I$(PWD) -c $< $(CFLAGS) -o $@ 054 $(CC) -I$(PWD) -c $< $(CFLAGS) -o $@
035 055
036 056
037 %.o: %.S 057 %.o: %.S
038 $(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_S 058 $(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_SOURCE=1 -o $@
>> 059
>> 060 FORCE:
>> 061 @
039 062
040 063
041 clean: 064 clean:
042 $(RM) *.img *.o mtoolsrc *~ menu.txt * 065 $(RM) *.img *.o mtoolsrc *~ menu.txt *.img *.elf *.bin *.map
043 $(RM) *.log *.out bochs* 066 $(RM) *.log *.out bochs*
044 $(RM) bootstrap/*.o bootstrap/*~ 067 $(RM) bootstrap/*.o bootstrap/*~
045 $(RM) drivers/*.o drivers/*~ 068 $(RM) drivers/*.o drivers/*~
046 $(RM) hwcore/*.o hwcore/*~ 069 $(RM) hwcore/*.o hwcore/*~
047 $(RM) sos/*.o sos/*~ 070 $(RM) sos/*.o sos/*~
048 $(RM) support/*~ 071 $(RM) support/*~
049 $(RM) extra/*~ 072 $(RM) extra/*~