diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/user/bootstrap/linker.ld (renamed from src/user_bootstrap/linker.ld) | 0 | ||||
| -rw-r--r-- | src/user/bootstrap/main.c (renamed from src/user_bootstrap/main.c) | 0 | ||||
| -rw-r--r-- | src/user/bootstrap/tar.c (renamed from src/user_bootstrap/tar.c) | 0 | ||||
| -rw-r--r-- | src/user/bootstrap/tar.h (renamed from src/user_bootstrap/tar.h) | 0 |
5 files changed, 2 insertions, 2 deletions
@@ -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 $@ diff --git a/src/user_bootstrap/linker.ld b/src/user/bootstrap/linker.ld index 917388c..917388c 100644 --- a/src/user_bootstrap/linker.ld +++ b/src/user/bootstrap/linker.ld diff --git a/src/user_bootstrap/main.c b/src/user/bootstrap/main.c index 5f36aa1..5f36aa1 100644 --- a/src/user_bootstrap/main.c +++ b/src/user/bootstrap/main.c diff --git a/src/user_bootstrap/tar.c b/src/user/bootstrap/tar.c index 40da437..40da437 100644 --- a/src/user_bootstrap/tar.c +++ b/src/user/bootstrap/tar.c diff --git a/src/user_bootstrap/tar.h b/src/user/bootstrap/tar.h index 43aa9ed..43aa9ed 100644 --- a/src/user_bootstrap/tar.h +++ b/src/user/bootstrap/tar.h |