From 2e3d1a17d02db4ec13b2c1f5354697ea644f9c4c Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 19 Nov 2011 13:56:43 +0000 Subject: [PATCH] * also remove *.dbg files. Patch from Jonas, Mantis #20466 git-svn-id: trunk@19658 - --- utils/fpcm/fpcmake.inc | 630 +++++++++++++++++++++-------------------- utils/fpcm/fpcmake.ini | 13 + 2 files changed, 338 insertions(+), 305 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 6fe077bbbd..d8910f66ad 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..217] of string[240]=( +const fpcmakeini : array[0..219] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..217,1..240] of char=( +const fpcmakeini : array[0..219,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -889,14 +889,16 @@ const fpcmakeini : array[0..217,1..240] of char=( 'STATICLIBPREFIX=libp'#010+ 'IMPORTLIBPREFIX=libimp'#010+ 'RSTEXT=.rst'#010+ + '# external debug info for executable'#010+ + 'EXEDBGEXT=.dbg'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ #010+ '# Go32v1'#010+ - 'ifeq ($(OS_TARGET),go32v1)'#010+ + 'ifeq ($(OS','_TARGET),go32v1)'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=v1'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ @@ -910,13 +912,13 @@ const fpcmakeini : array[0..217,1..240] of char=( 'STATICLIBPREFIX='#010+ 'OEXT=.obj'#010+ 'ASMEXT=.asm'#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'SHAREDLIBEXT=.dl','l'#010+ 'SHORTSUFFIX=wat'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ #010+ '# Linux'#010+ - 'if','eq ($(OS_TARGET),linux)'#010+ + 'ifeq ($(OS_TARGET),linux)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -931,11 +933,11 @@ const fpcmakeini : array[0..217,1..240] of char=( 'SHORTSUFFIX=fbs'#010+ 'endif'#010+ #010+ - '# NetBSD'#010+ + '# NetBSD',#010+ 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HAS','SHAREDLIB=1'#010+ + 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=nbs'#010+ 'endif'#010+ #010+ @@ -950,12 +952,12 @@ const fpcmakeini : array[0..217,1..240] of char=( '# Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUFFIX=w32'#010+ + 'SHOR','TSUFFIX=w32'#010+ 'endif'#010+ #010+ '# OS/2'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'BA','TCHEXT=.cmd'#010+ + 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ 'SHAREDLIBEXT=.dll'#010+ @@ -969,10 +971,10 @@ const fpcmakeini : array[0..217,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'SHAR','EDLIBEXT=.dll'#010+ 'SHORTSUFFIX=emx'#010+ 'ECHO=echo'#010+ - 'IMPORTLIBPRE','FIX='#010+ + 'IMPORTLIBPREFIX='#010+ 'endif'#010+ #010+ '# Amiga'#010+ @@ -987,12 +989,12 @@ const fpcmakeini : array[0..217,1..240] of char=( 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=mos'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# Atari'#010+ 'ifeq ($(OS_TARGET),atari)'#010+ 'EXEEXT=.ttp'#010+ - 'SHOR','TSUFFIX=ata'#010+ + 'SHORTSUFFIX=ata'#010+ 'endif'#010+ #010+ '# BeOS'#010+ @@ -1010,10 +1012,10 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ '# Solaris'#010+ - 'ifeq ($(OS_TARGET),solaris)'#010+ + 'ifeq (','$(OS_TARGET),solaris)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SHORTSUFF','IX=sun'#010+ + 'SHORTSUFFIX=sun'#010+ 'endif'#010+ #010+ '# QNX'#010+ @@ -1028,11 +1030,11 @@ const fpcmakeini : array[0..217,1..240] of char=( 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=nw'#010+ - 'IMPORTLIBPREFIX=imp'#010+ + 'IMPORTLIBPREF','IX=imp'#010+ 'endif'#010+ #010+ '# Netware libc'#010+ - 'ifeq ($(OS_TARGET),netw','libc)'#010+ + 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=nwl'#010+ @@ -1046,14 +1048,15 @@ const fpcmakeini : array[0..217,1..240] of char=( 'DEBUGSYMEXT=.xcoff'#010+ 'SHORTSUFFIX=mac'#010+ 'IMPORTLIBPREFIX=imp'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ '# Darwin'#010+ - 'ifneq ($(findstring $(OS_TARGET),darwin',' iphonesim),)'#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=dwn'#010+ + 'EXEDBGEXT=.dSYM'#010+ 'endif'#010+ #010+ '# gba'#010+ @@ -1064,10 +1067,10 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ '# Symbian OS'#010+ - 'ifeq ($(OS_TARGET),symbian)'#010+ + 'ifeq',' ($(OS_TARGET),symbian)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ - 'endif'#010, + 'endif'#010+ #010+ '# NativeNT'#010+ 'ifeq ($(OS_TARGET),NativeNT)'#010+ @@ -1082,18 +1085,18 @@ const fpcmakeini : array[0..217,1..240] of char=( 'SHORTSUFFIX=wii'#010+ 'endif'#010+ #010+ - '# For 8.3 limited OS'#039's the short suffixes'#010+ - '# Otherwise use the full sour','ce/target names'#010+ + '# F','or 8.3 limited OS'#039's the short suffixes'#010+ + '# Otherwise use the full source/target names'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ - 'ZIPEXAMPLESUFFIX=exm'#010+ + 'ZIPEXAMPLESUFFI','X=exm'#010+ 'else'#010+ 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ 'ZIPSOURCESUFFIX=.source'#010+ - 'Z','IPEXAMPLESUFFIX=.examples'#010+ + 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ @@ -1103,19 +1106,18 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '[defaulttools]'#010+ - '############################################################','########'+ - '#'#010+ + '[defaul','ttools]'#010+ + '#####################################################################'#010+ '# Default Tools'#010+ '#####################################################################'#010+ #010+ '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ - 'LDNAME=$(BINUTILSPREFIX)ld'#010+ + 'LDNAME=$(BINUTILSP','REFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ #010+ - '# as','sembler, redefine it if cross compiling'#010+ + '# assembler, redefine it if cross compiling'#010+ 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ @@ -1124,10 +1126,10 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# linker, but probably not used'#010+ + '# linker, but probabl','y not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'LDPROG=$(CROSSBINDIR)/$(L','DNAME)$(SRCEXEEXT)'#010+ + 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ @@ -1138,14 +1140,14 @@ const fpcmakeini : array[0..217,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'RCPROG=$(RCNAME)'#010+ + 'RCPROG=$(RCNAME)'#010, 'endif'#010+ 'endif'#010+ #010+ '# Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ARPROG=$(CRO','SSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ + 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ @@ -1158,11 +1160,11 @@ const fpcmakeini : array[0..217,1..240] of char=( 'AR=$(ARPROG)'#010+ #010+ '# ppas.bat / ppas.sh'#010+ - 'PPAS=ppas$(SRCBATCHEXT)'#010+ + 'PPAS=ppas$(','SRCBATCHEXT)'#010+ #010+ '# ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ - 'LDCONFIG=','ldconfig'#010+ + 'LDCONFIG=ldconfig'#010+ 'else'#010+ 'LDCONFIG='#010+ 'endif'#010+ @@ -1175,9 +1177,9 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+ 'ause'#010+ - '# upx uses that one itself (PFV)'#010+ + '# up','x uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ - 'ifeq ($(OS_TARGET),go32v','2)'#010+ + 'ifeq ($(OS_TARGET),go32v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ @@ -1187,13 +1189,13 @@ const fpcmakeini : array[0..217,1..240] of char=( 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ 'ifeq ($(UPXPROG),)'#010+ - 'UPXPROG='#010+ + 'UP','XPROG='#010+ 'else'#010+ 'UPXPROG:=$(firstword $(UPXPROG))'#010+ 'endif'#010+ 'else'#010+ 'UPXPROG='#010+ - 'end','if'#010+ + 'endif'#010+ 'endif'#010+ 'export UPXPROG'#010+ #010+ @@ -1211,16 +1213,15 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ #010+ - '[command_begin]'#010+ - '###############################################################','#####'+ - '#'#010+ + '[command_be','gin]'#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+ + '# ','compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ - 'override FPCOPT','DEF=$(ARCH)'#010+ + 'override FPCOPTDEF=$(ARCH)'#010+ 'endif'#010+ #010+ #010+ @@ -1229,20 +1230,20 @@ const fpcmakeini : array[0..217,1..240] of char=( 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ - 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ + 'ifneq ($(CPU_TARG','ET),$(CPU_SOURCE))'#010+ 'override FPCOPT+=-P$(ARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(OS_SOUR','CE),openbsd)'#010+ + 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ + 'override FPCOPT+=','-XP$(BINUTILSPREFIX)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'endif',#010+ + 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ @@ -1250,10 +1251,10 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ '# User dirs should be first, so they are looked at first'#010+ 'ifdef UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ + 'override FPCOPT+=$(addprefi','x -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ - 'override FPCOPT+=$(addprefix -F','l,$(LIBDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ @@ -1263,12 +1264,12 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ '# Smartlinking'#010+ - 'ifdef LINKSMART'#010+ + 'ifdef LINKS','MART'#010+ 'override FPCOPT+=-XX'#010+ 'endif'#010+ #010+ '# Smartlinking creation'#010+ - 'ifdef CREAT','ESMART'#010+ + 'ifdef CREATESMART'#010+ 'override FPCOPT+=-CX'#010+ 'endif'#010+ #010+ @@ -1280,9 +1281,9 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ '# Release mode'#010+ '# (strip, optimize and don'#039't load fpc.cfg)'#010+ - '# fpc 2.1 has -O2 for all targets'#010+ + '# fpc',' 2.1 has -O2 for all targets'#010+ 'ifdef RELEASE'#010+ - 'ifneq ($(findstring 2.0.,','$(FPC_VERSION)),)'#010+ + 'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ 'endif'#010+ @@ -1292,12 +1293,12 @@ const fpcmakeini : array[0..217,1..240] of char=( 'else'#010+ 'FPCCPUOPT:=-O2'#010+ 'endif'#010+ - 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ + 'override FPCOPT+=-Ur -Xs $(','FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ '# Strip'#010+ - 'ifdef STRIP',#010+ + 'ifdef STRIP'#010+ 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ @@ -1311,18 +1312,18 @@ const fpcmakeini : array[0..217,1..240] of char=( 'override FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ - '# Needed compiler options'#010+ + '# Nee','ded compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'override FPCOPT+=$(COMPI','LER_OPTIONS)'#010+ + 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_','LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'override FPCOPT+=$(addpr','efix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ @@ -1330,36 +1331,36 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ '# Cross compiler utils'#010+ 'ifdef CROSSBINDIR'#010+ - 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ + 'ove','rride FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target dirs and the prefix ','to use for clean/install'#010+ + '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ - 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'override TARGETDIR','PREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Unit target dir (defaul','t is units/-/'#010+ + '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'over','ride UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ - 'ifdef',' COMPILER_TARGETDIR'#010+ + 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifdef CREATESHARED'#010+ - 'override FPCOPT+=-Cg'#010+ + 'override FPCOPT+=-','Cg'#010+ #010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'override FPCOPT+=-Aas'#010+ @@ -1367,18 +1368,18 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ 'endif'#010+ #010+ - '# ','create always pic'#039'ed code on x86_64'#010+ + '# create always pic'#039'ed code on x86_64'#010+ 'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ 'ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris)'+ ',)'#010+ - 'ifeq ($(CPU_TARGET),x86_64)'#010+ + 'ifeq ($(CPU_TARGET),x','86_64)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifdef LINKSHARED'#010+ - '#!!!',' deactived for testing override FPCOPT+=-XD'#010+ + '#!!! deactived for testing override FPCOPT+=-XD'#010+ 'endif'#010+ #010+ #010+ @@ -1388,23 +1389,23 @@ const fpcmakeini : array[0..217,1..240] of char=( 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'over','ride FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ '[command_end]'#010+ - '#',' Add commandline options last so they can override'#010+ + '# Add commandline options last so they can override'#010+ 'ifdef OPT'#010+ 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ - 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ + 'override FPCOPT+=$(addpre','fix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ - 'ifdef CF','GFILE'#010+ + 'ifdef CFGFILE'#010+ 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ @@ -1412,11 +1413,11 @@ const fpcmakeini : array[0..217,1..240] of char=( 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ - 'export FPCEXTCMD'#010+ + 'export F','PCEXTCMD'#010+ 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'ove','rride AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ @@ -1424,21 +1425,21 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ 'ifdef ACROSSCOMPILE'#010+ 'override FPCOPT+=$(CROSSOPT)'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ - '# als','o call ppas if with command option -s'#010+ + '# also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ + 'ifeq ($(FULL_SOURCE),$(FU','LL_TARGET))'#010+ 'ifdef RUNBATCH'#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ 'else'#010+ - 'EXECP','PAS:=@$(PPAS)'#010+ + 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1447,20 +1448,21 @@ const fpcmakeini : array[0..217,1..240] of char=( '[loaderrules]'#010+ '#####################################################################'#010+ '# Loaders'#010+ - '#####################################################################'#010+ + '############################################','########################'+ + '#'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ - 'ifneq ($(TARGET_LOAD','ERS),)'#010+ + 'ifneq ($(TARGET_LOADERS),)'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TAR','GET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ - 'ifdef COMPILER_UNITTARG','ETDIR'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ @@ -1468,10 +1470,10 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ - 'fpc_loaders_clean:'#010+ + 'fpc_loaders_','clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' -$(DEL) $(addprefix $(CO','MPILER_UNITTARGETDIR)/,$(LOADEROFILE'+ - 'S))'#010+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ + ')'#010+ 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ 'endif'#010+ @@ -1479,18 +1481,18 @@ const fpcmakeini : array[0..217,1..240] of char=( 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL', - 'ES)) $(INSTALL_UNITDIR)'#010+ + ' ',' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+ + 'ILES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ #010+ #010+ '[unitrules]'#010+ - '#####################################################################'#010+ + '#####################################################################', + #010+ '# Units'#010+ - '###########################################################','#########'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ @@ -1498,40 +1500,41 @@ const fpcmakeini : array[0..217,1..240] of char=( 'override ALLTARGET+=fpc_units'#010+ #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ - 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICIT', - 'UNITS))'#010+ + 'o','verride IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+ + 'TUNITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ - 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ + 'fpc_units: $(COMPILER_UNITT','ARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ - '#############################','#######################################'+ - '#'#010+ + '#####################################################################'#010+ '# Exes'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_exes'#010+ #010+ - '# Programs are not needed for a cross installation'#010+ + '# Programs are not needed for a cro','ss installation'#010+ 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ - 'over','ride EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ - 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+ - '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $','(STATICLIBEXT),$(TARGET_'+ + 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEX','T),$(TARGET_PROGRAMS))'+ + ') $(addprefix $(IMPORTLIBPREFIX),$(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+ + 'o','verride CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAM','S))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(add','suffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1540,20 +1543,21 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '#####################################','###############################'+ - '#'#010+ - '# Resource strings'#010+ '#####################################################################'#010+ + '# Resource strings'#010+ + '###########','#########################################################'+ + '#'#010+ #010+ 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ - 'endif'#010, + 'endif'#010+ #010+ #010+ '[examplerules]'#010+ - '#####################################################################'#010+ + '##############################################','######################'+ + '#'#010+ '# Examples'#010+ '#####################################################################'#010+ #010+ @@ -1561,22 +1565,25 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ - 'overrid','e EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+ - 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ - '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMP','LES))'#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ - 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ - '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGE'+ - 'T_EXAMPLES)))'#010+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP', + 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+ + 'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ + 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAM','PLES)) $(ad'+ + 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ + 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ + 'GET_EXAMPLES)))'#010+ + 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ #010+ - 'override ','CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + #010+ + 'o','verride CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ - 'endi','f'#010+ + 'override CLEANEXE','FILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'endif'#010+ 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ 'HASEXAMPLES=1'#010+ @@ -1587,16 +1594,17 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ #010+ '[compilerules]'#010+ - '#####################################################################'#010+ - '# General compile r','ules'#010+ + '###################################','#################################'+ + '#'#010+ + '# General compile rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ - ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ + ' ',' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ - 'fpc_all: $(FPCM','ADE)'#010+ + 'fpc_all: $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ @@ -1607,20 +1615,20 @@ const fpcmakeini : array[0..217,1..240] of char=( 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rules, available for both possible .pp and .pas exte'+ - 'nsions'#010+ + '# General compile rules, available for',' both possible .pp and .pas ex'+ + 'tensions'#010+ #010+ - '.SUFFIXES: $(E','XEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ + '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ - ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ + ' $(MKDIRTREE) $(COMPILER_TA','RGETDIR)'#010+ #010+ '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ - ' ',' $(EXECPPAS)'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ @@ -1632,10 +1640,10 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ '%$(EXEEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' ',' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.lpr'#010+ - ' $(COMPILER) ','$<'#010+ + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.dpr'#010+ @@ -1646,22 +1654,23 @@ const fpcmakeini : array[0..217,1..240] of char=( ' windres -i $< -o $@'#010+ #010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ - 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.pa','s $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#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 %.inc $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.inc $(COMPILER_IN','CLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ - 'vpa','th %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ '# Library'#010+ - '#####################################################################'#010+ + '###################################################','#################'+ + '#'#010+ #010+ '.PHONY: fpc_shared'#010+ #010+ - 'override INSTA','LLTARGET+=fpc_shared_install'#010+ + 'override INSTALLTARGET+=fpc_shared_install'#010+ #010+ 'ifndef SHARED_LIBVERSION'#010+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ @@ -1672,23 +1681,23 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ 'ifndef SHARED_FULLNAME'#010+ - 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_L','IBVERS'+ + 'SHARED_F','ULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERS'+ 'ION)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ - 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ - 'IBUNITS))'#010, + 'override SHARED_LIBUNITS:=','$(filter-out $(INSTALL_BUILDUNIT),$(SHARED'+ + '_LIBUNITS))'#010+ 'endif'#010+ #010+ 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ - ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ - 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETD','IR)'#010+ + ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTA','RGETDIR)'+ + ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ @@ -1697,9 +1706,9 @@ const fpcmakeini : array[0..217,1..240] of char=( 'fpc_shared_install:'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ - 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ - ' $(INSTALL) $(COMPILER_','UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ - 'STALL_SHAREDDIR)'#010+ + 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR',')/$(SHARED_FULLNAME)),)'#010+ + ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ + 'ALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1707,7 +1716,7 @@ const fpcmakeini : array[0..217,1..240] of char=( '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '#################################################################','###'+ + '###########','#########################################################'+ '#'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ @@ -1717,29 +1726,29 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)','$(PPUEXT)'+ + 'overr','ide INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT)'+ ',$(INSTALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+ - ',$(INSTALLPPUFILES))) $(addprefix $(IMPOR','TLIBPREFIX),$(subst $(PPUEX'+ + 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(','STATICLIBEX'+ + 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ - '$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPULINKFILES:=$(wildcard $(addpref','ix $(UNITTARGETDIR'+ - 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ + '$(INSTALLPPUFILES',')))'#010+ + 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INSTALLEXEFILES:=$(addprefix $(TARGETD','IRPREFIX),$(notdir $('+ - 'INSTALLEXEFILES)))'#010+ + 'ifneq ($(TARGETDIRPRE','FIX),)'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ + 'STALLEXEFILES)))'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1747,49 +1756,49 @@ const fpcmakeini : array[0..217,1..240] of char=( 'ifdef INSTALLEXEFILES'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ - 'ifdef UPXPROG'#010+ + 'ifde','f UPXPROG'#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ - 'endif',#010+ + 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#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+ - 'if','def PACKAGE_VERSION'#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_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) Package.fpc $','(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTAL','LPPUFILES'#010+ + 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ - ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL','_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ - ' ',' $(MKDIR) $(INSTALL_LIBDIR)'#010+ + ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FILES'#010+ + 'ifdef I','NSTALL_FILES'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+ - ' ',' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ + ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDI','RS))'#010+ + 'fpc_exa','mpleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ @@ -1797,35 +1806,37 @@ const fpcmakeini : array[0..217,1..240] of char=( ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)',') $(INSTALL_'+ + ' ',' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ - '#####################################################################'#010+ + '###################################################','#################'+ + '#'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ - 'fpc_disti','nstall: install exampleinstall'#010+ + 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ '[zipinstallrules]'#010+ '#####################################################################'#010+ '# Zip'#010+ - '#####################################################################'#010+ + '###########################################################','#########'+ + '#'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourceinstal','l fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #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+ - 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ + 'PACKDIR','=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ - 'end','if'#010+ + 'endif'#010+ 'endif'#010+ #010+ '# Maybe create default zipname from packagename'#010+ @@ -1838,7 +1849,7 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)',#010+ + 'FULLZIPNA','ME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ @@ -1853,11 +1864,11 @@ const fpcmakeini : array[0..217,1..240] of char=( '# Use tar by default under linux'#010+ 'ifndef USEZIP'#010+ 'ifdef inUnix'#010+ - 'USETAR=1'#010+ + 'USETAR=','1'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Use a wrapper script by default for O','s/2'#010+ + '# Use a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ 'USEZIPWRAPPER=1'#010+ 'endif'#010+ @@ -1866,39 +1877,40 @@ const fpcmakeini : array[0..217,1..240] of char=( '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSE','P),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+ + ')'#010+ 'else'#010+ - 'ZIPPATHS','EP=/'#010+ + 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#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_ZI','P:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ + 'ZIPDESTF','ILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ + 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ - 'endif'#010+ + 'endif'#010, #010+ 'fpc_zipinstall:'#010+ - ' $(MAKE) $(ZIPTARGET) INSTALL_','PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ - 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCM','D_CDPACK))" > $(ZIPWRAP'+ - 'PER)'#010+ + 'ifneq ($(ECHOREDI','R),echo)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ + 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ - ' echo $(Z','IPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ + ' ','echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ @@ -1907,21 +1919,21 @@ const fpcmakeini : array[0..217,1..240] of char=( 'ifdef RUNBATCH'#010+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPWRAPPER)'#010+ + ' ',' $(ZIPWRAPPER)'#010+ 'endif'#010+ 'endif'#010+ - ' $(DEL) $(ZIPWRA','PPER)'#010+ + ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURCESUFFIX)'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall Z','IPSUFFIX=$(Z'+ + 'IPSOURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ - 'if','def HASEXAMPLES'#010+ + 'ifdef HASEXAMPLES'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ 'PEXAMPLESUFFIX)'#010+ 'endif'#010+ @@ -1930,40 +1942,43 @@ const fpcmakeini : array[0..217,1..240] of char=( ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ #010+ #010+ - '[cleanrules]'#010+ - '###########################################','#########################'+ - '#'#010+ + '[c','leanrules]'#010+ + '#####################################################################'#010+ '# Clean rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFI','L'+ + 'override CLEA','NEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#010+ + 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ + 'GFILES))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ - 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ + 'XEE','XT), $(CLEAN_PROGRAMS)))'#010+ + 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ + '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ - 'ifdef CLEANPPU','FILES'#010+ + 'ifdef CLEANPPUFIL','ES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ 'LEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA'+ - 'TICLIBEXT),$(CLEANPPUFIL','ES)))'#010+ + 'TICLIBEXT),$(CLEANPPUFILES)','))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(U','NITTARGETDIRPR'+ + 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNIT','TARGETDIRPR'+ 'EFIX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ @@ -1971,30 +1986,10 @@ const fpcmakeini : array[0..217,1..240] of char=( 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ - 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL) $(CLEANPPUFILES)'#010+ + '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ + 'ifdef CLEANEXEDBGFILES'#010+ + ' -$(DELTREE',') $(CLEANEXEDBGFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL) ','$(CLEANPPULINKFILES)'#010+ - 'endif'#010+ - 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ - 'endif'#010+ - 'ifdef CLEAN_FILES'#010+ - ' -$(DEL) $(CLEAN_FILES)'#010+ - 'endif'#010+ - 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ - 'endi','f'#010+ - ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ - 'PCEXTFILE) $(REDIRFILE)'#010+ - ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ - #010+ - 'fpc_cleanall: $(CLEANTARGET)'#010+ - 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ - 'endif'#010+ - 'ifdef COMP','ILER_UNITTARGETDIR'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ @@ -2002,26 +1997,51 @@ const fpcmakeini : array[0..217,1..240] of char=( ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010, + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRS','TFILES))'+ + #010+ + 'endif'#010+ + 'ifdef CLEAN_FILES'#010+ + ' -$(DEL) $(CLEAN_FILES)'#010+ + 'endif'#010+ + 'ifdef LIB_NAME'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ + 'endif'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ + 'PCEXTFILE) $(REDIRFILE)'#010+ + ' -$(','DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ + #010+ + 'fpc_cleanall: $(CLEANTARGET)'#010+ + 'ifdef CLEANEXEFILES'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ + 'endif'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ + 'ifdef CLEANPPUFILES'#010+ + ' -$(DEL) $(CLEANPPUFILES)'#010+ + 'endif'#010+ + 'ifneq ($(CLEANPPULINKFILES),)',#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ + 'endif'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL',') *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ - ' -$(DEL) *.o *','.ppu *.a'#010+ + ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ - 'CEXTFILE) $(REDIRFILE)'#010+ + ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res li','nk.res $('+ + 'FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ - 'ifdef DEBUGSYMEXT',#010+ + 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ #010+ @@ -2029,9 +2049,10 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '#####################################################################'#010+ + '#########################','###########################################'+ + '#'#010+ '# Base info rules'#010+ - '#####################################################################'#010, + '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ @@ -2039,140 +2060,139 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Package info =='#010+ + ' @$(ECHO) =','= Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ - ' ','@$(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) FPC.......... $(FPC)'#010+ + ' @$(ECHO) FPC.......... $(FPC)',#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ - ' @$(ECHO) Target CPU... $(CPU_T','ARGET)'#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 Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ - ' ',' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ + ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO',')'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#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) C','rossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ - ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ + ' @$(ECHO) Other library... $(OTHERLIBDI','R)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ - ' @$(ECHO) Ld......','.. $(LD)'#010+ + ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Mv........ $(MVPROG)'#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) ','Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) Upx....... $(UPX','PROG)'#010+ + ' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ - ' @$(ECHO)'#010+ + ' ','@$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ - ' ','@$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ - ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ + ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ + ' @$(ECHO) Target Programs....... $(TARGET_','PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ - ' ',' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO) Clean Units.....','.... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install Units....... $(I','NSTALL_UNITS)'#010+ + ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Install info =='#010+ + ' @$(ECHO) ==',' Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipName.............. $(ZIPNAM','E)'#010+ + ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ + ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSP','REFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ - ' @$(ECHO) ','Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ + ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ + ' @$(ECHO) Install base dir..... $(INST','ALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ - ' ',' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ - ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ + ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ + ' @$(ECHO) Install source dir... $(INSTALL_SO','URCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ - ' ',' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#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 rules'#010+ + '##################################################','##################'+ + '#'#010+ #010+ '.PHONY: fpc_info'#010+ #010+ 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '######################################################','##############'+ - '#'#010+ + '#####################################################################'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ - ' \'#010+ + '.','PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+ + 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ - ' $(FPCMAKE) -','w -T$(OS_TARGET) Makefile.fpc'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_DIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(','addsuffix /Makefile.fpc,$(TAR'+ + 'GET_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc',',$(TAR'+ - 'GET_EXAMPLEDIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ - 'EXAMPLEDIRS))'#010+ + 'EXAMPL','EDIRS))'#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+ + '# Local Makefile'#010+ + '#########################','###########################################'+ + '#'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ @@ -2180,20 +2200,19 @@ const fpcmakeini : array[0..217,1..240] of char=( #010+ #010+ '[userrules]'#010+ - '##############','######################################################'+ - '#'#010+ - '# Users rules'#010+ '#####################################################################'#010+ + '# Users rules'#010+ + '#####################################','###############################'+ + '#'#010+ #010+ '[lclrules]'#010+ '#####################################################################'#010+ '# LCL Rules'#010+ - '######','##############################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ - 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ + 'ifneq (','$(findstring $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ 'LCL_PLATFORM=gtk'#010+ @@ -2201,10 +2220,10 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ 'export LCL_PLATFORM'#010+ #010+ - '# Check if the spe','cified LCLDIR is correct'#010+ + '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ - 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'ifeq ($(wildcard $(LCLDIR)/un','its/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ @@ -2212,56 +2231,57 @@ const fpcmakeini : array[0..217,1..240] of char=( 'endif'#010+ #010+ '# Check if the default LCLDIR is correct'#010+ - 'ifdef D','EFAULT_LCLDIR'#010+ + 'ifdef DEFAULT_LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ - 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFO','RM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #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+ - 'ifeq ($(LCLDIR),)'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'ifeq ($','(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #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+ - 'ifeq ($(LCLDIR),)'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'ifeq ','($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL', - 'DIR)/units)'#010+ + 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ + 'IR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ - 'nts $(LCLDIR)/components)'#010+ + 'nts $(LCLDIR)/components)',#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ - 'override COMPILER','_UNITDIR+=$(LCLUNITDIR)'#010+ + 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '#####################################################################'#010+ + '###################################################################','#'+ + '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ 'override INFORULES+=lclinfo'#010+ #010+ - '.PHONY: lclinf','o'#010+ + '.PHONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ + ' @$(ECHO) Platform............. $(LCL','_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ - ' @$(ECHO) ','LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ + ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 0318c58034..f479560ab5 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -840,6 +840,8 @@ SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rst +# external debug info for executable +EXEDBGEXT=.dbg #DEBUGSYMEXT #for debugger symbol files, define only for targets which has this # Go32v1 @@ -1004,6 +1006,7 @@ BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn +EXEDBGEXT=.dSYM endif # gba @@ -1460,10 +1463,12 @@ ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) +override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS)) override ALLTARGET+=fpc_exes override INSTALLEXEFILES+=$(EXEFILES) override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES) +override CLEANEXEDBGFILES+=$(EXEDBGFILES) ifeq ($(OS_TARGET),os2) override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)) endif @@ -1500,8 +1505,10 @@ HASEXAMPLES=1 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) +override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) +override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) ifeq ($(OS_TARGET),os2) override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) endif @@ -1848,10 +1855,12 @@ fpc_zipdistinstall: ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) +override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS @@ -1871,6 +1880,10 @@ fpc_clean: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +# DELTREE instead of DEL because on Mac OS X these are directories +ifdef CLEANEXEDBGFILES + -$(DELTREE) $(CLEANEXEDBGFILES) +endif ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) endif