From 5dcaabc91a9cd6856b7e01a97eeae0d1fd6e0ea4 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sun, 27 Apr 2025 20:26:35 +0000 Subject: [PATCH] Add ALL_EXEEXT Makefile variable to be able to clean cross-compiled executables --- utils/fpcm/fpcmake.inc | 601 +++++++++++++++++++++-------------------- utils/fpcm/fpcmake.ini | 12 + 2 files changed, 318 insertions(+), 295 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index c6f0647e93..10209dd341 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..269] of string[240]=( +const fpcmakeini : array[0..271] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..269,1..240] of char=( +const fpcmakeini : array[0..271,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -1109,6 +1109,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'EXEDBGEXT=.dbg'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ + 'ALL_EXEEXT=.exe'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -1117,8 +1118,8 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Go32v2'#010+ - 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'STATI','CLIBPREFIX='#010+ + 'ifeq ($(OS_TARGE','T),go32v2)'#010+ + 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=dos'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ @@ -1134,8 +1135,8 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Android native'#010+ - 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_T','ARGET),android)'#010+ + 'ifneq ($(CPU_TARGET),j','vm)'#010+ + 'ifeq ($(OS_TARGET),android)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1153,8 +1154,8 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# DragonFly BSD'#010+ 'ifeq ($(OS_TARGET),dragonfly)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT=',#010+ + 'BATC','HEXT=.sh'#010+ + 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=df'#010+ 'endif'#010+ @@ -1173,9 +1174,9 @@ const fpcmakeini : array[0..269,1..240] of char=( 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=nbs'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - '# OpenBSD'#010, + '# OpenBSD'#010+ 'ifeq ($(OS_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ @@ -1193,8 +1194,8 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifeq ($(OS_TARGET),os2)'#010+ 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ - 'STATICLIBPREFIX='#010+ - 'SHA','REDLIBEXT=.dll'#010+ + 'STAT','ICLIBPREFIX='#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'IMPORTLIBPREFIX='#010+ @@ -1212,7 +1213,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Amiga'#010+ - 'ifeq ($(OS_TARGET),amiga)',#010+ + 'ifeq ($(O','S_TARGET),amiga)'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=amg'#010+ @@ -1229,14 +1230,15 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifeq ($(OS_TARGET),morphos)'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ - 'SHORTSUFFIX=mos'#010+ + 'SHORTSUFFIX=mos'#010, 'endif'#010+ #010+ '# Atari'#010+ - 'i','feq ($(OS_TARGET),atari)'#010+ + 'ifeq ($(OS_TARGET),atari)'#010+ 'EXEEXT=.ttp'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ + 'ALL_EXEEXT+=.ttp'#010+ #010+ '# BeOS'#010+ 'ifeq ($(OS_TARGET),beos)'#010+ @@ -1250,10 +1252,10 @@ const fpcmakeini : array[0..269,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=hai'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ '# Solaris'#010+ - 'ifeq ($(OS_TARGET','),solaris)'#010+ + 'ifeq ($(OS_TARGET),solaris)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=sun'#010+ @@ -1270,9 +1272,10 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifeq ($(OS_TARGET),netware)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ - 'SHORTSUFFIX=nw'#010+ + 'SHORTS','UFFIX=nw'#010+ 'IMPORTLIBPREFIX=imp'#010+ - 'endi','f'#010+ + 'endif'#010+ + 'ALL_EXEEXT+=.nlm'#010+ #010+ '# Netware libc'#010+ 'ifeq ($(OS_TARGET),netwlibc)'#010+ @@ -1286,9 +1289,9 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifeq ($(OS_TARGET),macosclassic)'#010+ 'BATCHEXT='#010+ 'EXEEXT='#010+ - 'DEBUGSYMEXT=.xcoff'#010+ + 'DEB','UGSYMEXT=.xcoff'#010+ 'SHORTSUFFIX=mac'#010+ - 'IMPORTLIBPREFIX=im','p'#010+ + 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ #010+ '# Darwin'#010+ @@ -1303,11 +1306,12 @@ const fpcmakeini : array[0..269,1..240] of char=( '# gba'#010+ 'ifeq ($(OS_TARGET),gba)'#010+ 'EXEEXT=.gba'#010+ - 'SHAREDLIBEXT=.so'#010+ + 'SH','AREDLIBEXT=.so'#010+ 'SHORTSUFFIX=gba'#010+ 'endif'#010+ + 'ALL_EXEEXT+=.gba'#010+ #010+ - '# Symbian OS',#010+ + '# Symbian OS'#010+ 'ifeq ($(OS_TARGET),symbian)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ @@ -1320,11 +1324,12 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# wii'#010+ - 'ifeq ($(OS_TARGET),wii)'#010+ + 'ifeq ($','(OS_TARGET),wii)'#010+ 'EXEEXT=.dol'#010+ 'SHAREDLIBEXT=.so'#010+ 'SHORTSUFFIX=wii'#010+ - 'endif',#010+ + 'endif'#010+ + 'ALL_EXEEXT+=.dol'#010+ #010+ '# AIX'#010+ 'ifeq ($(OS_TARGET),aix)'#010+ @@ -1338,13 +1343,13 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifeq ($(OS_TARGET),java)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ - 'SHAREDLIBEXT=.jar'#010+ + 'SHAREDLIBE','XT=.jar'#010+ 'SHORTSUFFIX=java'#010+ 'endif'#010+ #010+ '# Android java'#010+ 'ifeq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_T','ARGET),android)'#010+ + 'ifeq ($(OS_TARGET),android)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ @@ -1355,14 +1360,14 @@ const fpcmakeini : array[0..269,1..240] of char=( '# MS-DOS'#010+ 'ifeq ($(OS_TARGET),msdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBEXT=.a'#010+ + 'STATICLIBEXT=.a',#010+ 'SHORTSUFFIX=d16'#010+ 'endif'#010+ #010+ '# MSX-DOS'#010+ 'ifeq ($(OS_TARGET),msxdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATIC','LIBEXT=.a'#010+ + 'STATICLIBEXT=.a'#010+ 'SHORTSUFFIX=msd'#010+ 'endif'#010+ #010+ @@ -1373,15 +1378,16 @@ const fpcmakeini : array[0..269,1..240] of char=( 'STATICLIBEXT=.a'#010+ 'else'#010+ 'EXEEXT=.bin'#010+ - 'endif'#010+ + 'endif'#010, 'ifeq ($(CPU_TARGET),z80)'#010+ 'OEXT=.rel'#010+ 'endif'#010+ 'SHORTSUFFIX=emb'#010+ 'endif'#010+ + 'ALL_EXEEXT+=.bin'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_T','ARGET),win16)'#010+ + 'ifeq ($(OS_TARGET),win16)'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ @@ -1390,16 +1396,17 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# ZX Spectrum'#010+ 'ifeq ($(OS_TARGET),zxspectrum)'#010+ - 'OEXT=.rel'#010+ + 'OEXT=.','rel'#010+ 'endif'#010+ #010+ '# WASIp1'#010+ 'ifeq ($(OS_TARGET),wasip1)'#010+ 'EXEEXT=.wasm'#010+ 'endif'#010+ + 'ALL_EXEEXT+=.wasm'#010+ #010+ '# WASIp1threads'#010+ - 'ifeq ($(OS_TARGET)',',wasip1threads)'#010+ + 'ifeq ($(OS_TARGET),wasip1threads)'#010+ 'EXEEXT=.wasm'#010+ 'endif'#010+ #010+ @@ -1409,21 +1416,21 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ #010+ - '# For 8.3 limited OS'#039's the short suffixes'#010+ + '# For 8.3 limited OS'#039's the s','hort suffixes'#010+ '# Otherwise use the full source/target names'#010+ 'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+ - 'FPCMADE=fpcmade','.$(SHORTSUFFIX)'#010+ + 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ 'else'#010+ - 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ + 'FPCMADE=fpcmade.$(','TARGETSUFFIX)'#010+ 'ZIPSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ - 'ZIPCROSS','PREFIX=$(TARGETSUFFIX)-'#010+ + 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ 'else'#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ @@ -1431,20 +1438,20 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '[defaulttools]'#010+ - '#####################################################################'#010+ - '# Default Tools'#010+ - '######################################################','##############'+ + '#####################','###############################################'+ '#'#010+ + '# Default Tools'#010+ + '#####################################################################'#010+ #010+ '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ - 'ARNAME=$(BINUTILSPREFIX)ar'#010+ + 'ARNAME=$(BINUTILSPRE','FIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ - 'ifndef AS','PROG'#010+ + 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1452,21 +1459,21 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# linker, but probably not used'#010+ + '# linker, but proba','bly not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ '# Resource compiler'#010+ 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'RCPROG=$(RCNAME)'#010+ + 'RCPROG=$(RCNAME',')'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1475,14 +1482,14 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'ARPROG=$(ARN','AME)'#010+ + 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+ + 'NASMPROG=$(CROSSBIND','IR)/$(NASMNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'NASMPROG=$(NASMNAME)'#010+ 'endif'#010+ @@ -1491,7 +1498,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ 'LD=$(LDPROG)'#010+ - 'RC=$(R','CPROG)'#010+ + 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ 'NASM=$(NASMPROG)'#010+ #010+ @@ -1499,7 +1506,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifdef inUnix'#010+ 'PPAS=./ppas$(SRCBATCHEXT)'#010+ 'else'#010+ - 'PPAS=ppas$(SRCBATCHEXT)'#010+ + 'PPAS=ppas$(SRCBATC','HEXT)'#010+ 'endif'#010+ #010+ '# ldconfig to rebuild .so cache'#010+ @@ -1510,7 +1517,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=$','(shell $(DATE) +%Y%m%d)'#010+ + 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ 'endif'#010+ @@ -1521,7 +1528,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ - 'TAROPT=vj'#010+ + 'TARO','PT=vj'#010+ 'TAREXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ @@ -1530,66 +1537,65 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '###########################################','#########################'+ - '#'#010+ - '# Compiler Command Line'#010+ '#####################################################################'#010+ + '# Compiler Command Line'#010+ + '#####################################################################'#010, #010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ - 'ifndef NOCP','UDEF'#010+ + 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(ARCH)'#010+ 'endif'#010+ #010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ - 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ + 'ifneq ($(OS_TARGET)',',$(OS_SOURCE))'#010+ 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ 'override FPCOPT+=-P$(ARCH)'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ - 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'ov','erride FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOP','T+=-XP$(BINUTILSPREFIX)'#010+ + 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ 'ifneq ($(RLINKPATH),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# When BINUTILSPREFIX is given and we are not cross-compiling then use'+ - #010+ + '# When BINUTILSPREFIX i','s given and we are not cross-compiling then u'+ + 'se'#010+ '# it while compiling the fpmake file. (For example to build i386-freeb'+ - 's','d'#010+ + 'sd'#010+ '# with BINUTILSPREFIX=i386-)'#010+ 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ + 'o','verride FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# User dirs should be first, so they are looked at first'#010+ - 'if','def UNITDIR'#010+ + 'ifdef UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'ifdef OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(INC','DIR))'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ '# Smartlinking'#010+ @@ -1599,7 +1605,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ - 'override FPCOPT+=-CX'#010+ + 'overrid','e FPCOPT+=-CX'#010+ 'endif'#010+ #010+ '# Debug'#010+ @@ -1609,11 +1615,11 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Release mode'#010+ - '# (strip,',' optimize and don'#039't load fpc.cfg)'#010+ + '# (strip, optimize and don'#039't load fpc.cfg)'#010+ 'ifdef RELEASE'#010+ 'FPCCPUOPT:=-O2'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ - 'override FPCOPTDEF+=RELEASE'#010+ + 'override FPCOPTDE','F+=RELEASE'#010+ 'endif'#010+ #010+ '# Strip'#010+ @@ -1624,7 +1630,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '# Optimizer'#010+ 'ifdef OPTIMIZE'#010+ 'override FPCOPT+=-O2'#010+ - 'endif',#010+ + 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ @@ -1632,66 +1638,66 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Needed compiler options'#010+ - 'ifdef COMPILER_OPTIONS'#010+ + 'ifdef COMP','ILER_OPTIONS'#010+ 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(COMPI','LER_UNITDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_OBJECTDIR'#010+ + 'ifdef COMPIL','ER_OBJECTDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$','(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ 'ifdef CROSSBINDIR'#010+ - 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ + 'override FPCOPT+=-FD$(CROSSBINDIR)',#010+ 'endif'#010+ #010+ '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override FPCOPT+=-FE$(COMPILER_T','ARGETDIR)'#010+ + 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'endif'#010+ #010+ '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCOPT+=-FU$(COMPILER','_UNITTARGETDIR)'#010+ + 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMP','ILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override',' UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ + 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifdef SYSROOTPATH'#010+ 'override FPCOPT+=-XR$(SYSROOTPATH)'#010+ 'else'#010+ - '# if we are compiling natively on aarch64-darwin and if -/Library/Deve'+ - 'loper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+ - '# add it to ','the compiler command line'#010+ + '# if we ar','e compiling natively on aarch64-darwin and if -/Library/De'+ + 'veloper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+ + '# add it to the compiler command line'#010+ 'ifeq ($(OS_TARGET),$(OS_SOURCE))'#010+ 'ifeq ($(OS_TARGET),darwin)'#010+ '# so far the only tested one'#010+ - 'ifeq ($(CPU_TARGET),aarch64)'#010+ + 'ifeq (','$(CPU_TARGET),aarch64)'#010+ 'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+ ',)'#010+ - 'override FPCOPT+=-XR/Li','brary/Developer/CommandLineTools/SDKs/MacOSX.'+ - 'sdk'#010+ + 'override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sd'+ + 'k'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1700,20 +1706,20 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ 'ifdef CREATESHARED'#010+ 'override FPCOPT+=-Cg'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ '# create always pic'#039'ed code on x86_64, mips and mipsel'#010+ '# on unix-like systems'#010+ - 'ifneq ($(filter $(OS_TARGET),dragon','fly freebsd openbsd netbsd linux '+ - 'solaris),)'#010+ + 'ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux so'+ + 'laris),)'#010+ 'ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv'+ - '64 powerpc64),)'#010+ + '64 powe','rpc64),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ #010+ '# building without smartlinking on z80 makes no sense'#010+ - 'ifneq ($(filter $(CPU_','TARGET),z80),)'#010+ + 'ifneq ($(filter $(CPU_TARGET),z80),)'#010+ 'override FPCOPT+=-CX -XX'#010+ 'endif'#010+ #010+ @@ -1722,72 +1728,72 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ #010+ - '[command_libc]'#010+ + '[','command_libc]'#010+ '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'ifdef FPCMAKEGCCLIBDIR'#010+ - 'overr','ide FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)'#010+ + 'override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)'#010+ 'else'#010+ 'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'override F','PCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ '[command_end]'#010+ '# Add commandline options last so they can override'#010+ - 'ifdef ','OPT'#010+ + 'ifdef OPT'#010+ 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ '# Override options to compile the fpmake-binary with command-line opti'+ - 'ons provided in FPMAKEBUILDOPT'#010+ + 'ons provided in ','FPMAKEBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ #010+ - '# Add defines from FPCOPTDEF to',' FPCOPT'#010+ + '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ - 'ifdef CFGFILE'#010+ + 'ifdef CFGFIL','E'#010+ 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ - 'override FPCEXTCM','D:=$(FPCOPT)'#010+ + 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'overrid','e AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ 'endif'#010+ #010+ - 'ifde','f ACROSSCOMPILE'#010+ + 'ifdef ACROSSCOMPILE'#010+ 'override FPCOPT+=$(CROSSOPT)'#010+ 'endif'#010+ #010+ '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ - #010+ + #010, '# also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ - '# or if -sh is used'#010, + '# or if -sh is used'#010+ 'ifneq (,$(filter -sh,$(COMPILER)))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'ifneq (,$(filter -s,$(COMPILER)))'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ + 'ifeq ($(FULL_SOURCE),$(FULL_TARG','ET))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ @@ -1796,7 +1802,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'else'#010+ 'ifdef RUNBATCH'#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ - 'el','se'#010+ + 'else'#010+ 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ 'endif'#010+ @@ -1804,94 +1810,95 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '[loaderrules]'#010+ '#####################################################################'#010+ - '# Loaders'#010+ + '#',' Loaders'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ - 'ifneq ($(TARGET_LO','ADERS),)'#010+ + 'ifneq ($(TARGET_LOADERS),)'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ - 'override INSTALLTARGET+=fpc_loaders_install'#010+ + 'override INSTALLTARGET+=fpc_loaders_inst','all'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ - 'ifdef COMPILER_UNITTA','RGETDIR'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(','COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' -$(DEL) $(addprefix $(','COMPILER_UNITTARGETDIR)/,$(LOADEROFILE'+ - 'S))'#010+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ + ')'#010+ 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDI','R) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF','I'+ - 'LES)) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ + 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ #010+ #010+ '[unitrules]'#010+ - '#####################################################################'#010+ - '# Units'#010+ - '#########################################################','###########'+ + '################','####################################################'+ '#'#010+ + '# Units'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ - 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLIC','I'+ - 'TUNITS))'#010+ + 'override ','UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ + 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMP','LICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ - '###########################','#########################################'+ - '#'#010+ + '#####################################################################'#010+ '# Exes'#010+ '#####################################################################'#010+ - #010+ + #010, '.PHONY: fpc_exes'#010+ #010+ '# Programs are not needed for a cross installation'#010+ 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ - 'ov','erride EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override ALL_EXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addpre','fix $'+ + '(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(EXEFILES))))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+ 'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuf'+ - 'fix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $','(addprefix $(IMPORTLIBPREF'+ + 'fix $(STATICLIBEXT),$(TARGET_PROGRAMS)',')) $(addprefix $(IMPORTLIBPREF'+ 'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILES+=$(','EXEFILES) $(EXEOFILES)'#010+ + 'override CLEANEXEFILES','+=$(EXEFILES) $(EXEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGE','T_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(T','ARGET_PROGRAMS))'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1902,7 +1909,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ - '####################################','################################'+ + '################################','####################################'+ '#'#010+ #010+ 'ifdef TARGET_RSTS'#010+ @@ -1913,8 +1920,9 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ #010+ '[examplerules]'#010+ - '#####################################################################'#010+ - '#',' Examples'#010+ + '###################################################################','#'+ + '#'#010+ + '# Examples'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_examples'#010+ @@ -1922,14 +1930,14 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+ - 'ES)) $(addsuffix .pas,$(T','ARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+ + 'ES)) $(addsuffix .pas',',$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+ 'EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(adds'+ - 'uffix $(LTOEX','T),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+ + 'uffix $(L','TOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+ '(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+ 'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARG','ET_EXAMPLES'+ + 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(','TARGET_EXAMPLES'+ '))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ @@ -1937,8 +1945,8 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),emx)'#010+ - 'o','verride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'ifeq ($(OS_TARGET),em','x)'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ @@ -1950,14 +1958,14 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ #010+ '[compilerules]'#010+ - '###################','#################################################'+ + '###############','#####################################################'+ '#'#010+ '# General compile rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ - '$(FPCMADE): $(ALLDEPENDENCIES) $(A','LLTARGET)'#010+ + '$(FPCMADE): $(ALLDEPENDENCIES)',' $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ @@ -1971,7 +1979,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rule','s, available for both possible .pp and .pas ex'+ + '# General compile ','rules, available for both possible .pp and .pas ex'+ 'tensions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+ @@ -1981,7 +1989,7 @@ const fpcmakeini : array[0..269,1..240] of char=( ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ - ' ','$(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ + ' ',' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ #010+ '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ @@ -1995,8 +2003,8 @@ const fpcmakeini : array[0..269,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEXT): %.pas'#010+ - ' ',' $(COMPILER) $<'#010+ + '%$(EXEEXT): %.pa','s'#010+ + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.lpr'#010+ @@ -2010,18 +2018,18 @@ const fpcmakeini : array[0..269,1..240] of char=( '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ - '# Search paths for .ppu, .pp, .pa','s, .lpr, .dpr'#010+ + '# Search paths for .ppu, .pp,',' .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)',#010+ + 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDE','DIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ - '##############################################################','######'+ + '##########################################################','##########'+ '#'#010+ '# Library'#010+ '#####################################################################'#010+ @@ -2034,7 +2042,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ #010+ - 'ifndef SHARED_LIBNAME'#010, + 'ifndef SHARED_LIBN','AME'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ #010+ @@ -2045,7 +2053,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ - 'SHARED_LIBUNIT','S:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ + 'SHARED_LIB','UNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ 'endif'#010+ @@ -2053,7 +2061,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ - 'ifneq ($(SHARED_B','UILD),n)'#010+ + 'ifneq ($(SHAR','ED_BUILD),n)'#010+ ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+ 'endif'#010+ @@ -2062,7 +2070,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ 'fpc_shared_install:'#010+ - 'ifneq (','$(SHARED_BUILD),n)'#010+ + 'ifn','eq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ @@ -2072,7 +2080,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '[installrules]'#010+ - '########','############################################################'+ + '####','################################################################'+ '#'#010+ '# Install rules'#010+ '#####################################################################'#010+ @@ -2080,7 +2088,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INST','ALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override ','INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ @@ -2089,28 +2097,28 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - '# Avoid getting the same name twice as',' some install EXE fail'#010+ + '# Avoid getting the same name twic','e as some install EXE fail'#010+ '# in this case, happends for instance for OS/2 target'#010+ 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+ 'IBEXT))'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(subst $','(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+ + 'LES)) $(sub','st $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+ 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ 'NSTALLPPUFILES)))'#010+ 'else'#010+ - 'override INSTALLPPULINKF','ILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ + 'override INSTALLPPUL','INKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ 'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+ 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ')'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTAL','LPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+ + 'override IN','STALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+ 'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+ 'PUFILENAMES))'#010+ - 'override INSTALLPPULINKFILES=$(wildcard $(add','prefix $(UNITTARGETDIRP'+ + 'override INSTALLPPULINKFILES=$(wildcard $','(addprefix $(UNITTARGETDIRP'+ 'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ @@ -2119,7 +2127,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIR','PREFIX),$(notdir $('+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGE','TDIRPREFIX),$(notdir $('+ 'INSTALLEXEFILES)))'#010+ 'endif'#010+ 'endif'#010+ @@ -2129,14 +2137,14 @@ const fpcmakeini : array[0..269,1..240] of char=( ' $(MKDIR) $(INSTALL_BINDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ - 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ - 'if','def FPCMAKE'#010+ + 'ifdef INSTALL_CREATEPACKAGEFP','C'#010+ + 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ - ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TA','RGET) Makefile.fpc'#010+ + ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(O','S_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -2145,14 +2153,14 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITD','IR)'#010+ + ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_U','NITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ - 'ifdef inUnix',#010+ + 'ifdef in','Unix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -2163,7 +2171,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ - ' $(MKD','IR) $(INSTALL_SOURCEDIR)'#010+ + ' $','(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ @@ -2171,7 +2179,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef E','XAMPLESOURCEFILES'#010+ + 'ifd','ef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ @@ -2180,7 +2188,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '[distinstallrules]'#010+ - '#########################','###########################################'+ + '#####################','###############################################'+ '#'#010+ '# Dist Install'#010+ '#####################################################################'#010+ @@ -2191,14 +2199,14 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ #010+ '[zipinstallrules]'#010+ - '########################','############################################'+ + '####################','################################################'+ '#'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ - '# Temporary path to pack a file, can only use a si','ngle deep'#010+ + '# Temporary path to pack a file, can only use ','a single deep'#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ @@ -2209,8 +2217,8 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Maybe create default zipname from packagename'#010+ - 'ifndef ZIPNAME'#010+ - 'if','def DIST_ZIPNAME'#010+ + 'ifndef ZIPNAM','E'#010+ + 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ 'ZIPNAME=$(PACKAGE_NAME)'#010+ @@ -2224,7 +2232,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ 'ifdef DIST_ZIPTARGET'#010+ - 'ZIPTARGET=DIST_ZI','PTARGET'#010+ + 'ZIPTARGET=DIS','T_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ 'endif'#010+ @@ -2242,7 +2250,7 @@ const fpcmakeini : array[0..269,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able to run in the',' current OS so fix'#010+ + '# We need to be able to run in',' the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ @@ -2252,13 +2260,13 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD_CDPACK:=cd ','$(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + 'ZIPCMD_CDPACK:','=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR',')/$(FULLZIPNAME)$(ZIPEXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DES','TDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ 'endif'#010+ @@ -2266,20 +2274,20 @@ const fpcmakeini : array[0..269,1..240] of char=( 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ - ' $(D','EL) $(ZIPDESTFILE)'#010+ + ' ',' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_','ZIP))" >> $(ZIPWRAPPE'+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIP','CMD_ZIP))" >> $(ZIPWRAPPE'+ 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010, + ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPP','ER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -2292,8 +2300,8 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ - 'endi','f'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010, + 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ @@ -2302,7 +2310,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIP','SUFFIX=$('+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall',' ZIPSUFFIX=$('+ 'ZIPEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ @@ -2313,7 +2321,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '[cleanrules]'#010+ '#####################################################################'#010+ '# Clean rules'#010+ - '##################################','##################################'+ + '##############################','######################################'+ '#'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ @@ -2321,74 +2329,78 @@ const fpcmakeini : array[0..269,1..240] of char=( 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ - 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXED', - 'BGFILES))'#010+ + 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEAN','EXE'+ + 'DBGFILES))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ + 'override ALL_CLEANEXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefi'+ + 'x $(TARGETDIRPREFIX),$(addsuff','ix $(lEXEEXT), $(CLEAN_PROGRAMS))))'#010+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ - '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010, + '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ - 'ifdef CLEANPPUFILES'#010+ + 'ifdef ','CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addpre','fix $(STATIC'+ - 'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ - 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+ + ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLI'+ + 'BPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addpre'+ + 'fix $(IMPORTLIBP','REFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+ 'ILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ - 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$','(CLEAN'+ - 'PPUFILES))'#010+ + 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ + 'UFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+ - 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+ - 'LENAMES))'#010+ + 'override CLEANPPUFILES=$(addpref','ix $(UNITTARGETDIRPREFIX),$(CLEANPPU'+ + 'FILENAMES))'#010+ 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ - 'override CLEANPPULINKFILES=$(wildcard $','(addprefix $(UNITTARGETDIRPRE'+ - 'FIX),$(CLEANPPULINKFILENAMES)))'#010+ + 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+ + 'X),$(CLEANPPULINKFILENAMES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ - 'ifdef CLEANEXEFILES'#010+ + 'ifdef ','CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ - 'ifdef CLEANEXEDBGFIL','ES'#010+ + 'ifdef CLEANEXEDBGFILES'#010+ ' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL) $(CLEANPPUFILES)'#010+ + ' -$(DEL) $(CLEANPPUFILES',')'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGE','TDIRPREFIX),$(CLEANRSTFILES))'+ - #010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ - 'ifdef LIB_NAME'#010+ + 'ifdef LIB','_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+ - ' -$(DEL',') $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_s'+ - 'cript.res *_link.res symbol_order*.fpc'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ - 'TCHEXT)'#010+ + ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ + 'ipt.res *_link.res symbol_order*.fpc'#010+ + ' ',' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+ + 'BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(C','LEANEXEFILES)'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ - 'ifdef COMPILER_UNITTARGETDIR'#010+ + 'ifdef ALL_CLEANEXEFILES'#010+ + ' -$(DEL) $(ALL_CLEANEXEFILES)'#010+ + 'endif'#010+ + 'ifdef COMPILE','R_UNITTARGETDIR'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ @@ -2396,9 +2408,8 @@ const fpcmakeini : array[0..269,1..240] of char=( ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGE','TDIRPREFIX),$(CLEANRSTFILES))'+ - #010+ - 'endif'#010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'end','if'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ @@ -2406,16 +2417,16 @@ const fpcmakeini : array[0..269,1..240] of char=( ' -$(DELTREE) units'#010+ ' -$(DELTREE) bin'#010+ ' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+ - '$(STATICLIBEXT) *$(SHAR','EDLIBEXT) *$(PPLEXT)'#010+ - 'ifneq ($(PPUEXT),.ppu)'#010+ + '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + 'ifneq ($(PPU','EXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) fpcmade.* Package.fpc *.fpm'#010+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ - 'ipt.res *_lin','k.res symbol_order*.fpc'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ - 'TCHEXT)'#010+ + 'ipt.res *_link.res symbol_order*.fpc'#010+ + ' -','$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+ + 'BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ @@ -2423,8 +2434,8 @@ const fpcmakeini : array[0..269,1..240] of char=( ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ - ' -$(DE','L) $(LOCALFPMAKEBIN)'#010+ - ' -$(DEL) $(FPMAKEBINOBJ)'#010+ + ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ + ' -$(D','EL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ #010+ 'fpc_distclean: cleanall'#010+ @@ -2433,10 +2444,9 @@ const fpcmakeini : array[0..269,1..240] of char=( '[baseinforules]'#010+ '#####################################################################'#010+ '# Base info rules'#010+ - '##################################################','##################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '.PHONY: fpc_baseinfo'#010+ + '.PHONY: fpc_','baseinfo'#010+ #010+ 'override INFORULES+=fpc_baseinfo'#010+ #010+ @@ -2444,96 +2454,95 @@ const fpcmakeini : array[0..269,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' @$(ECHO) Package Version.. $(PACKA','GE_VERSION)'#010+ + ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Configuration info =='#010+ + ' ',' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ - ' @$(ECHO) T','arget CPU... $(CPU_TARGET)'#010+ - ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ + ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ + ' ',' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ - ' @$(ECHO) SourceSuffi','x. $(SOURCESUFFIX)'#010+ - ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ + ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ + ' @$(ECH','O) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010, + ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ + ' @$(ECHO)',' Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) PackagesDir..... ','$(PACKAGESDIR)'#010+ + ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ + ' ',' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ - ' ',' @$(ECHO) Ld........ $(LD)'#010+ - ' @$(ECHO) Ar........ $(AR)'#010+ + ' @$(ECHO) Ld........ $(LD)'#010+ + ' ',' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' ',' @$(ECHO) GInstall.. $(GINSTALL)'#010+ + ' @$(ECHO) GInstall.. $(GINSTALL)',#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECH','O) Zip....... $(ZIPPROG)'#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ - ' @$(ECHO) Target Imp','licit Units. $(TARGET_IMPLICITUNITS)'#010+ + ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNI','TS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ - ' @$(ECHO) Target Ex','ampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIR','S)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ - ' ',' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO) Install Files....... ','$(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ - ' @$(ECHO) ',' ZipPrefix............ $(ZIPPREFIX)'#010+ + ' @$(ECHO) ZipPrefix............ $(ZIPPREFI','X)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ - ' @$(ECHO) Install FPC Package.','. $(INSTALL_FPCPACKAGE)'#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ + ' @','$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ - ' @$(ECHO) Instal','l units dir.... $(INSTALL_UNITDIR)'#010+ + ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR',')'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ - ' @$(ECHO) Instal','l data dir..... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR',')'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ - '##############################################','######################'+ - '#'#010+ - '# Info rules'#010+ + '#####################################################################'#010+ + '# Info ru','les'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_info'#010+ @@ -2542,35 +2551,36 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '[makefilerules]'#010+ '#####################################################################'#010+ - '# Re','build Makefile'#010+ - '#####################################################################'#010+ + '# Rebuild Makefile'#010+ + '##################','##################################################'+ + '#'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) Mak','efile.fpc'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ - 'ifdef TARGET_DIRS'#010+ + 'ifd','ef TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_EXAMPLEDIR','S))'#010+ + 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ - 'EXAMPLEDIRS))'#010+ + 'fpc_makefile_sub2: $(a','ddsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ - '#########################','###########################################'+ + '##########################################################','##########'+ '#'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ @@ -2581,7 +2591,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ #010+ '[userrules]'#010+ - '##################################','##################################'+ + '###################################################################','#'+ '#'#010+ '# Users rules'#010+ '#####################################################################'#010+ @@ -2589,7 +2599,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '[lclrules]'#010+ '#####################################################################'#010+ '# LCL Rules'#010+ - '##########################','##########################################'+ + '###########################################################','#########'+ '#'#010+ #010+ '# LCL Platform'#010+ @@ -2602,9 +2612,9 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ 'export LCL_PLATFORM'#010+ #010+ - '# Check if the specified LCLDIR is correct',#010+ + '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ - 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ + 'override LCLDIR:=$(','subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2614,7 +2624,7 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ - 'override L','CLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLD','IR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2622,8 +2632,8 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# Check for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword ','$(wildca'+ - 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /units/$(L','CL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2631,8 +2641,8 @@ const fpcmakeini : array[0..269,1..240] of char=( #010+ '# Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword ','$(wildca'+ - 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /lib/lazar','us/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2641,7 +2651,7 @@ const fpcmakeini : array[0..269,1..240] of char=( '# Generate dirs'#010+ 'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+ 'R)/units)'#010+ - 'override LCLC','OMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compon'+ + 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/','.. $(LCLDIR)/../compon'+ 'ents $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ @@ -2649,8 +2659,9 @@ const fpcmakeini : array[0..269,1..240] of char=( 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ - '[','lclinforules]'#010+ - '#####################################################################'#010+ + '[lclinforules]'#010+ + '###################','#################################################'+ + '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ 'override INFORULES+=lclinfo'#010+ @@ -2658,20 +2669,20 @@ const fpcmakeini : array[0..269,1..240] of char=( '.PHONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ - ' @$(ECH','O) == LCL info =='#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) == LCL info =='#010+ + ' @$(ECH','O)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ - ' @$(ECHO) LCL Component dir.... $(LC','LCOMPONENTDIR)'#010+ + ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010+ - #010+ + #010, '[fpmakeprerules]'#010+ '#####################################################################'#010+ '# fpmake prerules'#010+ '#####################################################################'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ - 'FPM','AKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+ + 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(L','TOEXT)'#010+ 'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+ #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ @@ -2680,21 +2691,21 @@ const fpcmakeini : array[0..269,1..240] of char=( 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ 'ifdef CPU_TARGET'#010+ - 'FPC','_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ - 'endif'#010+ + 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ + 'e','ndif'#010+ 'ifdef SUB_TARGET'#010+ 'FPC_TARGETOPT+=--subtarget=$(SUB_TARGET)'#010+ 'endif'#010+ #010+ '# Get the location of the bootstrap-fpmkunit units'#010+ 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+ - 'card $(addsuffix',' /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ + 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGE','SDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ ')'#010+ 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ - 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUN','IT)/src/fpmkunit.pp'#010+ - 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ + 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ + 'FPMKUNIT_PPU=','$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ #010+ 'ifdef FPMAKE_SKIP_CONFIG'#010+ @@ -2702,23 +2713,23 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ '[fpmakerules]'#010+ - '#################################################################','###'+ - '#'#010+ - '# fpmake rules'#010+ '#####################################################################'#010+ + '# fpmake rules'#010+ + '#############','#######################################################'+ + '#'#010+ '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ 'pleinstall'#010+ #010+ '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ - 'ak','e uses it'#039's own.'#010+ - 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ + 'ake uses it'#039's own.'#010+ + 'override FPCOPT:','=$(filter-out -FU%,$(FPCOPT))'#010+ 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ '# Compose general fpmake-parameters'#010+ 'ifdef FPMAKEOPT'#010+ 'FPMAKE_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ - 'FPMAKE_OPT+','=--globalunitdir=$(FPCDIR)/packages'#010+ + 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packag','es'#010+ 'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+ 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ @@ -2727,9 +2738,9 @@ const fpcmakeini : array[0..269,1..240] of char=( 'FPMAKE_OPT+=-ns'#010+ 'endif'#010+ #010+ - 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTAL','L_UNITDIR)'#010+ + 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ 'ifdef UNIXHier'#010+ - 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ + 'FPMAKE_','INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ @@ -2737,40 +2748,40 @@ const fpcmakeini : array[0..269,1..240] of char=( 'endif'#010+ #010+ 'override ALLTARGET+=fpc_fpmake'#010+ - 'ov','erride INSTALLTARGET+=fpc_fpmake_install'#010+ + 'override INSTALLTARGET+=fpc_fpmake_','install'#010+ 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+ '# If no fpmake exists and (dist)clean is called, do not try to build f'+ 'pmake, it will'#010+ '# most often fail because the dependencies are cleared.'#010+ - '#',' In case of a clean, simply do nothing'#010+ + '# In case of a clean, simply do no','thing'#010+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ 'override CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ ' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+ - 'T=,$(FPMAKE_B','UILD_OPT))'#010+ + 'T=,$(FPMAKE_BUILD_OPT))'#010+ #010+ - '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ + '$(FPMAKEBIN): fpmake.','pp $(FPMKUNIT_PPU)'#010+ ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ 'fpc_fpmake: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ - 'fpc_fpmake_cle','an: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ + 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ + ' $(LO','CALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ 'PT)'#010+ #010+ - '# This is not completely valid. Exampleinstall should only insta','ll t'+ - 'he examples, while'#010+ - '# fpmake -ie installs everything, including the examples. This also me'+ - 'ans that on'#010+ + '# This is not completely valid. Exampleinstall should only install the'+ + ' examples, while'#010+ + '# fpmake -','ie installs everything, including the examples. This also '+ + 'means that on'#010+ '# a distinstall fpmake install wil be called twice.'#010+ 'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install -ie $','(FPMAKE_OPT) $(FPMAKE_INS'+ - 'TALL_OPT)'#010 + ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ + 'LL_OPT',')'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index d70c2e419e..20ce6d21f1 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -1045,6 +1045,7 @@ RSTEXT=.rsj # external debug info for executable EXEDBGEXT=.dbg #DEBUGSYMEXT #for debugger symbol files, define only for targets which has this +ALL_EXEEXT=.exe # Go32v1 ifeq ($(OS_TARGET),go32v1) @@ -1173,6 +1174,7 @@ ifeq ($(OS_TARGET),atari) EXEEXT=.ttp SHORTSUFFIX=ata endif +ALL_EXEEXT+=.ttp # BeOS ifeq ($(OS_TARGET),beos) @@ -1209,6 +1211,7 @@ STATICLIBPREFIX= SHORTSUFFIX=nw IMPORTLIBPREFIX=imp endif +ALL_EXEEXT+=.nlm # Netware libc ifeq ($(OS_TARGET),netwlibc) @@ -1242,6 +1245,7 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif +ALL_EXEEXT+=.gba # Symbian OS ifeq ($(OS_TARGET),symbian) @@ -1261,6 +1265,7 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif +ALL_EXEEXT+=.dol # AIX ifeq ($(OS_TARGET),aix) @@ -1315,6 +1320,7 @@ OEXT=.rel endif SHORTSUFFIX=emb endif +ALL_EXEEXT+=.bin # Win16 ifeq ($(OS_TARGET),win16) @@ -1333,6 +1339,7 @@ endif ifeq ($(OS_TARGET),wasip1) EXEEXT=.wasm endif +ALL_EXEEXT+=.wasm # WASIp1threads ifeq ($(OS_TARGET),wasip1threads) @@ -1798,6 +1805,7 @@ fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES) 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)) @@ -2202,6 +2210,7 @@ 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 @@ -2251,6 +2260,9 @@ fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef ALL_CLEANEXEFILES + -$(DEL) $(ALL_CLEANEXEFILES) +endif ifdef COMPILER_UNITTARGETDIR ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES)