From 3d3b4fe884c22894a8414480c2f6c9ca7c6160b7 Mon Sep 17 00:00:00 2001 From: Xnoe Date: Fri, 17 Dec 2021 13:59:50 +0000 Subject: [PATCH] Improved Makefile --- Makefile | 60 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index be53b38..a30d3e7 100644 --- a/Makefile +++ b/Makefile @@ -2,22 +2,42 @@ CFLAGS = -g -std=gnu11 -m32 -mgeneral-regs-only -nostdlib -fno-builtin -fno-exce CXXFLAGS = -g -m32 -fno-use-cxa-atexit -mgeneral-regs-only -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-leading-underscore -fpermissive -fno-pie -fno-stack-protector -I. LDFLAGS = -DISK_IMG_FILES = build/kernel/kernel.bin build/program/program.bin build/program/hello.bin \ - build/program/world.bin hello.txt alpha.txt -KERNEL_OBJS = build/kernel/entry.o build/kernel/screenstuff.o build/kernel/io.o build/kernel/idt.o build/kernel/keyboard.o \ - build/kernel/strings.o build/kernel/atapio.o build/kernel/kmain.o build/kernel/paging.o build/kernel/allocate.o \ - build/kernel/gdt.o build/kernel/memory.o build/kernel/process.o build/kernel/datatypes/hash.o \ - build/kernel/terminal.o build/kernel/global.o build/kernel/kernel.o -STAGE2_OBJS = build/c_code_entry.o build/boot_stage2/io.o build/boot_stage2/atapio.o build/boot_stage2/strings.o build/boot_stage2/screenstuff.o build/boot_stage2/stage2.o build/boot_stage2/paging.o -PROGRAM_OBJS = build/program_code_entry.o build/program/program.o build/common/common.o -HELLO_OBJS = build/program_code_entry.o build/program/hello.o build/common/common.o -WORLD_OBJS = build/program_code_entry.o build/program/world.o build/common/common.o +DISK_IMG_FILES = build/kernel/kernel.bin build/program/program.bin build/hello/hello.bin \ + build/world/world.bin hello.txt alpha.txt + +KERNEL_CPP_SRCS = $(wildcard src/kernel/*.cpp) $(wildcard src/kernel/*/*.cpp) +KERNEL_ASM_SRCS = $(wildcard src/kernel/*.asm) +KERNEL_CPP_OBJS = $(patsubst src/%.cpp,build/%.o,$(KERNEL_CPP_SRCS)) +KERNEL_ASM_OBJS = $(patsubst src/%.asm,build/%.o,$(KERNEL_ASM_SRCS)) + +KERNEL_OBJS = build/kernel/isr.o $(KERNEL_CPP_OBJS) $(KERNEL_ASM_OBJS) + +STAGE2_C_SRCS = $(wildcard src/boot_stage2/*.c) +STAGE2_C_OBJS = $(patsubst src/%.c,build/%.o,$(STAGE2_C_SRCS)) + +STAGE2_OBJS = build/c_code_entry.o $(STAGE2_C_OBJS) + +PROGRAM_COMMON = build/program_code_entry.o build/common/common.o + +PROGRAM_C_SRCS = $(wildcard src/program/*.c) +PROGRAM_C_OBJS = $(patsubst src/%.c,build/%.o,$(PROGRAM_C_SRCS)) +PROGRAM_OBJS = $(PROGRAM_COMMON) $(PROGRAM_C_OBJS) + +HELLO_C_SRCS = $(wildcard src/hello/*.c) +HELLO_C_OBJS = $(patsubst src/%.c,build/%.o,$(HELLO_C_SRCS)) +HELLO_OBJS = $(PROGRAM_COMMON) $(HELLO_C_OBJS) + +WORLD_C_SRCS = $(wildcard src/world/*.c) +WORLD_C_OBJS = $(patsubst src/%.c,build/%.o,$(WORLD_C_SRCS)) +WORLD_OBJS = $(PROGRAM_COMMON) $(WORLD_C_OBJS) + +.PHONY: run debug prepare clean run: disk.img - qemu-system-x86_64 disk.img + qemu-system-i386 disk.img debug: disk.img - qemu-system-x86_64 -s -S -no-reboot -no-shutdown disk.img & gdb --command=gdbscript + qemu-system-i386 -s -S -no-reboot -no-shutdown disk.img & gdb --command=gdbscript disk.img: clean prepare build/boot/boot.bin build/boot_stage2/boot.bin $(DISK_IMG_FILES) dd if=/dev/zero of=disk.img count=43 bs=100k @@ -35,6 +55,8 @@ prepare: mkdir -p build/kernel mkdir -p build/kernel/datatypes mkdir -p build/program + mkdir -p build/hello + mkdir -p build/world mkdir -p build/common mountpoint img.d | grep not || umount img.d @@ -58,9 +80,6 @@ build/%.bin: build/%.elf build/kernel/kernel.elf: src/kernel/kernel.ld $(KERNEL_OBJS) ld $(LDFLAGS) -T $< $(KERNEL_OBJS) -build/boot_stage2/stage2.o: src/boot_stage2/main.c - gcc $(CFLAGS) -o $@ -c $< - build/%.o: src/%.c gcc $(CFLAGS) -o $@ -c $< @@ -70,13 +89,20 @@ build/%.o: src/%.cpp build/%.o: src/%.asm nasm -felf32 $< -o $@ +build/kernel/isr.o: src/kernel/isr.S + nasm -felf32 $< -o $@ + +src/kernel/isr.S: src/kernel/isr.S.base src/kernel/gen_isr_asm.sh + cd src/kernel/ && ./gen_isr_asm.sh + # Program build/program/program.bin: src/program/program.ld $(PROGRAM_OBJS) + echo $(PROGRAM_OBJS) ld $(LDFLAGS) -T $< $(PROGRAM_OBJS) -build/program/hello.bin: src/program/hello.ld $(HELLO_OBJS) +build/hello/hello.bin: src/hello/hello.ld $(HELLO_OBJS) ld $(LDFLAGS) -T $< $(HELLO_OBJS) -build/program/world.bin: src/program/world.ld $(WORLD_OBJS) +build/world/world.bin: src/world/world.ld $(WORLD_OBJS) ld $(LDFLAGS) -T $< $(WORLD_OBJS) \ No newline at end of file