diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-02 12:13:36 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-02 12:13:36 +0100 |
| commit | 4c4e1c1920c28872e72faf91877467197a1d4b6a (patch) | |
| tree | 805ff65d5fe533ef41cee8b2b21356f7b54e9301 /kernel | |
| parent | 38b74d5116d410d8a43434ce2564cd6f155cb62b (diff) | |
| download | os_skeleton-4c4e1c1920c28872e72faf91877467197a1d4b6a.zip os_skeleton-4c4e1c1920c28872e72faf91877467197a1d4b6a.tar.gz | |
kernel/makefile: add missing kernel_asm.o to linker cmd, use $<
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/makefile b/kernel/makefile index c579016..5a53f00 100644 --- a/kernel/makefile +++ b/kernel/makefile @@ -3,7 +3,7 @@ all: run run : ld ld: kernel.o bootloader.o gdt.o gdt_asm.o - ld -Tkernel.ld -melf_i386 gdt_asm.o bootloader.o kernel.o gdt.o -o kernel.elf + ld -Tkernel.ld -melf_i386 gdt_asm.o bootloader.o kernel.o kernel_asm.o gdt.o -o kernel.elf kernel.o: kernel.c kernel_asm.o gcc -DTEST -std=gnu99 -m32 -fno-builtin -ffreestanding -Wall -Wextra -c kernel.c @@ -12,7 +12,7 @@ kernel_asm.o: kernel_asm.s nasm -f elf32 $< bootloader.o: bootloader.s - nasm -f elf32 bootloader.s + nasm -f elf32 $< gdt.o: gdt.c gdt.h gcc -std=gnu99 -m32 -fno-builtin -ffreestanding -Wall -Wextra -c gdt.c |