Regenerate all tests Makefile's after last change to fpcmake.ini

This commit is contained in:
Pierre Muller 2025-10-05 10:51:36 +02:00
parent 900e09c634
commit 4f471afa2f
3 changed files with 34 additions and 7 deletions

View File

@ -2219,9 +2219,14 @@ ifdef INSTALL_CREATEPACKAGEFPC
ifdef FPCMAKE ifdef FPCMAKE
ifdef PACKAGE_VERSION ifdef PACKAGE_VERSION
ifneq ($(wildcard Makefile.fpc),) ifneq ($(wildcard Makefile.fpc),)
$(FPCMAKE) -o Package-$(TARGETSUFFIX).fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc ifdef FPCMAKENEW
$(MKDIR) $(INSTALL_UNITDIR) $(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 endif
endif endif

View File

@ -2179,9 +2179,14 @@ ifdef INSTALL_CREATEPACKAGEFPC
ifdef FPCMAKE ifdef FPCMAKE
ifdef PACKAGE_VERSION ifdef PACKAGE_VERSION
ifneq ($(wildcard Makefile.fpc),) ifneq ($(wildcard Makefile.fpc),)
$(FPCMAKE) -o Package-$(TARGETSUFFIX).fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc ifdef FPCMAKENEW
$(MKDIR) $(INSTALL_UNITDIR) $(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 endif
endif endif

View File

@ -1377,6 +1377,7 @@ STATICLIBPREFIX=libp
IMPORTLIBPREFIX=libimp IMPORTLIBPREFIX=libimp
RSTEXT=.rsj RSTEXT=.rsj
EXEDBGEXT=.dbg EXEDBGEXT=.dbg
ALL_EXEEXT=.exe
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=v1 SHORTSUFFIX=v1
@ -1473,6 +1474,7 @@ ifeq ($(OS_TARGET),atari)
EXEEXT=.ttp EXEEXT=.ttp
SHORTSUFFIX=ata SHORTSUFFIX=ata
endif endif
ALL_EXEEXT+=.ttp
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
@ -1499,6 +1501,7 @@ STATICLIBPREFIX=
SHORTSUFFIX=nw SHORTSUFFIX=nw
IMPORTLIBPREFIX=imp IMPORTLIBPREFIX=imp
endif endif
ALL_EXEEXT+=.nlm
ifeq ($(OS_TARGET),netwlibc) ifeq ($(OS_TARGET),netwlibc)
EXEEXT=.nlm EXEEXT=.nlm
STATICLIBPREFIX= STATICLIBPREFIX=
@ -1524,6 +1527,7 @@ EXEEXT=.gba
SHAREDLIBEXT=.so SHAREDLIBEXT=.so
SHORTSUFFIX=gba SHORTSUFFIX=gba
endif endif
ALL_EXEEXT+=.gba
ifeq ($(OS_TARGET),symbian) ifeq ($(OS_TARGET),symbian)
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
SHORTSUFFIX=symbian SHORTSUFFIX=symbian
@ -1537,6 +1541,7 @@ EXEEXT=.dol
SHAREDLIBEXT=.so SHAREDLIBEXT=.so
SHORTSUFFIX=wii SHORTSUFFIX=wii
endif endif
ALL_EXEEXT+=.dol
ifeq ($(OS_TARGET),aix) ifeq ($(OS_TARGET),aix)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
@ -1579,6 +1584,7 @@ OEXT=.rel
endif endif
SHORTSUFFIX=emb SHORTSUFFIX=emb
endif endif
ALL_EXEEXT+=.bin
ifeq ($(OS_TARGET),win16) ifeq ($(OS_TARGET),win16)
STATICLIBPREFIX= STATICLIBPREFIX=
STATICLIBEXT=.a STATICLIBEXT=.a
@ -1591,6 +1597,7 @@ endif
ifeq ($(OS_TARGET),wasip1) ifeq ($(OS_TARGET),wasip1)
EXEEXT=.wasm EXEEXT=.wasm
endif endif
ALL_EXEEXT+=.wasm
ifeq ($(OS_TARGET),wasip1threads) ifeq ($(OS_TARGET),wasip1threads)
EXEEXT=.wasm EXEEXT=.wasm
endif endif
@ -4177,6 +4184,7 @@ endif
ifndef CROSSINSTALL ifndef CROSSINSTALL
ifneq ($(TARGET_PROGRAMS),) ifneq ($(TARGET_PROGRAMS),)
override EXEFILES=$(addsuffix $(EXEEXT),$(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 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 EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
override ALLTARGET+=fpc_exes override ALLTARGET+=fpc_exes
@ -4306,6 +4314,10 @@ ifdef INSTALL_CREATEPACKAGEFPC
ifdef FPCMAKE ifdef FPCMAKE
ifdef PACKAGE_VERSION ifdef PACKAGE_VERSION
ifneq ($(wildcard Makefile.fpc),) 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 $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
$(MKDIR) $(INSTALL_UNITDIR) $(MKDIR) $(INSTALL_UNITDIR)
$(INSTALL) Package.fpc $(INSTALL_UNITDIR) $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
@ -4313,6 +4325,7 @@ endif
endif endif
endif endif
endif endif
endif
ifdef INSTALLPPUFILES ifdef INSTALLPPUFILES
$(MKDIR) $(INSTALL_UNITDIR) $(MKDIR) $(INSTALL_UNITDIR)
$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
@ -4437,6 +4450,7 @@ override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES))
endif endif
ifdef CLEAN_PROGRAMS ifdef CLEAN_PROGRAMS
override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(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))) override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS)))
endif endif
ifdef CLEAN_UNITS ifdef CLEAN_UNITS
@ -4475,12 +4489,15 @@ ifdef LIB_NAME
-$(DEL) $(LIB_NAME) $(LIB_FULLNAME) -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
endif endif
-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT) -$(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) -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
fpc_cleanall: $(CLEANTARGET) fpc_cleanall: $(CLEANTARGET)
ifdef CLEANEXEFILES ifdef CLEANEXEFILES
-$(DEL) $(CLEANEXEFILES) -$(DEL) $(CLEANEXEFILES)
endif endif
ifdef ALL_CLEANEXEFILES
-$(DEL) $(ALL_CLEANEXEFILES)
endif
ifdef COMPILER_UNITTARGETDIR ifdef COMPILER_UNITTARGETDIR
ifdef CLEANPPUFILES ifdef CLEANPPUFILES
-$(DEL) $(CLEANPPUFILES) -$(DEL) $(CLEANPPUFILES)
@ -4502,8 +4519,8 @@ ifneq ($(PPUEXT),.ppu)
-$(DEL) *.o *.ppu *.a -$(DEL) *.o *.ppu *.a
endif endif
-$(DELTREE) *$(SMARTEXT) -$(DELTREE) *$(SMARTEXT)
-$(DEL) fpcmade.* Package.fpc *.fpm -$(DEL) fpcmade.* Package*.fpc *.fpm
-$(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) -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
ifdef AOUTEXT ifdef AOUTEXT
-$(DEL) *$(AOUTEXT) -$(DEL) *$(AOUTEXT)