From 4f471afa2f79c4e9545843471433c6e9c00394d7 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sun, 5 Oct 2025 10:51:36 +0200 Subject: [PATCH] Regenerate all tests Makefile's after last change to fpcmake.ini --- tests/Makefile | 9 +++++++-- tests/utils/Makefile | 9 +++++++-- tests/utils/testsuite/Makefile | 23 ++++++++++++++++++++--- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 38ad3da215..87bf05cd8b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2219,9 +2219,14 @@ ifdef INSTALL_CREATEPACKAGEFPC ifdef FPCMAKE ifdef PACKAGE_VERSION ifneq ($(wildcard Makefile.fpc),) - $(FPCMAKE) -o Package-$(TARGETSUFFIX).fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc +ifdef FPCMAKENEW $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) Package-$(TARGETSUFFIX).fpc $(INSTALL_UNITDIR)/Package.fpc + $(FPCMAKENEW) -o $(INSTALL_UNITDIR)/Package.fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc +else + $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc + $(MKDIR) $(INSTALL_UNITDIR) + $(INSTALL) Package.fpc $(INSTALL_UNITDIR) +endif endif endif endif diff --git a/tests/utils/Makefile b/tests/utils/Makefile index a0525fce66..9b3cf59da3 100644 --- a/tests/utils/Makefile +++ b/tests/utils/Makefile @@ -2179,9 +2179,14 @@ ifdef INSTALL_CREATEPACKAGEFPC ifdef FPCMAKE ifdef PACKAGE_VERSION ifneq ($(wildcard Makefile.fpc),) - $(FPCMAKE) -o Package-$(TARGETSUFFIX).fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc +ifdef FPCMAKENEW $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) Package-$(TARGETSUFFIX).fpc $(INSTALL_UNITDIR)/Package.fpc + $(FPCMAKENEW) -o $(INSTALL_UNITDIR)/Package.fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc +else + $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc + $(MKDIR) $(INSTALL_UNITDIR) + $(INSTALL) Package.fpc $(INSTALL_UNITDIR) +endif endif endif endif diff --git a/tests/utils/testsuite/Makefile b/tests/utils/testsuite/Makefile index 1abe7ec65e..dba0b5a9dc 100644 --- a/tests/utils/testsuite/Makefile +++ b/tests/utils/testsuite/Makefile @@ -1377,6 +1377,7 @@ STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rsj EXEDBGEXT=.dbg +ALL_EXEEXT=.exe ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -1473,6 +1474,7 @@ ifeq ($(OS_TARGET),atari) EXEEXT=.ttp SHORTSUFFIX=ata endif +ALL_EXEEXT+=.ttp ifeq ($(OS_TARGET),beos) BATCHEXT=.sh EXEEXT= @@ -1499,6 +1501,7 @@ STATICLIBPREFIX= SHORTSUFFIX=nw IMPORTLIBPREFIX=imp endif +ALL_EXEEXT+=.nlm ifeq ($(OS_TARGET),netwlibc) EXEEXT=.nlm STATICLIBPREFIX= @@ -1524,6 +1527,7 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif +ALL_EXEEXT+=.gba ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian @@ -1537,6 +1541,7 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif +ALL_EXEEXT+=.dol ifeq ($(OS_TARGET),aix) BATCHEXT=.sh EXEEXT= @@ -1579,6 +1584,7 @@ OEXT=.rel endif SHORTSUFFIX=emb endif +ALL_EXEEXT+=.bin ifeq ($(OS_TARGET),win16) STATICLIBPREFIX= STATICLIBEXT=.a @@ -1591,6 +1597,7 @@ endif ifeq ($(OS_TARGET),wasip1) EXEEXT=.wasm endif +ALL_EXEEXT+=.wasm ifeq ($(OS_TARGET),wasip1threads) EXEEXT=.wasm endif @@ -4177,6 +4184,7 @@ endif ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) +override ALL_EXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(EXEFILES)))) override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS)) override ALLTARGET+=fpc_exes @@ -4306,6 +4314,10 @@ ifdef INSTALL_CREATEPACKAGEFPC ifdef FPCMAKE ifdef PACKAGE_VERSION ifneq ($(wildcard Makefile.fpc),) +ifdef FPCMAKENEW + $(MKDIR) $(INSTALL_UNITDIR) + $(FPCMAKENEW) -o $(INSTALL_UNITDIR)/Package.fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc +else $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc $(MKDIR) $(INSTALL_UNITDIR) $(INSTALL) Package.fpc $(INSTALL_UNITDIR) @@ -4313,6 +4325,7 @@ endif endif endif endif +endif ifdef INSTALLPPUFILES $(MKDIR) $(INSTALL_UNITDIR) $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) @@ -4437,6 +4450,7 @@ override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override ALL_CLEANEXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(CLEAN_PROGRAMS)))) override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS @@ -4475,12 +4489,15 @@ ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) endif -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT) - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef ALL_CLEANEXEFILES + -$(DEL) $(ALL_CLEANEXEFILES) +endif ifdef COMPILER_UNITTARGETDIR ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) @@ -4502,8 +4519,8 @@ ifneq ($(PPUEXT),.ppu) -$(DEL) *.o *.ppu *.a endif -$(DELTREE) *$(SMARTEXT) - -$(DEL) fpcmade.* Package.fpc *.fpm - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) fpcmade.* Package*.fpc *.fpm + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT)