From 7a8617bad55894ab58cd771cbb62e39522708cec Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fjtrujy@gmail.com>
Date: Tue, 8 Nov 2022 21:30:47 +0100
Subject: [PATCH] Improve makefiles

---
 .github/workflows/PS4-ORBIS.yml |  7 +++----
 Makefile.orbis                  | 16 +++++++++-------
 Makefile.orbis.salamander       | 14 ++++++++------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/PS4-ORBIS.yml b/.github/workflows/PS4-ORBIS.yml
index 85e3f59b89..adebc19af7 100644
--- a/.github/workflows/PS4-ORBIS.yml
+++ b/.github/workflows/PS4-ORBIS.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Compile RA
       run: |
         export PATH=~/cli:$PATH # .net cli
-        make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 && make -f Makefile.orbis oelf eboot
+        make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
 
     - name: Get short SHA
       id: slug
@@ -36,9 +36,8 @@ jobs:
         name: bin-${{ steps.slug.outputs.sha8 }}
         path: |
           retroarch_orbis.elf
-          homebrew.oelf
-          homebrew.self
-
+          retroarch_orbis.oelf
+          retroarch_orbis.self
 
     - name: Version of binaries
       run: |
diff --git a/Makefile.orbis b/Makefile.orbis
index 10d33978bf..afaec8369a 100644
--- a/Makefile.orbis
+++ b/Makefile.orbis
@@ -176,7 +176,7 @@ else
    CXXFLAGS += -O3
 endif
 
-TARGETS := $(TARGET).elf
+TARGETS := $(TARGET).self
 
 all: $(TARGETS)
 
@@ -197,15 +197,17 @@ OBJOUT   = -o
 $(TARGET).elf: $(OBJ)
 	$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
 
+$(TARGET).oelf: $(TARGET).elf
+	@orbis-elf-create $(TARGET).elf $(TARGET).oelf
+
+$(TARGET).self: $(TARGET).oelf
+	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) $(TARGET).oelf $(TARGET).self
+
 install:
-	@cp homebrew.self $(SELF_PATH_INSTALL)
+	@cp $(TARGET).self $(SELF_PATH_INSTALL)/homebrew.self
 	@echo "Installed!"
-oelf:
-	@orbis-elf-create $(TARGET).elf homebrew.oelf
-eboot:
-	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) homebrew.oelf homebrew.self
 
 clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf $(TARGET).self
 
 .PHONY: clean all
diff --git a/Makefile.orbis.salamander b/Makefile.orbis.salamander
index 6f666e4f13..13a8fb19db 100644
--- a/Makefile.orbis.salamander
+++ b/Makefile.orbis.salamander
@@ -115,15 +115,17 @@ OBJOUT   = -o
 $(TARGET).elf: $(OBJ)
 	$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
 
+$(TARGET).oelf: $(TARGET).elf
+	@orbis-elf-create $(TARGET).elf $(TARGET).oelf
+
+$(TARGET).self: $(TARGET).oelf
+	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) $(TARGET).oelf $(TARGET).self
+
 install:
-	@cp homebrew.self $(SELF_PATH_INSTALL)
+	@cp $(TARGET).self $(SELF_PATH_INSTALL)/homebrew.self
 	@echo "Installed!"
-oelf:
-	@orbis-elf-create $(TARGET).elf homebrew.oelf
-eboot:
-	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) homebrew.oelf homebrew.self
 
 clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf $(TARGET).self
 
 .PHONY: clean all