From 4c4e1c1920c28872e72faf91877467197a1d4b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 2 Nov 2015 12:13:36 +0100 Subject: kernel/makefile: add missing kernel_asm.o to linker cmd, use $< --- kernel/makefile | 4 ++-- 1 file 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 -- cgit v1.1-2-g2b99