aboutsummaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2014-12-04 20:41:36 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2014-12-04 20:41:36 +0100
commit902eea7a56b38c20bbdca414e58fc6c3f4393025 (patch)
treebdf41874662f70b8d881c9af315a396b50893d50 /kernel/Makefile
parent3d1d4a069309e8bf07ea90500a0dcc97f50deacf (diff)
downloadmacroscope-902eea7a56b38c20bbdca414e58fc6c3f4393025.tar.gz
macroscope-902eea7a56b38c20bbdca414e58fc6c3f4393025.zip
First implementation of slab allocator. Needs more testing and polishing
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 58a6339..2adacbc 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,7 +9,7 @@ CFLAGS = -ffreestanding -O2 -std=gnu99 -Wall -Wextra -I . -I ./include -g -Wno-u
LD = i586-elf-gcc
LDFLAGS = -T linker.ld -ffreestanding -O2 -nostdlib -lgcc
-OBJ = lib/string.o lib/printf.o \
+OBJ = lib/string.o lib/printf.o lib/slab_alloc.o \
l0/loader.o l0/kmain.o l0/dbglog.o l0/sys.o \
l0/gdt.o l0/idt.o l0/interrupt.o \
l0/frame.o l0/paging.o l0/region.o