summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index af34ee1..8bebd54 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ KOBJ_FILES = $(KERNEL_ASM_OBJ) \
./build/idt/idt.o \
./build/io/io.asm.o \
./build/mm/heap.o \
- ./build/mm/kernel_heap.o
+ ./build/mm/kernel_heap.o \
+ ./build/mm/paging.asm.o \
+ ./build/mm/paging.o \
BOOT_TGT =./bin/boot.bin
@@ -71,6 +73,12 @@ $(BUILD_DIR)/mm/kernel_heap.o: ./src/mm/kernel_heap.c
$(KOBJ_LIBS):
i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/lib/string.c -o $(BUILD_DIR)/string.o
+
+$(BUILD_DIR)/mm/paging.asm.o: ./src/mm/paging.asm
+ nasm -f elf -g ./src/mm/paging.asm -o $(BUILD_DIR)/mm/paging.asm.o
+
+$(BUILD_DIR)/mm/paging.o: ./src/mm/paging.c
+ i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/mm/paging.c -o $(BUILD_DIR)/mm/paging.o
clean:
rm -f $(BOOT_TGT)
rm -f bin/kernel.bin