From 373afdda5759198b2d5123abb578e3c649103493 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sun, 24 Jul 2022 16:34:37 +0200
Subject: user: put the testelf in a sensible location in the tree

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8d5c261..33469c2 100644
--- a/Makefile
+++ b/Makefile
@@ -64,22 +64,22 @@ out/bootstrap: src/user_bootstrap/linker.ld $(call from_sources, src/user_bootst
 	@mkdir -p $(@D)
 	@$(CC) $(LFLAGS) -T $^ -o $@
 
-initrd/test.elf: out/test.elf
+initrd/testelf.elf: out/testelf.elf
 	@# dummy
 
 initrd/init.elf: out/init.elf
 	@# dummy
 
-out/test.elf: src/usertestelf.ld out/obj/usertestelf.c.o out/obj/user/lib/syscall.s.o $(call from_sources, src/shared/)
+out/testelf.elf: src/user/linker.ld $(call from_sources, src/user/app/testelf/) $(call from_sources, src/user/lib/) $(call from_sources, src/shared/)
 	@mkdir -p $(@D)
 	@$(CC) $(LFLAGS) -Wl,-pie -Wl,-no-dynamic-linker -T $^ -o $@
 
-out/init.elf: src/user/linker.ld $(call from_sources, src/user/) $(call from_sources, src/shared/)
+out/init.elf: src/user/linker.ld $(call from_sources, src/user/app/init/) $(call from_sources, src/user/lib/) $(call from_sources, src/shared/)
 	@mkdir -p $(@D)
 	@$(CC) $(LFLAGS) -Wl,-pie -Wl,-no-dynamic-linker -T $^ -o $@
 
 # TODO automatically resolve symlinks
-out/initrd.tar: $(shell find initrd/) out/test.elf out/init.elf
+out/initrd.tar: $(shell find initrd/) out/testelf.elf out/init.elf
 	cd initrd; tar chf ../$@ *
 
 out/fs/boot/init: out/bootstrap out/initrd.tar
-- 
cgit v1.2.3