Remove leftovers from new IRQ system cherrypick

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index f254d0c8ed42952a44a7d1cd42ad6c699b727b63..5d8c1ebb6dba7518b570733a9d170f1eba2ecf37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ export GIT_REV = $(shell git describe --long HEAD)
 
 CFLAGS = -g -fgnu89-inline -Ikernel/include -Ikernel/include/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
 
-KERNEL_OBJ = kernel/entry.o kernel/arch/x86/halt.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/sample_handler.o kernel/kernel.o
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/halt.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/interrupt.o kernel/arch/x86/irq/stub.o kernel/kernel.o
 
 BOOTLOADER_OBJ = boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/stage3/loader.elf
 
@@ -39,9 +39,6 @@ boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN bo
        mcopy -i boot/x86/disk.img@@1M boot/x86/stage3/LOADER.BIN ::.
        mcopy -i boot/x86/disk.img@@1M kernel/kernel.elf ::./KERNEL.ELF
 
-kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
-       $(CC) $(CFLAGS) -mgeneral-regs-only -c $< -o $@
-
 kernel/kernel.elf: $(KERNEL_OBJ)
        $(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -lgcc
        i686-elf-objcopy --only-keep-debug kernel/kernel.elf kernel/kernel.dbg