summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authordzwdz2022-07-26 00:38:45 +0200
committerdzwdz2022-07-26 00:38:45 +0200
commit90af8825a41981ce2ee52e0a9ce84f624eb022e6 (patch)
treeaed82a8ca12fdaaa960adac98afecd62a8d81ec8 /Makefile
parent9352abbed0f1266f511f170517a4094c6c4ff917 (diff)
move user_bootstrap to user/bootstrap for consistency's sake
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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 $@