summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2017-07-18 21:23:22 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2017-07-18 21:23:22 +0200
commitee3e51aa1624693217b1a4ae7bfb2730424c08f2 (patch)
treebebd430417bad79c9cd1aa91f48d168f90795621 /src/Makefile
parent3a1570d0e6531e3f49e79bbbe4e24d6280e49b1a (diff)
downloadabaos-ee3e51aa1624693217b1a4ae7bfb2730424c08f2.tar.gz
abaos-ee3e51aa1624693217b1a4ae7bfb2730424c08f2.tar.bz2
added a virtual mouse driver interface, made the PS/2 mouse a specialization of it
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index 013e895..5b67063 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,7 +36,7 @@ kernel.bin: kernel.elf
kernel.sym: kernel.elf
$(OBJCOPY) --only-keep-debug kernel.elf kernel.sym
-kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/memorymanagement.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o drivers/net/rtl8139.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
+kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/memorymanagement.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/mouse.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/ps2mouse.o drivers/video/vga.o drivers/video/vga_font.o drivers/net/rtl8139.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
$(LD) -o kernel.elf -N -n -Ttext 0x8800 -e kernel_entry --oformat elf32-i386 \
kernel/entry.o \
kernel/kernel.o kernel/kernel_asm.o \
@@ -45,8 +45,8 @@ kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o
hardware/port.o hardware/port_asm.o \
hardware/interrupts.o hardware/interrupts_asm.o \
hardware/pci.o \
- drivers/driver.o \
- drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o \
+ drivers/driver.o drivers/hdi/mouse.o \
+ drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/ps2mouse.o \
drivers/video/vga.o drivers/video/vga_font.o \
drivers/net/rtl8139.o \
libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o \
@@ -98,11 +98,14 @@ hardware/pci.o: hardware/pci.c hardware/pci.h
drivers/driver.o: drivers/driver.c drivers/driver.h
$(CC) $(CFLAGS) -c -o drivers/driver.o drivers/driver.c
+drivers/hdi/mouse.o: drivers/hdi/mouse.c drivers/hdi/mouse.h
+ $(CC) $(CFLAGS) -c -o drivers/hdi/mouse.o drivers/hdi/mouse.c
+
drivers/hdi/ps2/keyboard.o: drivers/hdi/ps2/keyboard.c drivers/hdi/ps2/keyboard.h
$(CC) $(CFLAGS) -c -o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/keyboard.c
-drivers/hdi/ps2/mouse.o: drivers/hdi/ps2/mouse.c drivers/hdi/ps2/mouse.h
- $(CC) $(CFLAGS) -c -o drivers/hdi/ps2/mouse.o drivers/hdi/ps2/mouse.c
+drivers/hdi/ps2/ps2mouse.o: drivers/hdi/ps2/ps2mouse.c drivers/hdi/ps2/ps2mouse.h
+ $(CC) $(CFLAGS) -c -o drivers/hdi/ps2/ps2mouse.o drivers/hdi/ps2/ps2mouse.c
drivers/video/vga.o: drivers/video/vga.c drivers/video/vga.h
$(CC) $(CFLAGS) -c -o drivers/video/vga.o drivers/video/vga.c