From a3316cee5ebac1f0e6e8c01e8a494de45d2e63de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asc=C3=AAnio?= Date: Fri, 30 Jul 2021 14:32:18 -0300 Subject: [PATCH] build: simplify makefile --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e774f89..150a46c 100644 --- a/Makefile +++ b/Makefile @@ -10,20 +10,20 @@ x86_64_asm_object_files := $(patsubst src/impl/x86_64/%.asm, build/x86_64/%.o, $ x86_64_object_files := $(x86_64_c_object_files) $(x86_64_asm_object_files) $(kernel_object_files): build/kernel/%.o : src/impl/kernel/%.c - mkdir -p $(dir $@) && \ + mkdir -p $(dir $@) x86_64-elf-gcc -c -I src/intf -ffreestanding $(patsubst build/kernel/%.o, src/impl/kernel/%.c, $@) -o $@ $(x86_64_c_object_files): build/x86_64/%.o : src/impl/x86_64/%.c - mkdir -p $(dir $@) && \ + mkdir -p $(dir $@) x86_64-elf-gcc -c -I src/intf -ffreestanding $(patsubst build/x86_64/%.o, src/impl/x86_64/%.c, $@) -o $@ $(x86_64_asm_object_files): build/x86_64/%.o : src/impl/x86_64/%.asm - mkdir -p $(dir $@) && \ + mkdir -p $(dir $@) nasm -f elf64 $(patsubst build/x86_64/%.o, src/impl/x86_64/%.asm, $@) -o $@ .PHONY: build-x86_64 build-x86_64: $(kernel_object_files) $(x86_64_object_files) - mkdir -p dist/x86_64 && \ - x86_64-elf-ld -n -o dist/x86_64/kernel.bin -T targets/x86_64/linker.ld $(kernel_object_files) $(x86_64_object_files) && \ - cp dist/x86_64/kernel.bin targets/x86_64/iso/boot/kernel.bin && \ + mkdir -p dist/x86_64 + x86_64-elf-ld -n -o dist/x86_64/kernel.bin -T targets/x86_64/linker.ld $(kernel_object_files) $(x86_64_object_files) + cp dist/x86_64/kernel.bin targets/x86_64/iso/boot/kernel.bin grub-mkrescue /usr/lib/grub/i386-pc -o dist/x86_64/kernel.iso targets/x86_64/iso