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