diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-08-02 11:24:26 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-08-02 11:24:26 +0200 |
| commit | 7d40548496f4d3cdfce828fc8e4f0fd4286e873a (patch) | |
| tree | 97e0e01b231d602c63d95b481208b318c89e8018 /src/Makefile | |
| parent | 69af92a0ab9df5ebab1eb4bc69d83d89388e6ded (diff) | |
| download | abaos-7d40548496f4d3cdfce828fc8e4f0fd4286e873a.tar.gz abaos-7d40548496f4d3cdfce828fc8e4f0fd4286e873a.tar.bz2 | |
introduced a network library, added ethernet structure, moved
generic stuff out of the network driver, kernel now sees ARP
messages and prints src and dst MAC addresses
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index c71cfa8..32e98e6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ CC := gcc DEFINES = -DOS_ABAOS OPT := -O0 -INCLUDES = -I. -Ilibc -Ihardware -Idrivers -Idrivers/hdi -Idrivers/hdi/ps2 -Idrivers/video -Idrivers/net -Ikernel -Igui +INCLUDES = -I. -Ilibc -Ihardware -Idrivers -Idrivers/hdi -Idrivers/hdi/ps2 -Idrivers/video -Inet -Idrivers/net -Ikernel -Igui CFLAGS := -std=c99 -m32 -march=i486 -ffreestanding $(OPT) -g -Werror $(INCLUDES) $(DEFINES) LD := ld LDFLAGS := -lgcc @@ -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/mouse.o drivers/hdi/keyboard.o drivers/hdi/ps2/ps2keyboard.o drivers/hdi/ps2/ps2mouse.o drivers/video/video.o drivers/video/vga.o drivers/video/vga_font.o drivers/net/network.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/keyboard.o drivers/hdi/ps2/ps2keyboard.o drivers/hdi/ps2/ps2mouse.o drivers/video/video.o drivers/video/vga.o drivers/video/vga_font.o net/ethernet.o drivers/net/network.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,6 +45,7 @@ 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 \ + net/ethernet.o \ drivers/driver.o \ drivers/hdi/mouse.o drivers/hdi/keyboard.o \ drivers/hdi/ps2/ps2keyboard.o drivers/hdi/ps2/ps2mouse.o \ @@ -98,6 +99,9 @@ hardware/interrupts_asm.o: hardware/interrupts.asm hardware/pci.o: hardware/pci.c hardware/pci.h $(CC) $(CFLAGS) -c -o hardware/pci.o hardware/pci.c +network/ethernet.o: network/ethernet.c network/ethernet.h + $(CC) $(CFLAGS) -c -o network/ethernet.o network/ethernet.c + drivers/driver.o: drivers/driver.c drivers/driver.h $(CC) $(CFLAGS) -c -o drivers/driver.o drivers/driver.c |