Extract the OBJECTS variable.
This commit is contained in:
parent
3344730568
commit
7d1b88ec00
6
Makefile
6
Makefile
@ -23,6 +23,9 @@ ASMFLAGS = -target elf-i386 -ffreestanding -c -g
|
|||||||
LDKERNELFLAGS = --script=script.ld
|
LDKERNELFLAGS = --script=script.ld
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
OBJECTS = kernel.o console.o drivers/vga.o drivers/uart.o drivers/keyboard.o \
|
||||||
|
cpu/idt.o cpu/vectors.o lib/mem.o
|
||||||
|
|
||||||
run: image.bin
|
run: image.bin
|
||||||
qemu-system-i386 -drive format=raw,file=$< -serial mon:stdio
|
qemu-system-i386 -drive format=raw,file=$< -serial mon:stdio
|
||||||
|
|
||||||
@ -84,8 +87,7 @@ user/%: user/%.o user/crt.o
|
|||||||
image.bin: mbr.bin fs.img
|
image.bin: mbr.bin fs.img
|
||||||
cat $^ >$@
|
cat $^ >$@
|
||||||
|
|
||||||
kernel.bin: kernel.o console.o drivers/vga.o drivers/uart.o drivers/keyboard.o \
|
kernel.bin: $(OBJECTS)
|
||||||
cpu/idt.o cpu/vectors.o lib/mem.o
|
|
||||||
$(LD) $(LDFLAGS) $(LDKERNELFLAGS) -o $@ -Ttext 0x9000 $^
|
$(LD) $(LDFLAGS) $(LDKERNELFLAGS) -o $@ -Ttext 0x9000 $^
|
||||||
|
|
||||||
bootmain.o: bootmain.c
|
bootmain.o: bootmain.c
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user