diff --git a/Makefile b/Makefile index 9a1208e911..ff9da7460a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/25] # default: help MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -184,6 +184,12 @@ else ARCH=$(CPU_TARGET) endif endif +ifeq ($(FULL_TARGET),arm-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=arm7 or SUBARCH=cortexm3) must be defined) +endif +override FPCOPT=+=Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -799,7 +805,6 @@ SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rst -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -940,161 +945,6 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif -else -ifeq ($(OS_TARGET),go32v1) -PPUEXT=.pp1 -OEXT=.o1 -ASMEXT=.s1 -SMARTEXT=.sl1 -STATICLIBEXT=.a1 -SHAREDLIBEXT=.so1 -STATICLIBPREFIX= -SHORTSUFFIX=v1 -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),go32v2) -STATICLIBPREFIX= -SHORTSUFFIX=dos -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),watcom) -STATICLIBPREFIX= -SHORTSUFFIX=wat -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),linux) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -ifeq ($(OS_TARGET),freebsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=fbs -endif -ifeq ($(OS_TARGET),netbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=nbs -endif -ifeq ($(OS_TARGET),openbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=obs -endif -ifeq ($(OS_TARGET),win32) -PPUEXT=.ppw -OEXT=.ow -ASMEXT=.sw -SMARTEXT=.slw -STATICLIBEXT=.aw -SHAREDLIBEXT=.dll -SHORTSUFFIX=w32 -endif -ifeq ($(OS_TARGET),os2) -BATCHEXT=.cmd -PPUEXT=.ppo -ASMEXT=.so2 -OEXT=.oo2 -AOUTEXT=.out -SMARTEXT=.sl2 -STATICLIBPREFIX= -STATICLIBEXT=.ao2 -SHAREDLIBEXT=.dll -SHORTSUFFIX=os2 -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),amiga) -EXEEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.library -SHORTSUFFIX=amg -endif -ifeq ($(OS_TARGET),atari) -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT=.ttp -SHORTSUFFIX=ata -endif -ifeq ($(OS_TARGET),beos) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=be -endif -ifeq ($(OS_TARGET),solaris) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=sun -endif -ifeq ($(OS_TARGET),qnx) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=qnx -endif -ifeq ($(OS_TARGET),netware) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nw -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),netwlibc) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nwl -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),macos) -BATCHEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -DEBUGSYMEXT=.xcoff -SHORTSUFFIX=mac -IMPORTLIBPREFIX=imp -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1284,15 +1134,6 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc -ifneq ($(findstring 1.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),win32) -ifeq ($(CROSSBINDIR),) -ASNAME=asw -LDNAME=ldw -ARNAME=arw -endif -endif -endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index e3e97228e5..543115caf0 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/25] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -185,6 +185,12 @@ else ARCH=$(CPU_TARGET) endif endif +ifeq ($(FULL_TARGET),arm-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv7 or SUBARCH=cortexm3) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -308,7 +314,12 @@ endif CPU_UNITS= SYSINIT_UNITS= ifeq ($(ARCH),arm) -CPU_UNITS=lpc21x4 at91sam7x256 stellaris stm32f103 +ifeq ($(SUBARCH),cortexm3) +CPU_UNITS=lm3fury lm3tempest thumb2_bare stm32f103 +endif +ifeq ($(SUBARCH),armv7) +CPU_UNITS=lpc21x4 at91sam7x256 +endif endif ifeq ($(ARCH),avr) CPU_UNITS=atmega128 @@ -1096,7 +1107,6 @@ SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rst -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -1237,161 +1247,6 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif -else -ifeq ($(OS_TARGET),go32v1) -PPUEXT=.pp1 -OEXT=.o1 -ASMEXT=.s1 -SMARTEXT=.sl1 -STATICLIBEXT=.a1 -SHAREDLIBEXT=.so1 -STATICLIBPREFIX= -SHORTSUFFIX=v1 -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),go32v2) -STATICLIBPREFIX= -SHORTSUFFIX=dos -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),watcom) -STATICLIBPREFIX= -SHORTSUFFIX=wat -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),linux) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -ifeq ($(OS_TARGET),freebsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=fbs -endif -ifeq ($(OS_TARGET),netbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=nbs -endif -ifeq ($(OS_TARGET),openbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=obs -endif -ifeq ($(OS_TARGET),win32) -PPUEXT=.ppw -OEXT=.ow -ASMEXT=.sw -SMARTEXT=.slw -STATICLIBEXT=.aw -SHAREDLIBEXT=.dll -SHORTSUFFIX=w32 -endif -ifeq ($(OS_TARGET),os2) -BATCHEXT=.cmd -PPUEXT=.ppo -ASMEXT=.so2 -OEXT=.oo2 -AOUTEXT=.out -SMARTEXT=.sl2 -STATICLIBPREFIX= -STATICLIBEXT=.ao2 -SHAREDLIBEXT=.dll -SHORTSUFFIX=os2 -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),amiga) -EXEEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.library -SHORTSUFFIX=amg -endif -ifeq ($(OS_TARGET),atari) -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT=.ttp -SHORTSUFFIX=ata -endif -ifeq ($(OS_TARGET),beos) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=be -endif -ifeq ($(OS_TARGET),solaris) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=sun -endif -ifeq ($(OS_TARGET),qnx) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=qnx -endif -ifeq ($(OS_TARGET),netware) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nw -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),netwlibc) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nwl -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),macos) -BATCHEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -DEBUGSYMEXT=.xcoff -SHORTSUFFIX=mac -IMPORTLIBPREFIX=imp -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1581,15 +1436,6 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc -ifneq ($(findstring 1.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),win32) -ifeq ($(CROSSBINDIR),) -ASNAME=asw -LDNAME=ldw -ARNAME=arw -endif -endif -endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index cd0afdf2bc..7d6d06ccfa 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -48,7 +48,13 @@ CPU_UNITS= SYSINIT_UNITS= ifeq ($(ARCH),arm) -CPU_UNITS=lpc21x4 at91sam7x256 stellaris stm32f103 +ifeq ($(SUBARCH),cortexm3) +CPU_UNITS=lm3fury lm3tempest thumb2_bare stm32f103 +endif + +ifeq ($(SUBARCH),armv7) +CPU_UNITS=lpc21x4 at91sam7x256 +endif endif ifeq ($(ARCH),avr) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 271dcf0608..932aca2b48 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -296,15 +296,14 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - 'ifeq ($(CPU_TARGET),arm)'#013,#010+ - 'ifeq ($(OS_TARGET),embedded)'#013#010+ + 'ifeq ($(FULL_TARGET),arm-','embedded)'#013#010+ 'ifeq ($(SUBARCH),)'#013#010+ '# we don'#039't add a default here, people should explicitly add the SU'+ 'BARCH'#013#010+ '$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBA'+ - 'RCH=arm7 or SUBARCH=cortexm3) must be defined)',#013#010+ - 'endif'#013#010+ + 'RCH=armv7 or SUBARCH=cortexm3) must be defined)'#013#010+ 'endif'#013#010+ + 'override F','PCOPT+=-Cp$(SUBARCH)'#013#010+ 'endif'#013#010+ #013#010+ '# Full name of the target, including CPU and OS. For OSs limited'#013#010+ @@ -312,8 +311,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#013#010+ 'TARGETSUFFIX=$(OS_TARGET)'#013#010+ 'SOURCESUFFIX=$(OS_SOURCE)'#013#010+ - 'else'#013#010+ - 'ifn','eq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)'#013#010+ + 'els','e'#013#010+ + 'ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)'#013#010+ 'TARGETSUFFIX=$(OS_TARGET)'#013#010+ 'else'#013#010+ 'TARGETSUFFIX=$(FULL_TARGET)'#013#010+ @@ -324,13 +323,13 @@ const fpcmakeini : array[0..225,1..240] of char=( '# Cross compile flag'#013#010+ 'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#013#010+ 'CROSSCOMPILE=1'#013#010+ - 'endif'#013#010+ - #013#010, + 'end','if'#013#010+ + #013#010+ '# Check if the Makefile supports this target, but not'#013#010+ '# when the make target is to rebuild the makefile'#013#010+ 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#013#010+ 'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#013#010+ - '$(error The Makefile doesn'#039't ','support target $(FULL_TARGET), plea'+ + '$(error The Makefile do','esn'#039't support target $(FULL_TARGET), plea'+ 'se run fpcmake first)'#013#010+ 'endif'#013#010+ 'endif'#013#010+ @@ -342,7 +341,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'BSDhier=1'#013#010+ 'endif'#013#010+ #013#010+ - '# Detect Linux, will also u','se its own directory hierarchy.'#013#010+ + '# Detect Linux, will ','also use its own directory hierarchy.'#013#010+ 'ifeq ($(OS_TARGET),linux)'#013#010+ 'linuxHier=1'#013#010+ 'endif'#013#010+ @@ -351,14 +350,14 @@ const fpcmakeini : array[0..225,1..240] of char=( '_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#013#010+ #013#010+ '[fpmakefpcdetect]'#013#010+ - '###################','#################################################'+ + '#############','#######################################################'+ '#'#013#010+ '# FPC Binary and Version Detection'#013#010+ '#####################################################################'#013+ #010+ '# If FPCFPMAKE is not set and we'#039're cross-compiling, try to find a'+ #013#010+ - '# native comp','iler.'#013#010+ + '# nativ','e compiler.'#013#010+ 'ifndef FPCFPMAKE'#013#010+ #013#010+ 'ifdef CROSSCOMPILE'#013#010+ @@ -368,20 +367,20 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDI'+ 'R)))),)'#013#010+ - '# If that comp','iler is not found, use the common, installed native co'+ + '# If tha','t compiler is not found, use the common, installed native co'+ 'mpiler'#013#010+ '# Note that in this case FPCFPMAKE is not exported, because it could b'+ 'e that'#013#010+ '# a more suitable compiler is compiled later on'#013#010+ '# check if fpc exists'#013#010+ - 'FPCPROG:=$(strip $(wildcard ','$(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPAT'+ + 'FPCPROG:=$(strip $(wil','dcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPAT'+ 'H))))'#013#010+ 'ifneq ($(FPCPROG),)'#013#010+ 'FPCPROG:=$(firstword $(FPCPROG))'#013#010+ 'FPCFPMAKE:=$(shell $(FPCPROG) -PB)'#013#010+ '# if a native compiler is not found, fall back to fpc'#013#010+ - 'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)'#013#010+ - 'FPCF','PMAKE:=$(firstword $(FPCPROG))'#013#010+ + 'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)',#013#010+ + 'FPCFPMAKE:=$(firstword $(FPCPROG))'#013#010+ 'endif'#013#010+ 'else'#013#010+ '# fpc binary not found, fallback to ppc386'#013#010+ @@ -389,14 +388,14 @@ const fpcmakeini : array[0..225,1..240] of char=( '(SRCEXEEXT),$(SEARCHPATH)))))'#013#010+ 'endif'#013#010+ 'else'#013#010+ - '# Use the ppc compiler. Because the p','ath to the compiler is relative'+ + '# Use the ppc compiler. Because',' the path to the compiler is relative'+ ', do not'#013#010+ '# evaluate the variable here, but do that on the fly.'#013#010+ 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(F'+ 'PCDIR))))'#013#010+ 'FPMAKE_SKIP_CONFIG=-n'#013#010+ 'export FPCFPMAKE'#013#010+ - 'export FPMAKE_SKIP_CON','FIG'#013#010+ + 'export FPMAKE_SK','IP_CONFIG'#013#010+ 'endif'#013#010+ #013#010+ 'else'#013#010+ @@ -411,7 +410,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# FPCDIR Setting'#013#010+ - '####################################################','################'+ + '##############################################','######################'+ '#'#013#010+ #013#010+ '# Test FPCDIR to look if the RTL dir exists'#013#010+ @@ -421,8 +420,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCDIR=wrong'#013#010+ 'endif'#013#010+ 'else'#013#010+ - 'override FPCDIR=wrong'#013#010+ - 'endif',#013#010+ + 'override FPCDIR=wrong'#013,#010+ + 'endif'#013#010+ #013#010+ '# Default FPCDIR from Makefile.fpc'#013#010+ 'ifdef DEFAULT_FPCDIR'#013#010+ @@ -432,9 +431,9 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCDIR=wrong'#013#010+ 'endif'#013#010+ 'endif'#013#010+ - 'endif'#013#010+ + 'endif'#013#010, #013#010+ - '[fpc','dirdetect]'#013#010+ + '[fpcdirdetect]'#013#010+ '# Detect FPCDIR'#013#010+ 'ifeq ($(FPCDIR),wrong)'#013#010+ 'ifdef inUnix'#013#010+ @@ -443,12 +442,12 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#013#010+ 'endif'#013#010+ 'else'#013#010+ - 'override FPCDIR:=$(subst /$','(FPC),,$(firstword $(strip $(wildcard $(a'+ + 'override FPCDIR:=$(su','bst /$(FPC),,$(firstword $(strip $(wildcard $(a'+ 'ddsuffix /$(FPC),$(SEARCHPATH))))))'#013#010+ 'override FPCDIR:=$(FPCDIR)/..'#013#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+ 'override FPCDIR:=$(FPCDIR)/..'#013#010+ - 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl u','nits)),)'#013#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/',',rtl units)),)'#013#010+ 'override FPCDIR:=$(BASEDIR)'#013#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+ 'override FPCDIR=c:/pp'#013#010+ @@ -460,7 +459,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Cross binaries dir'#013#010+ 'ifndef CROSSBINDIR'#013#010+ - 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARG','ETSUFFIX))'#013#010+ + 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/','$(TARGETSUFFIX))'#013#010+ 'endif'#013#010+ #013#010+ '# Default binutils prefix for cross compile when the'#013#010+ @@ -469,9 +468,9 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifeq ($(OS_SOURCE),darwin)'#013#010+ 'DARWIN2DARWIN=1'#013#010+ 'endif'#013#010+ - 'endif'#013#010+ + 'endif'#013#010, #013#010+ - 'ifnd','ef BINUTILSPREFIX'#013#010+ + 'ifndef BINUTILSPREFIX'#013#010+ 'ifndef CROSSBINDIR'#013#010+ 'ifdef CROSSCOMPILE'#013#010+ 'ifndef DARWIN2DARWIN'#013#010+ @@ -482,7 +481,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Try first the full target name, otherwise try only'#013#010+ - '# the OS for backwards compatib','ility'#013#010+ + '# the OS for backwards co','mpatibility'#013#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#013#010+ 'ifeq ($(UNITSDIR),)'#013#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#013#010+ @@ -490,7 +489,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Packages dir'#013#010+ 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/package'+ - 's/base $(F','PCDIR)/packages/extra)'#013#010+ + 's/ba','se $(FPCDIR)/packages/extra)'#013#010+ #013#010+ #013#010+ '[shelltools]'#013#010+ @@ -500,7 +499,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ #013#010+ - '# Echo that can redir (must be able run',' in the default OS shell)'#013+ + '# Echo that can redir (must be ab','le run in the default OS shell)'#013+ #010+ 'ifndef ECHOREDIR'#013#010+ 'ifndef inUnix'#013#010+ @@ -517,7 +516,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Copy a whole tree'#013#010+ 'ifndef COPYTREE'#013#010+ - 'COPYTREE:=$(CPPROG) -Rf','p'#013#010+ + 'COPYTREE:=$(CPPRO','G) -Rfp'#013#010+ 'endif'#013#010+ #013#010+ '# Copy a whole tree'#013#010+ @@ -535,8 +534,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'DEL:=$(RMPROG) -f'#013#010+ 'endif'#013#010+ #013#010+ - '# Check deltree program'#013#010+ - 'if','ndef DELTREE'#013#010+ + '# Check deltree progr','am'#013#010+ + 'ifndef DELTREE'#013#010+ 'DELTREE:=$(RMPROG) -rf'#013#010+ 'endif'#013#010+ #013#010+ @@ -552,7 +551,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '# To install programs'#013#010+ 'ifndef INSTALLEXE'#013#010+ 'ifdef inUnix'#013#010+ - 'INSTALLEXE:=$(G','INSTALL) -c -m 755'#013#010+ + 'INSTALLEX','E:=$(GINSTALL) -c -m 755'#013#010+ 'else'#013#010+ 'INSTALLEXE:=$(COPY)'#013#010+ 'endif'#013#010+ @@ -568,7 +567,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ #013#010+ '[defaultdirs]'#013#010+ - '#######','#############################################################'+ + '#','###################################################################'+ '#'#013#010+ '# Default Directories'#013#010+ '#####################################################################'#013+ @@ -576,8 +575,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Units dir'#013#010+ 'ifdef REQUIRE_UNITSDIR'#013#010+ - 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#013#010+ - 'end','if'#013#010+ + 'override UNITSDIR+=$(REQUIRE_UNITSDIR',')'#013#010+ + 'endif'#013#010+ #013#010+ '# Units dir'#013#010+ 'ifdef REQUIRE_PACKAGESDIR'#013#010+ @@ -588,7 +587,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '# Unixes use unix dirs with /usr/bin, /usr/lib'#013#010+ '# When zipping use the target os default, when normal install then'#013+ #010+ - '# use the source os a','s default'#013#010+ + '# use the sourc','e os as default'#013#010+ 'ifdef ZIPINSTALL'#013#010+ '# Zipinstall'#013#010+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#013#010+ @@ -601,7 +600,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# When install prefix is not set t','ry to use prefix'#013#010+ + '# When install prefix is not',' set try to use prefix'#013#010+ 'ifndef INSTALL_PREFIX'#013#010+ 'ifdef PREFIX'#013#010+ 'INSTALL_PREFIX=$(PREFIX)'#013#010+ @@ -613,7 +612,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef UNIXHier'#013#010+ 'INSTALL_PREFIX=/usr/local'#013#010+ 'else'#013#010+ - 'ifdef INSTALL_F','PCPACKAGE'#013#010+ + 'ifdef INS','TALL_FPCPACKAGE'#013#010+ 'INSTALL_BASEDIR:=/pp'#013#010+ 'else'#013#010+ 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#013#010+ @@ -624,8 +623,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Export also INSTALL_SOURCESUBDIR set so it will be'#013#010+ '# used recursively for all subdirs'#013#010+ - 'ifdef INSTALL_FPCSUBDIR'#013#010+ - 'expor','t INSTALL_FPCSUBDIR'#013#010+ + 'ifdef INSTALL_FPCSUBDIR'#013,#010+ + 'export INSTALL_FPCSUBDIR'#013#010+ 'endif'#013#010+ #013#010+ '# Where to place the resulting zip files'#013#010+ @@ -637,7 +636,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '# EXE/PPU Target directories'#013#010+ 'ifndef COMPILER_UNITTARGETDIR'#013#010+ 'ifdef PACKAGEDIR_MAIN'#013#010+ - 'COMPILE','R_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#013#010+ + 'C','OMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#013#010+ 'else'#013#010+ 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#013#010+ 'endif'#013#010+ @@ -647,7 +646,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ #013#010+ - '########################################################','############'+ + '##################################################','##################'+ '#'#013#010+ '# Install Directories'#013#010+ '#####################################################################'#013+ @@ -657,7 +656,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifndef INSTALL_BASEDIR'#013#010+ 'ifdef UNIXHier'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ - 'INSTALL_B','ASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#013#010+ + 'INS','TALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#013#010+ 'else'#013#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#013#010+ 'endif'#013#010+ @@ -667,7 +666,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# set the directory where to install the binaries'#013#010+ - 'ifndef INSTA','LL_BINDIR'#013#010+ + 'ifndef',' INSTALL_BINDIR'#013#010+ 'ifdef UNIXHier'#013#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#013#010+ 'else'#013#010+ @@ -675,7 +674,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '# for FPC packages install the binaries under their target subdir'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ 'ifdef CROSSCOMPILE'#013#010+ - 'ifdef CROSSINST','ALL'#013#010+ + 'ifdef CRO','SSINSTALL'#013#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#013#010+ 'else'#013#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#013#010+ @@ -687,7 +686,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# set the directory where to inst','all the units.'#013#010+ + '# set the directory where t','o install the units.'#013#010+ 'ifndef INSTALL_UNITDIR'#013#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ @@ -697,7 +696,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Where to install ','shared libraries'#013#010+ + '# Where to in','stall shared libraries'#013#010+ 'ifndef INSTALL_LIBDIR'#013#010+ 'ifdef UNIXHier'#013#010+ 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#013#010+ @@ -708,8 +707,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Where the source files will be stored'#013#010+ 'ifndef INSTALL_SOURCEDIR'#013#010+ - 'ifdef UNIXHier'#013#010+ - 'ifd','ef BSDhier'#013#010+ + 'ifdef UNIXHie','r'#013#010+ + 'ifdef BSDhier'#013#010+ 'SRCPREFIXDIR=share/src'#013#010+ 'else'#013#010+ 'ifdef linuxHier'#013#010+ @@ -720,16 +719,16 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ 'ifdef INSTALL_FPCSUBDIR'#013#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI','O'+ - 'N)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#013#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC','_VERSI'+ + 'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#013#010+ 'else'#013#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#013#010+ 'endif'#013#010+ 'else'#013#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ - '(PACKAGE_VERSION)'#013#010+ - 'e','ndif'#013#010+ + '(PACKAGE_VERSI','ON)'#013#010+ + 'endif'#013#010+ 'else'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ 'ifdef INSTALL_FPCSUBDIR'#013#010+ @@ -739,7 +738,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#013#010+ 'endif'#013#010+ 'else'#013#010+ - 'INSTALL_SOURC','EDIR:=$(INSTALL_BASEDIR)/source'#013#010+ + 'INSTALL','_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#013#010+ 'endif'#013#010+ 'endif'#013#010+ 'endif'#013#010+ @@ -753,7 +752,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef linuxHier'#013#010+ 'DOCPREFIXDIR=share/doc'#013#010+ 'else'#013#010+ - 'DOCPREFIXDIR=do','c'#013#010+ + 'DOCPREFIX','DIR=doc'#013#010+ 'endif'#013#010+ 'endif'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ @@ -763,8 +762,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ 'CKAGE_VERSION)'#013#010+ 'endif'#013#010+ - 'else'#013#010+ - 'ifdef ','INSTALL_FPCPACKAGE'#013#010+ + 'else'#013#010, + 'ifdef INSTALL_FPCPACKAGE'#013#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#013#010+ 'else'#013#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#013#010+ @@ -773,7 +772,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Where to install the examples, under linux we use the doc dir'#013#010+ - '# because the copytree command',' will create a subdir itself'#013#010+ + '# because the copytree c','ommand will create a subdir itself'#013#010+ 'ifndef INSTALL_EXAMPLEDIR'#013#010+ 'ifdef UNIXHier'#013#010+ 'ifdef INSTALL_FPCPACKAGE'#013#010+ @@ -783,7 +782,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ')/$(PACKAGE_NAME)'#013#010+ 'else'#013#010+ 'ifdef linuxHier'#013#010+ - 'INSTALL_EXAM','PLEDIR:=$(INSTALL_DOCDIR)/examples'#013#010+ + 'INSTAL','L_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#013#010+ 'else'#013#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ '$(PACKAGE_NAME)'#013#010+ @@ -793,8 +792,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'else'#013#010+ #013#010+ 'ifdef BSDhier'#013#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ - '(P','ACKAGE_VERSION)'#013#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAM','E)'+ + '-$(PACKAGE_VERSION)'#013#010+ 'else'#013#010+ 'ifdef linuxHier'#013#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ @@ -806,8 +805,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'endif'#013#010+ 'endif'#013#010+ - 'else'#013#010+ - 'ifde','f INSTALL_FPCPACKAGE'#013#010+ + 'else',#013#010+ + 'ifdef INSTALL_FPCPACKAGE'#013#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#013#010+ 'else'#013#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#013#010+ @@ -816,7 +815,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Where the some extra (data)files will be stored'#013#010+ - 'ifndef INSTALL_DATADIR'#013#010, + 'ifndef INSTALL_DAT','ADIR'#013#010+ 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#013#010+ 'endif'#013#010+ #013#010+ @@ -827,14 +826,14 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# Cross compile dirs'#013#010+ - '##########################','##########################################'+ + '####################','################################################'+ '#'#013#010+ #013#010+ 'ifdef CROSSCOMPILE'#013#010+ '# Directory where the cross compile tools are stored.'#013#010+ '# First check if they are available in FPCDIR. If no targets/ subdir'#013+ #010+ - '# is found use the targets/ subdir in INSTALL_BA','SEDIR.'#013#010+ + '# is found use the targets/ subdir in INST','ALL_BASEDIR.'#013#010+ 'ifndef CROSSBINDIR'#013#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#013#010+ 'ifeq ($(CROSSBINDIR),)'#013#010+ @@ -843,8 +842,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ 'else'#013#010+ - 'CROSSBINDIR='#013#010+ - 'endi','f'#013#010+ + 'CROSSBINDIR=',#013#010+ + 'endif'#013#010+ #013#010+ #013#010+ '[dirlibc]'#013#010+ @@ -856,7 +855,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#013#010+ 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#013#010+ 'ifeq ($(BINUTILSPREFIX),)'#013#010+ - 'GCCLIBDIR:','=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#013#010+ + 'GCCL','IBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#013#010+ 'endif'#013#010+ 'endif'#013#010+ 'endif'#013#010+ @@ -867,8 +866,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Try cross gcc'#013#010+ - 'if','ndef GCCLIBDIR'#013#010+ + '# Try cross g','cc'#013#010+ + 'ifndef GCCLIBDIR'#013#010+ 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ 'XT),$(SEARCHPATH))))'#013#010+ 'ifneq ($(CROSSGCC),)'#013#010+ @@ -876,7 +875,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Other libraries from ld.s','o.conf'#013#010+ + '# Other libraries fro','m ld.so.conf'#013#010+ 'ifndef OTHERLIBDIR'#013#010+ 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ '"; print $1 }'#039')'#013#010+ @@ -888,9 +887,9 @@ const fpcmakeini : array[0..225,1..240] of char=( 'OTHERLIBDIR+=/usr/pkg/lib'#013#010+ 'endif'#013#010+ 'export GCCLIBDIR OTHERLIB'#013#010+ - 'endif'#013#010+ + 'endi','f'#013#010+ + #013#010+ #013#010+ - #013,#010+ '[extensions]'#013#010+ '#####################################################################'#013+ #010+ @@ -899,7 +898,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #013#010+ '# Default needed extensions (Go32v2,Linux)'#013#010+ - 'BATCHEXT=.bat'#013#010, + 'BATCHEXT=','.bat'#013#010+ 'LOADEREXT=.as'#013#010+ 'EXEEXT=.exe'#013#010+ 'PPLEXT=.ppl'#013#010+ @@ -913,7 +912,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'STATICLIBPREFIX=libp'#013#010+ 'IMPORTLIBPREFIX=libimp'#013#010+ 'RSTEXT=.rst'#013#010+ - '#DEBUGSYMEXT #for debugger symbol f','iles, define only for targets whi'+ + '#DEBUGSYMEXT #for debugger sy','mbol files, define only for targets whi'+ 'ch has this'#013#010+ #013#010+ '# Go32v1'#013#010+ @@ -929,8 +928,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'IMPORTLIBPREFIX='#013#010+ 'endif'#013#010+ #013#010+ - '# watcom'#013#010+ - 'i','feq ($(OS_TARGET),watcom)'#013#010+ + '# wat','com'#013#010+ + 'ifeq ($(OS_TARGET),watcom)'#013#010+ 'STATICLIBPREFIX='#013#010+ 'OEXT=.obj'#013#010+ 'ASMEXT=.asm'#013#010+ @@ -947,7 +946,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'SHORTSUFFIX=lnx'#013#010+ 'endif'#013#010+ #013#010+ - '# FreeB','SD'#013#010+ + '#',' FreeBSD'#013#010+ 'ifeq ($(OS_TARGET),freebsd)'#013#010+ 'BATCHEXT=.sh'#013#010+ 'EXEEXT='#013#010+ @@ -964,7 +963,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# OpenBSD'#013#010+ - 'ifeq ($(OS_TARGET),openbsd)'#013,#010+ + 'ifeq ($(OS_TARGET),ope','nbsd)'#013#010+ 'BATCHEXT=.sh'#013#010+ 'EXEEXT='#013#010+ 'HASSHAREDLIB=1'#013#010+ @@ -982,7 +981,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'BATCHEXT=.cmd'#013#010+ 'AOUTEXT=.out'#013#010+ 'STATICLIBPREFIX='#013#010+ - 'SHAREDLIBEXT=','.dll'#013#010+ + 'SHAREDL','IBEXT=.dll'#013#010+ 'SHORTSUFFIX=os2'#013#010+ 'ECHO=echo'#013#010+ 'IMPORTLIBPREFIX='#013#010+ @@ -1000,7 +999,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Amiga'#013#010+ - 'ifeq ($(OS_TARGET','),amiga)'#013#010+ + 'ifeq ($(OS_','TARGET),amiga)'#013#010+ 'EXEEXT='#013#010+ 'SHAREDLIBEXT=.library'#013#010+ 'SHORTSUFFIX=amg'#013#010+ @@ -1017,8 +1016,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifeq ($(OS_TARGET),atari)'#013#010+ 'EXEEXT=.ttp'#013#010+ 'SHORTSUFFIX=ata'#013#010+ - 'endif'#013#010+ - #013,#010+ + 'en','dif'#013#010+ + #013#010+ '# BeOS'#013#010+ 'ifeq ($(OS_TARGET),beos)'#013#010+ 'BATCHEXT=.sh'#013#010+ @@ -1037,7 +1036,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifeq ($(OS_TARGET),solaris)'#013#010+ 'BATCHEXT=.sh'#013#010+ 'EXEEXT='#013#010+ - 'SHORTSUFF','IX=sun'#013#010+ + 'SHO','RTSUFFIX=sun'#013#010+ 'endif'#013#010+ #013#010+ '# QNX'#013#010+ @@ -1055,8 +1054,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'IMPORTLIBPREFIX=imp'#013#010+ 'endif'#013#010+ #013#010+ - '# Netware libc'#013#010+ - 'ifeq',' ($(OS_TARGET),netwlibc)'#013#010+ + '# Netware libc',#013#010+ + 'ifeq ($(OS_TARGET),netwlibc)'#013#010+ 'EXEEXT=.nlm'#013#010+ 'STATICLIBPREFIX='#013#010+ 'SHORTSUFFIX=nwl'#013#010+ @@ -1072,8 +1071,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'IMPORTLIBPREFIX=imp'#013#010+ 'endif'#013#010+ #013#010+ - '# Darwin'#013#010+ - 'ifn','eq ($(findstring $(OS_TARGET),darwin iphonesim),)'#013#010+ + '# Darwi','n'#013#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#013#010+ 'BATCHEXT=.sh'#013#010+ 'EXEEXT='#013#010+ 'HASSHAREDLIB=1'#013#010+ @@ -1088,7 +1087,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Symbian OS'#013#010+ - 'ifeq ($(OS_TARGET),sy','mbian)'#013#010+ + 'ifeq ($(OS_TARG','ET),symbian)'#013#010+ 'SHAREDLIBEXT=.dll'#013#010+ 'SHORTSUFFIX=symbian'#013#010+ 'endif'#013#010+ @@ -1104,16 +1103,16 @@ const fpcmakeini : array[0..225,1..240] of char=( 'EXEEXT=.dol'#013#010+ 'SHAREDLIBEXT=.so'#013#010+ 'SHORTSUFFIX=wii'#013#010+ - 'endif'#013#010+ + 'endif',#013#010+ #013#010+ - '# ','For 8.3 limited OS'#039's the short suffixes'#013#010+ + '# For 8.3 limited OS'#039's the short suffixes'#013#010+ '# Otherwise use the full source/target names'#013#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#013#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#013#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#013#010+ 'ZIPCROSSPREFIX='#013#010+ 'ZIPSOURCESUFFIX=src'#013#010+ - 'ZIPEXAM','PLESUFFIX=exm'#013#010+ + 'Z','IPEXAMPLESUFFIX=exm'#013#010+ 'else'#013#010+ 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#013#010+ 'ZIPSOURCESUFFIX=.source'#013#010+ @@ -1123,8 +1122,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#013#010+ 'else'#013#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#013#010+ - 'ZIPCROSSPREFIX='#013#010+ - 'e','ndif'#013#010+ + 'ZIPCROSSPREF','IX='#013#010+ + 'endif'#013#010+ 'endif'#013#010+ #013#010+ '[defaulttools]'#013#010+ @@ -1135,7 +1134,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #013#010+ '# Names of the binutils tools'#013#010+ - 'ASNAME=$(BINUTILS','PREFIX)as'#013#010+ + 'ASNAME=$(BI','NUTILSPREFIX)as'#013#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#013#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#013#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#013#010+ @@ -1145,7 +1144,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef CROSSBINDIR'#013#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#013#010+ 'else'#013#010+ - 'ASPROG=$(ASNA','ME)'#013#010+ + 'ASPROG=','$(ASNAME)'#013#010+ 'endif'#013#010+ 'endif'#013#010+ #013#010+ @@ -1161,7 +1160,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '# Resource compiler'#013#010+ 'ifndef RCPROG'#013#010+ 'ifdef CROSSBINDIR'#013#010+ - 'RCPROG=$(CRO','SSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#013#010+ + 'RCPROG','=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#013#010+ 'else'#013#010+ 'RCPROG=$(RCNAME)'#013#010+ 'endif'#013#010+ @@ -1177,8 +1176,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Override defaults'#013#010+ - 'AS=$(ASPROG)'#013#010+ - 'L','D=$(LDPROG)'#013#010+ + 'AS=$(ASPR','OG)'#013#010+ + 'LD=$(LDPROG)'#013#010+ 'RC=$(RCPROG)'#013#010+ 'AR=$(ARPROG)'#013#010+ #013#010+ @@ -1194,8 +1193,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'ifdef DATE'#013#010+ 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#013#010+ - 'else'#013#010+ - 'DAT','ESTR='#013#010+ + 'els','e'#013#010+ + 'DATESTR='#013#010+ 'endif'#013#010+ #013#010+ '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+ @@ -1208,7 +1207,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifeq ($(OS_TARGET),win32)'#013#010+ 'UPXPROG:=1'#013#010+ 'endif'#013#010+ - 'ifdef UPX','PROG'#013#010+ + 'ifd','ef UPXPROG'#013#010+ 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#013#010+ 'ifeq ($(UPXPROG),)'#013#010+ @@ -1224,7 +1223,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Zip options'#013#010+ 'ZIPOPT=-9'#013#010+ - 'ZIPEXT=.','zip'#013#010+ + 'ZI','PEXT=.zip'#013#010+ #013#010+ '# Tar options'#013#010+ 'ifeq ($(USETAR),bz2)'#013#010+ @@ -1240,7 +1239,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# Compiler Command Line'#013#010+ - '###########','#########################################################'+ + '#####','###############################################################'+ '#'#013#010+ #013#010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#013+ @@ -1251,7 +1250,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ #013#010+ - '# Load comman','dline OPT and add target and unit dir to be sure'#013#010+ + '# Load ','commandline OPT and add target and unit dir to be sure'#013#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#013#010+ 'override FPCOPT+=-T$(OS_TARGET)'#013#010+ 'endif'#013#010+ @@ -1261,7 +1260,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ 'ifeq ($(OS_SOURCE),openbsd)'#013#010+ - 'override F','PCOPT+=-FD$(NEW_BINUTILS_PATH)'#013#010+ + 'over','ride FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#013#010+ 'endif'#013#010+ #013#010+ 'ifndef CROSSBOOTSTRAP'#013#010+ @@ -1273,7 +1272,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# User dirs should be fi','rst, so they are looked at first'#013#010+ + '# User dirs should',' be first, so they are looked at first'#013#010+ 'ifdef UNITDIR'#013#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#013#010+ 'endif'#013#010+ @@ -1282,8 +1281,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'ifdef OBJDIR'#013#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#013#010+ - 'endif'#013#010+ - 'ifdef ','INCDIR'#013#010+ + 'endif'#013#010, + 'ifdef INCDIR'#013#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#013#010+ 'endif'#013#010+ #013#010+ @@ -1299,7 +1298,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '# Debug'#013#010+ 'ifdef DEBUG'#013#010+ - 'override FPCOPT+=','-gl'#013#010+ + 'override FP','COPT+=-gl'#013#010+ 'override FPCOPTDEF+=DEBUG'#013#010+ 'endif'#013#010+ #013#010+ @@ -1309,7 +1308,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef RELEASE'#013#010+ 'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#013#010+ 'ifeq ($(CPU_TARGET),i386)'#013#010+ - 'FPCCPUOPT:=-OG2p3'#013,#010+ + 'FPCCPUOPT:=-','OG2p3'#013#010+ 'endif'#013#010+ 'ifeq ($(CPU_TARGET),powerpc)'#013#010+ 'FPCCPUOPT:=-O1r'#013#010+ @@ -1326,8 +1325,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=-Xs'#013#010+ 'endif'#013#010+ #013#010+ - '# Optimizer'#013#010+ - 'ifd','ef OPTIMIZE'#013#010+ + '# Optimize','r'#013#010+ + 'ifdef OPTIMIZE'#013#010+ 'override FPCOPT+=-O2'#013#010+ 'endif'#013#010+ #013#010+ @@ -1340,14 +1339,14 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef COMPILER_OPTIONS'#013#010+ 'override FPCOPT+=$(COMPILER_OPTIONS)'#013#010+ 'endif'#013#010+ - 'ifdef COMPIL','ER_UNITDIR'#013#010+ + 'ifdef ','COMPILER_UNITDIR'#013#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#013#010+ 'endif'#013#010+ 'ifdef COMPILER_LIBRARYDIR'#013#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#013#010+ 'endif'#013#010+ 'ifdef COMPILER_OBJECTDIR'#013#010+ - 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJE','CTDIR))'#013#010+ + 'override FPCOPT+=$(addprefix -Fo,$(COMPILE','R_OBJECTDIR))'#013#010+ 'endif'#013#010+ 'ifdef COMPILER_INCLUDEDIR'#013#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#013#010+ @@ -1358,7 +1357,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#013#010+ 'endif'#013#010+ #013#010+ - '# Target dirs and the prefix to use for cl','ean/install'#013#010+ + '# Target dirs and the prefix to use ','for clean/install'#013#010+ 'ifdef COMPILER_TARGETDIR'#013#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#013#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#013#010+ @@ -1368,15 +1367,15 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Unit target dir (default i','s units/-/'#013#010+ + '# Unit target dir (def','ault is units/-/'#013#010+ 'ifdef COMPILER_UNITTARGETDIR'#013#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#013#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#013#010+ 'override UNITTARGETDIRPREFIX='#013#010+ 'else'#013#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#013#010+ - 'endif'#013#010+ - 'else'#013,#010+ + 'endif'#013,#010+ + 'else'#013#010+ 'ifdef COMPILER_TARGETDIR'#013#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#013#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#013#010+ @@ -1387,7 +1386,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=-Cg'#013#010+ #013#010+ 'ifeq ($(CPU_TARGET),i386)'#013#010+ - 'override FPCOPT+=-Aas'#013,#010+ + 'override FPCOPT+','=-Aas'#013#010+ 'endif'#013#010+ #013#010+ 'endif'#013#010+ @@ -1401,7 +1400,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - 'ifdef LINKSHAR','ED'#013#010+ + 'ifdef LI','NKSHARED'#013#010+ '#!!! deactived for testing override FPCOPT+=-XD'#013#010+ 'endif'#013#010+ #013#010+ @@ -1412,8 +1411,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=-Fl$(GCCLIBDIR)'#013#010+ 'endif'#013#010+ 'ifdef OTHERLIBDIR'#013#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#013#010+ - 'endi','f'#013#010+ + 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))',#013#010+ + 'endif'#013#010+ #013#010+ #013#010+ '[command_end]'#013#010+ @@ -1427,7 +1426,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#013#010+ 'endif'#013#010+ #013#010+ - '# Was a',' config file specified ?'#013#010+ + '#',' Was a config file specified ?'#013#010+ 'ifdef CFGFILE'#013#010+ 'override FPCOPT+=@$(CFGFILE)'#013#010+ 'endif'#013#010+ @@ -1439,7 +1438,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'export FPCEXTCMD'#013#010+ 'endif'#013#010+ #013#010+ - 'overrid','e AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#013#010+ + 'o','verride AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#013#010+ 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#013#010+ #013#010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#013#010+ @@ -1450,7 +1449,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=$(CROSSOPT)'#013#010+ 'endif'#013#010+ #013#010+ - '# Compile','r commandline'#013#010+ + '# C','ompiler commandline'#013#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#013#010+ #013#010+ '# also call ppas if with command option -s'#013#010+ @@ -1458,7 +1457,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifeq (,$(findstring -s ,$(COMPILER)))'#013#010+ 'EXECPPAS='#013#010+ 'else'#013#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_T','ARGET))'#013#010+ + 'ifeq ($(FULL_SOURCE),$(','FULL_TARGET))'#013#010+ 'ifdef RUNBATCH'#013#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#013#010+ 'else'#013#010+ @@ -1472,7 +1471,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# Loaders'#013#010+ - '###################################','#################################'+ + '#############################','#######################################'+ '#'#013#010+ #013#010+ '.PHONY: fpc_loaders'#013#010+ @@ -1482,7 +1481,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override CLEANTARGET+=fpc_loaders_clean'#013#010+ 'override INSTALLTARGET+=fpc_loaders_install'#013#010+ #013#010+ - 'override LOADEROFILES:=$(addsu','ffix $(OEXT),$(TARGET_LOADERS))'#013#010+ + 'override LOADEROFILES:=$','(addsuffix $(OEXT),$(TARGET_LOADERS))'#013#010+ 'endif'#013#010+ #013#010+ '%$(OEXT): %$(LOADEREXT)'#013#010+ @@ -1492,7 +1491,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#013#010+ 'endif'#013#010+ #013#010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $','(LOADEROFILES)'#013#010+ + 'fpc_loaders: $(COMPILER_UNITTARGET','DIR) $(LOADEROFILES)'#013#010+ #013#010+ 'fpc_loaders_clean:'#013#010+ 'ifdef COMPILER_UNITTARGETDIR'#013#010+ @@ -1503,7 +1502,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ 'fpc_loaders_install:'#013#010+ - ' $(MKDIR) $(INSTALL_UN','ITDIR)'#013#010+ + ' $(MKDIR) $(INST','ALL_UNITDIR)'#013#010+ 'ifdef COMPILER_UNITTARGETDIR'#013#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#013#010+ @@ -1513,7 +1512,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ #013#010+ '[unitrules]'#013#010+ - '######################','##############################################'+ + '################','####################################################'+ '#'#013#010+ '# Units'#013#010+ '#####################################################################'#013+ @@ -1523,12 +1522,12 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#013#010+ 'override ALLTARGET+=fpc_units'#013#010+ - #013#010+ - 'overri','de UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#013#010+ + #013#010, + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#013#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#013#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#013#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES)',' $(IMPLICITUNITPPUFILES)'#013#010+ + 'override CLEANPPUFILES+=$(UNITPPU','FILES) $(IMPLICITUNITPPUFILES)'#013#010+ 'endif'#013#010+ #013#010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#013#010+ @@ -1538,7 +1537,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# Exes'#013#010+ - '########################################################','############'+ + '##################################################','##################'+ '#'#013#010+ #013#010+ '.PHONY: fpc_exes'#013#010+ @@ -1547,20 +1546,20 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifndef CROSSINSTALL'#013#010+ 'ifneq ($(TARGET_PROGRAMS),)'#013#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#013#010+ - 'override EXEOFILES:=$(addsuffix $(OEXT),','$(TARGET_PROGRAMS)) $(addpre'+ + 'override EXEOFILES:=$(addsuffix $(','OEXT),$(TARGET_PROGRAMS)) $(addpre'+ 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ 'PROGRAMS)))'#013#010+ #013#010+ 'override ALLTARGET+=fpc_exes'#013#010+ - 'override INSTALLEXEFILES+=$','(EXEFILES)'#013#010+ + 'override INSTALLEXEFI','LES+=$(EXEFILES)'#013#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#013#010+ 'ifeq ($(OS_TARGET),os2)'#013#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#013+ #010+ 'endif'#013#010+ 'ifeq ($(OS_TARGET),emx)'#013#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARG','ET_PROGRAMS))'#013+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),','$(TARGET_PROGRAMS))'#013+ #010+ 'endif'#013#010+ 'endif'#013#010+ @@ -1574,7 +1573,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# Resource strings'#013#010+ - '########################','############################################'+ + '##################','##################################################'+ '#'#013#010+ #013#010+ 'ifdef TARGET_RSTS'#013#010+ @@ -1585,7 +1584,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ #013#010+ '[examplerules]'#013#010+ - '#################################################','###################'+ + '###########################################','#########################'+ '#'#013#010+ '# Examples'#013#010+ '#####################################################################'#013+ @@ -1595,17 +1594,17 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'ifneq ($(TARGET_EXAMPLES),)'#013#010+ 'HASEXAMPLES=1'#013#010+ - 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_','EXA'+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(T','ARGET_EXA'+ 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#013#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#013#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARG','ET_EXAMPLES)) $(ad'+ + 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),','$(TARGET_EXAMPLES)) $(ad'+ 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'GET_EXAMPLES)))'#013#010+ #013#010+ - 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#013#010+ - 'ifeq ','($(OS_TARGET),os2)'#013#010+ + 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#013,#010+ + 'ifeq ($(OS_TARGET),os2)'#013#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#013+ #010+ 'endif'#013#010+ @@ -1614,8 +1613,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ 'endif'#013#010+ 'endif'#013#010+ - 'ifneq ($(TARGET_EXAMPLEDIRS),)'#013#010+ - 'HASEXA','MPLES=1'#013#010+ + 'ifneq ($(TARGET_EXAMPLEDIRS),)'#013#010, + 'HASEXAMPLES=1'#013#010+ 'endif'#013#010+ #013#010+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ @@ -1626,7 +1625,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# General compile rules'#013#010+ - '###############################','#####################################'+ + '#########################','###########################################'+ '#'#013#010+ #013#010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#013#010+ @@ -1637,7 +1636,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'fpc_all: $(FPCMADE)'#013#010+ #013#010+ 'fpc_smart:'#013#010+ - ' $','(MAKE) all LINKSMART=1 CREATESMART=1'#013#010+ + ' ',' $(MAKE) all LINKSMART=1 CREATESMART=1'#013#010+ #013#010+ 'fpc_debug:'#013#010+ ' $(MAKE) all DEBUG=1'#013#010+ @@ -1648,7 +1647,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '# General compile rules, available for both possible .pp and .pas exte'+ 'nsions'#013#010+ #013#010+ - '.SUFFIXES: $(EXEEXT) $(PPUEXT)',' $(OEXT) .pas .lpr .dpr .pp .rc .res'#013+ + '.SUFFIXES: $(EXEEXT) $(P','PUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#013+ #010+ #013#010+ '$(COMPILER_UNITTARGETDIR):'#013#010+ @@ -1659,7 +1658,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '%$(PPUEXT): %.pp'#013#010+ ' $(COMPILER) $<'#013#010+ - ' $(','EXECPPAS)'#013#010+ + ' ',' $(EXECPPAS)'#013#010+ #013#010+ '%$(PPUEXT): %.pas'#013#010+ ' $(COMPILER) $<'#013#010+ @@ -1674,7 +1673,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(EXECPPAS)'#013#010+ #013#010+ '%$(EXEEXT): %.lpr'#013#010+ - ' $(C','OMPILER) $<'#013#010+ + ' ',' $(COMPILER) $<'#013#010+ ' $(EXECPPAS)'#013#010+ #013#010+ '%$(EXEEXT): %.dpr'#013#010+ @@ -1685,22 +1684,22 @@ const fpcmakeini : array[0..225,1..240] of char=( ' windres -i $< -o $@'#013#010+ #013#010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#013#010+ - 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_IN','CLUDEDIR)'#013#010+ + 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPI','LER_INCLUDEDIR)'#013#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#013#010+ - 'vpath %$(OEXT) $(CO','MPILER_UNITTARGETDIR)'#013#010+ + 'vpath %$(OEXT',') $(COMPILER_UNITTARGETDIR)'#013#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#013#010+ #013#010+ '[sharedrules]'#013#010+ '#####################################################################'#013+ #010+ '# Library'#013#010+ - '#####################################################################'#013+ - #010+ + '####################################################################','#'+ #013#010+ - '.','PHONY: fpc_shared'#013#010+ + #013#010+ + '.PHONY: fpc_shared'#013#010+ #013#010+ 'override INSTALLTARGET+=fpc_shared_install'#013#010+ #013#010+ @@ -1713,14 +1712,14 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ 'ifndef SHARED_FULLNAME'#013#010+ - 'SHARED_FULLNAME=','$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERS'+ + 'SHARED_FUL','LNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERS'+ 'ION)$(SHAREDLIBEXT)'#013#010+ 'endif'#013#010+ #013#010+ '# Default sharedlib units are all unit objects'#013#010+ 'ifndef SHARED_LIBUNITS'#013#010+ 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#013#010+ - 'override SHARED_LIBUNITS:=$(','filter-out $(INSTALL_BUILDUNIT),$(SHARED'+ + 'override SHARED_LIBUNI','TS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED'+ '_LIBUNITS))'#013#010+ 'endif'#013#010+ #013#010+ @@ -1728,7 +1727,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef HASSHAREDLIB'#013#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#013#010+ 'ifneq ($(SHARED_BUILD),n)'#013#010+ - ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_U','NITTARGETDIR)'+ + ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMP','ILER_UNITTARGETDIR)'+ ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#013#010+ 'endif'#013#010+ 'else'#013#010+ @@ -1738,7 +1737,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'fpc_shared_install:'#013#010+ 'ifneq ($(SHARED_BUILD),n)'#013#010+ 'ifneq ($(SHARED_LIBUNITS),)'#013#010+ - 'ifneq ($(wildcard $(COMPILER','_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#013+ + 'ifneq ($(wildcard $(CO','MPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#013+ #010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ 'ALL_SHAREDDIR)'#013#010+ @@ -1747,9 +1746,9 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '[installrules]'#013#010+ - '#####################################################################'#013+ + '#####################################################################'#013, #010+ - '# Ins','tall rules'#013#010+ + '# Install rules'#013#010+ '#####################################################################'#013+ #010+ #013#010+ @@ -1757,7 +1756,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'ifdef INSTALL_UNITS'#013#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#013#010+ - 'endif'#013#010, + 'e','ndif'#013#010+ #013#010+ 'ifdef INSTALL_BUILDUNIT'#013#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ @@ -1766,18 +1765,18 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'ifdef INSTALLPPUFILES'#013#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(S','TATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'LES)) $(addpref','ix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#013#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#013#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGE','TDIRPREFIX),$(notdi'+ + 'override INSTALLPPUFILES:=$(addprefix $(UNI','TTARGETDIRPREFIX),$(notdi'+ 'r $(INSTALLPPUFILES)))'#013#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#013#010+ 'endif'#013#010+ '# Implicitly install Package.fpc'#013#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#013#010+ - 'endif'#013#010, + 'e','ndif'#013#010+ #013#010+ 'ifdef INSTALLEXEFILES'#013#010+ 'ifneq ($(TARGETDIRPREFIX),)'#013#010+ @@ -1788,7 +1787,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'fpc_install: all $(INSTALLTARGET)'#013#010+ 'ifdef INSTALLEXEFILES'#013#010+ - ' $(MKDIR) $(INSTA','LL_BINDIR)'#013#010+ + ' $(MKDIR) $','(INSTALL_BINDIR)'#013#010+ '# Compress the exes if upx is defined'#013#010+ 'ifdef UPXPROG'#013#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#013#010+ @@ -1797,13 +1796,13 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#013#010+ 'ifdef FPCMAKE'#013#010+ - '# If the fpcp','ackage variable is set then create and install Package.'+ + '# If th','e fpcpackage variable is set then create and install Package.'+ 'fpc,'#013#010+ '# a safety check is done if Makefile.fpc is available'#013#010+ 'ifdef PACKAGE_VERSION'#013#010+ 'ifneq ($(wildcard Makefile.fpc),)'#013#010+ - ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#013#010+ - ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#013#010+ + ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.','fpc'#013#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#013#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#013#010+ 'endif'#013#010+ 'endif'#013#010+ @@ -1812,14 +1811,14 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifdef INSTALLPPUFILES'#013#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#013#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#013#010+ - 'ifneq (','$(INSTALLPPULINKFILES),)'#013#010+ + 'i','fneq ($(INSTALLPPULINKFILES),)'#013#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#013#010+ 'endif'#013#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#013#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#013#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#013#010+ - 'ifdef inUnix'#013#010+ - ' ',' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#013#010+ + 'ifdef inUni','x'#013#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#013#010+ 'endif'#013#010+ 'endif'#013#010+ 'endif'#013#010+ @@ -1829,14 +1828,14 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ 'fpc_sourceinstall: distclean'#013#010+ - ' ',' $(MKDIR) $(INSTALL_SOURCEDIR)'#013#010+ + ' ',' $(MKDIR) $(INSTALL_SOURCEDIR)'#013#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#013#010+ #013#010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#013#010+ 'ifdef HASEXAMPLES'#013#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#013#010+ 'endif'#013#010+ - 'ifdef EXAMPLESOURC','EFILES'#013#010+ + 'ifdef EXAMPL','ESOURCEFILES'#013#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#013#010+ 'endif'#013#010+ 'ifdef TARGET_EXAMPLEDIRS'#013#010+ @@ -1845,7 +1844,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '[distinstallrules]'#013#010+ - '############################','########################################'+ + '######################','##############################################'+ '#'#013#010+ '# Dist Install'#013#010+ '#####################################################################'#013+ @@ -1857,7 +1856,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ #013#010+ '[zipinstallrules]'#013#010+ - '#################','###################################################'+ + '###########','#########################################################'+ '#'#013#010+ '# Zip'#013#010+ '#####################################################################'#013+ @@ -1865,7 +1864,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#013#010+ #013#010+ - '# Temporary path to pack a file, can ','only use a single deep'#013#010+ + '# Temporary path to pack a file',', can only use a single deep'#013#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#013+ #010+ 'ifndef PACKDIR'#013#010+ @@ -1876,7 +1875,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Maybe create default zipname from packag','ename'#013#010+ + '# Maybe create default zipname from ','packagename'#013#010+ 'ifndef ZIPNAME'#013#010+ 'ifdef DIST_ZIPNAME'#013#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#013#010+ @@ -1890,7 +1889,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# ZipTarget'#013#010+ - 'ifndef ZIPTARGET'#013#010, + 'ifndef ZIPTA','RGET'#013#010+ 'ifdef DIST_ZIPTARGET'#013#010+ 'ZIPTARGET=DIST_ZIPTARGET'#013#010+ 'else'#013#010+ @@ -1906,8 +1905,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ '# Use a wrapper script by default for Os/2'#013#010+ - 'ifndef inUnix'#013#010+ - 'USE','ZIPWRAPPER=1'#013#010+ + 'ifndef inUni','x'#013#010+ + 'USEZIPWRAPPER=1'#013#010+ 'endif'#013#010+ #013#010+ '# We need to be able to run in the current OS so fix'#013#010+ @@ -1917,15 +1916,15 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#013+ #010+ 'else'#013#010+ - 'ZIPPATHSEP=/'#013#010+ - 'endif'#013,#010+ + 'ZIPPATHSEP=/'#013#010, + 'endif'#013#010+ #013#010+ '# Create commands to create the zip/tar file'#013#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#013#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#013#010+ 'ifdef USETAR'#013#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#013#010+ - 'ZIPCMD_ZIP:=$','(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#013#010+ + 'ZIPCMD_','ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#013#010+ 'else'#013#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#013#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ @@ -1933,22 +1932,22 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ 'fpc_zipinstall:'#013#010+ - ' $(MAKE) $(ZIPTARGET) INSTA','LL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#013+ + ' $(MAKE) $(ZIPTARGET)',' INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#013+ #010+ ' $(MKDIR) $(DIST_DESTDIR)'#013#010+ ' $(DEL) $(ZIPDESTFILE)'#013#010+ 'ifdef USEZIPWRAPPER'#013#010+ '# Handle gecho separate as we need to espace \ with \\'#013#010+ 'ifneq ($(ECHOREDIR),echo)'#013#010+ - ' $(ECHOREDIR) -e "$(subst \,\','\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ + ' $(ECHOREDIR) -e "$(sub','st \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ 'PER)'#013#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #013#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#013#010+ 'else'#013#010+ - ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#013#010+ - ' ',' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#013#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPE','R)'#013#010+ + ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#013#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#013#010+ 'endif'#013#010+ 'ifdef inUnix'#013#010+ @@ -1958,8 +1957,8 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(RUNBATCH) $(ZIPWRAPPER)'#013#010+ 'else'#013#010+ ' $(ZIPWRAPPER)'#013#010+ + 'endif',#013#010+ 'endif'#013#010+ - 'endi','f'#013#010+ ' $(DEL) $(ZIPWRAPPER)'#013#010+ 'else'#013#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#013#010+ @@ -1968,7 +1967,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'fpc_zipsourceinstall:'#013#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURCES','UFFIX)'#013#010+ + 'S','OURCESUFFIX)'#013#010+ #013#010+ 'fpc_zipexampleinstall:'#013#010+ 'ifdef HASEXAMPLES'#013#010+ @@ -1980,7 +1979,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#013#010+ #013#010+ #013#010+ - '[cleanrules]',#013#010+ + '[clean','rules]'#013#010+ '#####################################################################'#013+ #010+ '# Clean rules'#013#010+ @@ -1990,7 +1989,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#013#010+ #013#010+ 'ifdef EXEFILES'#013#010+ - 'override CLEANE','XEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ + 'override ','CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#013#010+ 'endif'#013#010+ #013#010+ @@ -2000,19 +1999,19 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ #013#010+ 'ifdef CLEAN_UNITS'#013#010+ - 'override CLEANPPUFILES+','=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#013#010+ + 'override CLEANPPU','FILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#013#010+ 'endif'#013#010+ #013#010+ 'ifdef CLEANPPUFILES'#013#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ - 'LEANPPUFILES))) $(addprefix $(','IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ + 'LEANPPUFILES))) $(addpre','fix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#013#010+ 'ifdef DEBUGSYMEXT'#013#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#013#010+ 'endif'#013#010+ - 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CL','EANPP'+ + 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX','),$(CLEANPP'+ 'UFILES))'#013#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'IX),$(CLEANPPULINKFILES)))'#013#010+ @@ -2023,7 +2022,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' -$(DEL) $(CLEANEXEFILES)'#013#010+ 'endif'#013#010+ 'ifdef CLEANPPUFILES'#013#010+ - ' ','-$(DEL) $(CLEANPPUFILES)'#013#010+ + ' ',' -$(DEL) $(CLEANPPUFILES)'#013#010+ 'endif'#013#010+ 'ifneq ($(CLEANPPULINKFILES),)'#013#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#013#010+ @@ -2033,16 +2032,16 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ 'endif'#013#010+ 'ifdef CLEAN_FILES'#013#010+ - ' -$(DEL',') $(CLEAN_FILES)'#013#010+ + ' ','-$(DEL) $(CLEAN_FILES)'#013#010+ 'endif'#013#010+ 'ifdef LIB_NAME'#013#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#013#010+ 'endif'#013#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#013#010+ - ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#013#010+ + ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#013#010, #013#010+ - 'fpc_','cleanall: $(CLEANTARGET)'#013#010+ + 'fpc_cleanall: $(CLEANTARGET)'#013#010+ 'ifdef CLEANEXEFILES'#013#010+ ' -$(DEL) $(CLEANEXEFILES)'#013#010+ 'endif'#013#010+ @@ -2051,7 +2050,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#013#010+ 'endif'#013#010+ 'ifneq ($(CLEANPPULINKFILES),)'#013#010+ - ' -$(DEL) $(CLEANPPULIN','KFILES)'#013#010+ + ' -$(DEL) $(CLEAN','PPULINKFILES)'#013#010+ 'endif'#013#010+ 'ifdef CLEANRSTFILES'#013#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#013+ @@ -2062,14 +2061,14 @@ const fpcmakeini : array[0..225,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#013#010+ 'endif'#013#010+ ' -$(DELTREE) units'#013#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT',') *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ + ' -$(DEL) *$(OEXT) *$(','PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#013#010+ 'ifneq ($(PPUEXT),.ppu)'#013#010+ ' -$(DEL) *.o *.ppu *.a'#013#010+ 'endif'#013#010+ ' -$(DELTREE) *$(SMARTEXT)'#013#010+ - ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ - 'CEXT','FILE) $(REDIRFILE)'#013#010+ + ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(','F'+ + 'PCEXTFILE) $(REDIRFILE)'#013#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#013#010+ 'ifdef AOUTEXT'#013#010+ ' -$(DEL) *$(AOUTEXT)'#013#010+ @@ -2082,7 +2081,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ #013#010+ '[baseinforules]'#013#010+ - '###########################','#########################################'+ + '#####################','###############################################'+ '#'#013#010+ '# Base info rules'#013#010+ '#####################################################################'#013+ @@ -2094,98 +2093,98 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'fpc_baseinfo:'#013#010+ ' @$(ECHO)'#013#010+ - ' @$(','ECHO) == Package info =='#013#010+ + ' ',' @$(ECHO) == Package info =='#013#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#013#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) == Configuration info =='#013#010+ ' @$(ECHO)'#013#010+ - ' @$(ECHO) FPC...','....... $(FPC)'#013#010+ + ' @$(ECHO) ','FPC.......... $(FPC)'#013#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#013#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#013#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#013#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#013#010+ - ' @$(ECHO) Target OS.... $(OS','_TARGET)'#013#010+ + ' @$(ECHO) Target OS...','. $(OS_TARGET)'#013#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#013#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#013#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#013#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#013#010+ - ' @$(ECHO) FPC fpmake... $(FP','CFPMAKE)'#013#010+ + ' @$(ECHO) FPC fpmake..','. $(FPCFPMAKE)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) == Directory info =='#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#013#010+ - ' @$(ECHO) FPCDir.........','. $(FPCDIR)'#013#010+ + ' @$(ECHO) FPCDir...','....... $(FPCDIR)'#013#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#013#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#013#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#013#010+ - ' @$','(ECHO) Other library... $(OTHERLIBDIR)'#013#010+ + ' ',' @$(ECHO) Other library... $(OTHERLIBDIR)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) == Tools info =='#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) As........ $(AS)'#013#010+ ' @$(ECHO) Ld........ $(LD)'#013#010+ ' @$(ECHO) Ar........ $(AR)'#013#010+ - ' @$(ECHO) R','c........ $(RC)'#013#010+ + ' @$(EC','HO) Rc........ $(RC)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Mv........ $(MVPROG)'#013#010+ ' @$(ECHO) Cp........ $(CPPROG)'#013#010+ ' @$(ECHO) Rm........ $(RMPROG)'#013#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#013#010+ - ' @$(ECHO) Echo...... $(ECHO)'#013#010+ - ' ',' @$(ECHO) Shell..... $(SHELL)'#013#010+ + ' @$(ECHO) Echo...... $(ECHO)'#013,#010+ + ' @$(ECHO) Shell..... $(SHELL)'#013#010+ ' @$(ECHO) Date...... $(DATE)'#013#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#013#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#013#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#013#010+ - ' @$(ECHO) Zip....... $(ZIPPROG)'#013#010+ - ' ',' @$(ECHO)'#013#010+ + ' @$(ECHO) Zip....... $(ZIPPROG)',#013#010+ + ' @$(ECHO)'#013#010+ ' @$(ECHO) == Object info =='#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#013#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#013#010+ - ' @$(ECHO) Target Implicit Units. $(TARGET_IMP','LICITUNITS)'#013+ + ' @$(ECHO) Target Implicit Units. $(TARG','ET_IMPLICITUNITS)'#013+ #010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#013#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#013#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#013#010+ - ' @$(ECHO) Target ExampleDirs.... $(TARGE','T_EXAMPLEDIRS)'#013#010+ + ' @$(ECHO) Target ExampleDirs.... $','(TARGET_EXAMPLEDIRS)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#013#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#013#010+ - ' @$(ECHO) Ins','tall Files....... $(INSTALL_FILES)'#013#010+ + ' @$(ECHO',') Install Files....... $(INSTALL_FILES)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) == Install info =='#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#013#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#013#010+ - ' @$(ECHO) ZipPrefi','x............ $(ZIPPREFIX)'#013#010+ + ' @$(ECHO) Zi','pPrefix............ $(ZIPPREFIX)'#013#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#013#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#013#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#013#010+ - ' @$(ECHO) Install FPC Package.. $(I','NSTALL_FPCPACKAGE)'#013#010+ + ' @$(ECHO) Install FPC Package','.. $(INSTALL_FPCPACKAGE)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#013#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#013#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#013#010+ - ' @$(ECHO) Instal','l units dir.... $(INSTALL_UNITDIR)'#013#010+ + ' @$(ECHO) ','Install units dir.... $(INSTALL_UNITDIR)'#013#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#013#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#013#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#013#010+ - ' @$(ECHO) In','stall data dir..... $(INSTALL_DATADIR)'#013#010+ + ' @$(ECH','O) Install data dir..... $(INSTALL_DATADIR)'#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#013#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#013#010+ ' @$(ECHO)'#013#010+ #013#010+ '[inforules]'#013#010+ - '###################################','#################################'+ + '#############################','#######################################'+ '#'#013#010+ '# Info rules'#013#010+ '#####################################################################'#013+ @@ -2196,7 +2195,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'fpc_info: $(INFORULES)'#013#010+ #013#010+ '[makefilerules]'#013#010+ - '######################################################','##############'+ + '################################################','####################'+ '#'#013#010+ '# Rebuild Makefile'#013#010+ '#####################################################################'#013+ @@ -2207,7 +2206,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' fpc_makefile_dirs'#013#010+ #013#010+ 'fpc_makefile:'#013#010+ - ' $(FP','CMAKE) -w -T$(OS_TARGET) Makefile.fpc'#013#010+ + ' ',' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#013#010+ #013#010+ 'fpc_makefile_sub1:'#013#010+ 'ifdef TARGET_DIRS'#013#010+ @@ -2215,7 +2214,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'T_DIRS))'#013#010+ 'endif'#013#010+ 'ifdef TARGET_EXAMPLEDIRS'#013#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffi','x /Makefile.fpc,$(TAR'+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(ad','dsuffix /Makefile.fpc,$(TAR'+ 'GET_EXAMPLEDIRS))'#013#010+ 'endif'#013#010+ #013#010+ @@ -2224,7 +2223,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #013#010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#013#010+ #013#010+ - 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#013,#010+ + 'fpc_makefiles: fpc_makefile fpc_makefile','_dirs'#013#010+ #013#010+ '[localmakefile]'#013#010+ '#####################################################################'#013+ @@ -2234,8 +2233,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #013#010+ 'ifneq ($(wildcard fpcmake.loc),)'#013#010+ - 'include fpcmake.loc'#013#010+ - 'end','if'#013#010+ + 'include fpcmake.lo','c'#013#010+ + 'endif'#013#010+ #013#010+ #013#010+ '[userrules]'#013#010+ @@ -2246,7 +2245,7 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #013#010+ '[lclrules]'#013#010+ - '################################################','####################'+ + '##########################################','##########################'+ '#'#013#010+ '# LCL Rules'#013#010+ '#####################################################################'#013+ @@ -2257,8 +2256,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#013#010+ 'LCL_PLATFORM=win32'#013#010+ 'else'#013#010+ - 'LCL_PLATFORM=gtk'#013#010+ - 'e','ndif'#013#010+ + 'LCL_PLATFORM=','gtk'#013#010+ + 'endif'#013#010+ 'endif'#013#010+ 'export LCL_PLATFORM'#013#010+ #013#010+ @@ -2269,7 +2268,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override LCLDIR=wrong'#013#010+ 'endif'#013#010+ 'else'#013#010+ - 'override LCLDIR=','wrong'#013#010+ + 'override L','CLDIR=wrong'#013#010+ 'endif'#013#010+ #013#010+ '# Check if the default LCLDIR is correct'#013#010+ @@ -2280,7 +2279,7 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Check for develop','ment version'#013#010+ + '# Check for d','evelopment version'#013#010+ 'ifeq ($(LCLDIR),wrong)'#013#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#013#010+ @@ -2289,22 +2288,22 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#013#010+ 'endif'#013#010+ #013#010+ - '# Check',' for release version'#013#010+ + '#',' Check for release version'#013#010+ 'ifeq ($(LCLDIR),wrong)'#013#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#013+ #010+ 'ifeq ($(LCLDIR),)'#013#010+ 'override LCLDIR=wrong'#013#010+ + 'endif'#013#010, 'endif'#013#010+ - 'endif'#013,#010+ #013#010+ '# Generate dirs'#013#010+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ 'IR)/units)'#013#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#013#010+ - 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#013,#010+ + 'export LCLDIR LCLUNITDIR LCLCOMPONE','NTDIR'#013#010+ #013#010+ '# Add LCL dirs to paths'#013#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#013#010+ @@ -2314,7 +2313,7 @@ const fpcmakeini : array[0..225,1..240] of char=( '#####################################################################'#013+ #010+ '# LCL Info rules'#013#010+ - '#############','#######################################################'+ + '#######','#############################################################'+ '#'#013#010+ 'override INFORULES+=lclinfo'#013#010+ #013#010+ @@ -2324,7 +2323,7 @@ const fpcmakeini : array[0..225,1..240] of char=( ' @$(ECHO) == LCL info =='#013#010+ ' @$(ECHO)'#013#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#013#010+ - ' @$(EC','HO) LCLDIR............... $(LCLDIR)'#013#010+ + ' ',' @$(ECHO) LCLDIR............... $(LCLDIR)'#013#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#013#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#013#010+ ' @$(ECHO)'#013#010 diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 47675d3f35..d4ec8e61be 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -272,13 +272,12 @@ ARCH=$(CPU_TARGET) endif endif -ifeq ($(CPU_TARGET),arm) -ifeq ($(OS_TARGET),embedded) +ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(SUBARCH),) # we don't add a default here, people should explicitly add the SUBARCH -$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=arm7 or SUBARCH=cortexm3) must be defined) -endif +$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv7 or SUBARCH=cortexm3) must be defined) endif +override FPCOPT+=-Cp$(SUBARCH) endif # Full name of the target, including CPU and OS. For OSs limited