summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 9c6a931..14aa939 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,11 +28,11 @@ kernel.bin: kernel.elf
kernel.sym: kernel.elf
$(OBJCOPY) --only-keep-debug kernel.elf kernel.sym
-kernel.elf: kernel.o console.o vga.o serial.o port.o port_asm.o interrupts.o interrupts_asm.o string.o stdlib.o stdio.o setjmp.o
+kernel.elf: kernel.o console.o vga.o serial.o port.o port_asm.o interrupts.o interrupts_asm.o keyboard.o string.o stdlib.o stdio.o setjmp.o
$(LD) -o kernel.elf -N -n -Ttext 0x8400 --oformat elf32-i386 \
kernel.o console.o vga.o serial.o port.o port_asm.o \
- interrupts.o interrupts_asm.o string.o stdlib.o stdio.o \
- setjmp.o
+ interrupts.o interrupts_asm.o keyboard.o \
+ string.o stdlib.o stdio.o setjmp.o
magic.bin: magic.asm
$(NASM) magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin
@@ -61,6 +61,9 @@ interrupts.o: interrupts.c interrupts.h
interrupts_asm.o: interrupts.asm
$(NASM) interrupts.asm $(NASMFLAGS) -o interrupts_asm.o
+keyboard.o: keyboard.c keyboard.h
+ $(CC) $(CFLAGS) -c -o keyboard.o keyboard.c
+
string.o: string.c string.h
$(CC) $(CFLAGS) -c -o string.o string.c