From 1c5c0b524e3527165cf58a2d5b71de433a790449 Mon Sep 17 00:00:00 2001
From: EnderIce2 <enderice2@protonmail.com>
Date: Sun, 26 Jan 2025 23:28:10 +0200
Subject: [PATCH] userspace: update Makefiles

Signed-off-by: EnderIce2 <enderice2@protonmail.com>
---
 Userspace/.gitignore                     |  2 +-
 Userspace/apps/sys/init/.gitignore       |  1 -
 Userspace/apps/sys/init/Makefile         |  8 ++++----
 Userspace/apps/test/simd_test/.gitignore |  1 -
 Userspace/apps/test/simd_test/Makefile   |  8 ++++----
 Userspace/apps/test/utest/.gitignore     |  1 -
 Userspace/apps/test/utest/Makefile       | 10 +++++-----
 7 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 Userspace/apps/sys/init/.gitignore
 delete mode 100644 Userspace/apps/test/simd_test/.gitignore
 delete mode 100644 Userspace/apps/test/utest/.gitignore

diff --git a/Userspace/.gitignore b/Userspace/.gitignore
index 3419d985..85242ea1 100644
--- a/Userspace/.gitignore
+++ b/Userspace/.gitignore
@@ -1,6 +1,6 @@
 *.o
 *.map
-*.fex
+*.elf
 out/
 cache/*
 !cache/.gitkeep
diff --git a/Userspace/apps/sys/init/.gitignore b/Userspace/apps/sys/init/.gitignore
deleted file mode 100644
index b1b71610..00000000
--- a/Userspace/apps/sys/init/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-init
diff --git a/Userspace/apps/sys/init/Makefile b/Userspace/apps/sys/init/Makefile
index fabb4352..2b439d37 100644
--- a/Userspace/apps/sys/init/Makefile
+++ b/Userspace/apps/sys/init/Makefile
@@ -10,10 +10,10 @@ OBJ = $(S_SOURCES:.S=.o) $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o)
 FILENAME = $(notdir $(shell pwd))
 WARNCFLAG = -Wall -Wextra
 
-build: $(FILENAME)
-	cp $(FILENAME) $(WORKSPACE_DIR)/out/bin/$(FILENAME)
+build: $(FILENAME).elf
+	cp $(FILENAME).elf $(WORKSPACE_DIR)/out/bin/$(FILENAME)
 
-$(FILENAME): $(OBJ)
+$(FILENAME).elf: $(OBJ)
 	$(info Linking $@)
 	$(CC) $(LDFLAGS) $(SYSROOT) $(OBJ) -o $@
 
@@ -30,4 +30,4 @@ $(FILENAME): $(OBJ)
 	$(AS) -o $@ $<
 
 clean:
-	rm -f $(OBJ) $(FILENAME)
+	rm -f $(OBJ) $(FILENAME).elf
diff --git a/Userspace/apps/test/simd_test/.gitignore b/Userspace/apps/test/simd_test/.gitignore
deleted file mode 100644
index c9949562..00000000
--- a/Userspace/apps/test/simd_test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-simd_test
diff --git a/Userspace/apps/test/simd_test/Makefile b/Userspace/apps/test/simd_test/Makefile
index 8d35570e..13dee6ab 100644
--- a/Userspace/apps/test/simd_test/Makefile
+++ b/Userspace/apps/test/simd_test/Makefile
@@ -10,13 +10,13 @@ OBJ = $(S_SOURCES:.S=.o) $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o)
 FILENAME = $(notdir $(shell pwd))
 WARNCFLAG = -Wall -Wextra
 
-build: $(FILENAME)
-	cp $(FILENAME) $(WORKSPACE_DIR)/out/bin/$(FILENAME)
+build: $(FILENAME).elf
+	cp $(FILENAME).elf $(WORKSPACE_DIR)/out/bin/$(FILENAME)
 
 # Use static linking
 LDFLAGS += -static -fno-pic -fno-pie -Wl,-static
 
-$(FILENAME): $(OBJ)
+$(FILENAME).elf: $(OBJ)
 	$(info Linking $@)
 	$(CC) $(LDFLAGS) $(SYSROOT) $(OBJ) -o $@
 
@@ -33,4 +33,4 @@ $(FILENAME): $(OBJ)
 	$(AS) -o $@ $<
 
 clean:
-	rm -f $(OBJ) $(FILENAME)
+	rm -f $(OBJ) $(FILENAME).elf
diff --git a/Userspace/apps/test/utest/.gitignore b/Userspace/apps/test/utest/.gitignore
deleted file mode 100644
index 599b612b..00000000
--- a/Userspace/apps/test/utest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-utest
diff --git a/Userspace/apps/test/utest/Makefile b/Userspace/apps/test/utest/Makefile
index ebcc6aa7..13dee6ab 100644
--- a/Userspace/apps/test/utest/Makefile
+++ b/Userspace/apps/test/utest/Makefile
@@ -10,15 +10,15 @@ OBJ = $(S_SOURCES:.S=.o) $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o)
 FILENAME = $(notdir $(shell pwd))
 WARNCFLAG = -Wall -Wextra
 
-build: $(FILENAME)
-#	cp $(FILENAME) $(WORKSPACE_DIR)/out/bin/$(FILENAME)
+build: $(FILENAME).elf
+	cp $(FILENAME).elf $(WORKSPACE_DIR)/out/bin/$(FILENAME)
 
 # Use static linking
 LDFLAGS += -static -fno-pic -fno-pie -Wl,-static
 
-$(FILENAME): $(OBJ)
+$(FILENAME).elf: $(OBJ)
 	$(info Linking $@)
-#	$(CC) $(LDFLAGS) $(SYSROOT) $(OBJ) -o $@
+	$(CC) $(LDFLAGS) $(SYSROOT) $(OBJ) -o $@
 
 %.o: %.c $(HEADERS)
 	$(info Compiling $<)
@@ -33,4 +33,4 @@ $(FILENAME): $(OBJ)
 	$(AS) -o $@ $<
 
 clean:
-	rm -f $(OBJ) $(FILENAME)
+	rm -f $(OBJ) $(FILENAME).elf