Updated Makefiles

common-test.mk

@@ -5,13 +5,20 @@ INCLUDE	    += -I$(BASEDIR)/common
 LIBDIRS		+= -L$(BASEDIR)/common
 LIBS        += -lcommon -lpsxetc -lpsxgpu -lpsxapi -lc
 
-all: $(OFILES)
+TARGET_EXE  := $(TARGET:.elf=.exe)
+
+$(TARGET): $(OFILES)
 	@echo "LD     $(TARGET)"
 	@$(LD) $(LDFLAGS) $(LIBDIRS) $(OFILES) $(LIBS) -o $(TARGET)
+
+$(TARGET_EXE): $(TARGET)
 	@echo "ELF2X  $(TARGET:.elf=.exe)"
 	@elf2x -q $(TARGET)
-
+
+all: $(TARGET_EXE)
+
 clean:
-	rm -rf build $(TARGET) $(TARGET:.elf=.exe)
+	rm -rf build $(TARGET) $(TARGET_EXE)
 
 .PHONY: all clean
+.DEFAULT_GOAL := $(TARGET_EXE)

common.mk

@@ -5,10 +5,10 @@ LIBDIRS	   := -L$(PSN00BSDK)/libpsn00b
 GCC_VERSION	= 7.4.0
 GCC_BASE	= /usr/local/mipsel-unknown-elf
 
-CFLAGS		= -g -msoft-float -O2 -fno-builtin -fdata-sections -ffunction-sections
-CPPFLAGS	= $(CFLAGS) -fno-exceptions -std=c++17
-AFLAGS		= -g -msoft-float
-LDFLAGS		= -g -Ttext=0x80010000 -gc-sections -T $(GCC_BASE)/mipsel-unknown-elf/lib/ldscripts/elf32elmip.x
+CFLAGS	   ?= -g -msoft-float -O2 -fno-builtin -fdata-sections -ffunction-sections
+CPPFLAGS   ?= $(CFLAGS) -fno-exceptions -std=c++17
+AFLAGS	   ?= -g -msoft-float
+LDFLAGS	   ?= -g -Ttext=0x80010000 -gc-sections -T $(GCC_BASE)/mipsel-unknown-elf/lib/ldscripts/elf32elmip.x
 
 # Toolchain programs
 CC			= $(PREFIX)gcc
@@ -18,7 +18,7 @@ AR		    = $(PREFIX)ar
 LD			= $(PREFIX)ld
 RANLIB	    = $(PREFIX)ranlib
 
-LIBS		= 
+LIBS	   ?= 
 
 CFILES		= $(notdir $(wildcard *.c))
 CPPFILES 	= $(notdir $(wildcard *.cpp))

gpu/bandwidth/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = bandwidth.elf
 
-TARGET = bandwidth.elf
+include ../../common-test.mk

gpu/benchmark/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = benchmark.elf
 
-TARGET = benchmark.elf
+include ../../common-test.mk

gpu/gp0-e1/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = gp0-e1.elf
 
-TARGET = gp0-e1.elf
+include ../../common-test.mk

gpu/lines/Makefile

@@ -1,4 +1,4 @@
-include ../../common-test.mk
-
 TARGET = lines.elf
-LIBS += -lpsxgte -lpsxapi
+LIBS  += -lpsxgte
+
+include ../../common-test.mk

gpu/mask-bit/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = mask-bit.elf
 
-TARGET = mask-bit.elf
+include ../../common-test.mk

gpu/quad/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
-
 TARGET = quad.elf
+
+include ../../common-test.mk

gpu/rectangles/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = rectangles.elf
 
-TARGET = rectangles.elf
+include ../../common-test.mk

gpu/texture-overflow/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
-
 TARGET = texture-overflow.elf
+
+include ../../common-test.mk

gpu/transparency/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = transparency.elf
 
-TARGET = transparency.elf
+include ../../common-test.mk

gpu/triangle/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = triangle.elf
 
-TARGET = triangle.elf
+include ../../common-test.mk

gpu/vram-to-vram-overlap/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = vram-to-vram-overlap.elf
 
-TARGET = vram-to-vram-overlap.elf
+include ../../common-test.mk

gte-fuzz/Makefile

@@ -1,4 +1,4 @@
-include ../common-test.mk
-
 TARGET = gte-fuzz.elf
-LIBS  += -lpsxgte
+LIBS  += -lpsxgte
+
+include ../common-test.mk

spu/stereo/Makefile

@@ -1,4 +1,4 @@
-include ../../common-test.mk
-
 TARGET = stereo.elf
-LIBS  += -lpsxspu
+LIBS  += -lpsxspu
+
+include ../../common-test.mk

spu/test/Makefile

@@ -1,3 +1,3 @@
-include ../../common-test.mk
+TARGET = test.elf
 
-TARGET = test.elf
+include ../../common-test.mk

timers/Makefile

@@ -1,3 +1,3 @@
-include ../common-test.mk
+TARGET = timers.elf
 
-TARGET = timers.elf
+include ../common-test.mk