From 90af8825a41981ce2ee52e0a9ce84f624eb022e6 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Tue, 26 Jul 2022 00:38:45 +0200 Subject: move user_bootstrap to user/bootstrap for consistency's sake --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 08613e8..0b57534 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ out/fs/boot/kernel.bin: src/kernel/linker.ld $(call from_sources, src/kernel/) $ @$(CC) $(LFLAGS) -T $^ -o $@ grub-file --is-x86-multiboot $@ -out/bootstrap: src/user_bootstrap/linker.ld $(call from_sources, src/user_bootstrap/) $(call from_sources, src/user/lib/) $(call from_sources, src/shared/) +out/bootstrap: src/user/bootstrap/linker.ld $(call from_sources, src/user/bootstrap/) $(call from_sources, src/user/lib/) $(call from_sources, src/shared/) @mkdir -p $(@D) @$(CC) $(LFLAGS) -T $^ -o $@ @@ -101,7 +101,7 @@ out/obj/%.c.o: src/%.c @mkdir -p $(@D) @$(CC) $(CFLAGS) -fPIC -c $^ -o $@ -out/obj/user_bootstrap/%.c.o: src/user_bootstrap/%.c +out/obj/user/bootstrap/%.c.o: src/user/bootstrap/%.c @mkdir -p $(@D) @$(CC) $(CFLAGS) -c $^ -o $@ -- cgit v1.2.3