From 1643fc52106c05039db71882b3762db3240d8069 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 19 Apr 2020 11:22:55 +0000 Subject: [PATCH] + xtensa-embedded: patch by Christo Crause to check and support SUBARCH git-svn-id: trunk@44843 - --- rtl/embedded/Makefile | 8 + rtl/embedded/Makefile.fpc | 2 + utils/fpcm/fpcmake.inc | 803 +++++++++++++++++++------------------- utils/fpcm/fpcmake.ini | 7 + 4 files changed, 421 insertions(+), 399 deletions(-) diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index e8970d720f..beecedf74a 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -498,8 +504,10 @@ endif endif ifeq ($(ARCH),xtensa) CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo +ifeq ($(SUBARCH),lx106) CPU_UNITS=esp8266 CPU_UNITS_DEFINED=1 +endif ifeq ($(CPU_UNITS_DEFINED),) $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNITS_DEFINED=1 if you know what you are doing) endif diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index 0566231c3c..ff89dc336c 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -223,8 +223,10 @@ endif ifeq ($(ARCH),xtensa) CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo +ifeq ($(SUBARCH),lx106) CPU_UNITS=esp8266 CPU_UNITS_DEFINED=1 +endif ifeq ($(CPU_UNITS_DEFINED),) $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNITS_DEFINED=1 if you know what you are doing) endif diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index fd9a76c9d6..7a449ea737 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..246] of string[240]=( +const fpcmakeini : array[0..247] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..246,1..240] of char=( +const fpcmakeini : array[0..247,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -309,11 +309,19 @@ const fpcmakeini : array[0..246,1..240] of char=( 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ + 'ifeq ($(FULL_TARGET),xtensa-embedded)'#010+ + 'ifeq ($(SUBARCH),)'#010+ + '$(error When compiling for xtensa-embedded, a sub-architecture (e.g. S'+ + 'UBARCH=lx106 or SUBARCH=lx6) must ','be defined)'#010+ + 'endif'#010+ + 'override FPCOPT+=-Cp$(SUBARCH)'#010+ + 'endif'#010+ + #010+ '# Full name of the target, including CPU and OS. For OSs limited'#010+ '# to 8.3 we only use the target OS'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ - 'TARGETSUFFIX','=$(OS_TARGET)'#010+ - 'SOURCESUFFIX=$(OS_SOURCE)'#010+ + 'TARGETSUFFIX=$(OS_TARGET)'#010+ + 'SOURCESUF','FIX=$(OS_SOURCE)'#010+ 'else'#010+ 'ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)'#010+ 'TARGETSUFFIX=$(OS_TARGET)'#010+ @@ -324,16 +332,16 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# Cross compile flag'#010+ - 'ifneq ($(FULL_TARGET),$(F','ULL_SOURCE))'#010+ - 'CROSSCOMPILE=1'#010+ + 'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#010+ + 'CROSSCOMPI','LE=1'#010+ 'endif'#010+ #010+ '# Check if the Makefile supports this target, but not'#010+ '# when the make target is to rebuild the makefile'#010+ 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ - 'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),',')'#010+ - '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+ - ' run fpcmake first)'#010+ + 'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+ + '$(error The Makefile ','doesn'#039't support target $(FULL_TARGET), plea'+ + 'se run fpcmake first)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -344,7 +352,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'BSDhier=1'#010+ 'endif'#010+ #010+ - '# Dete','ct Linux, will also use its own directory hierarchy.'#010+ + '# Detect Linux, will also use',' its own directory hierarchy.'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ 'linuxHier=1'#010+ 'endif'#010+ @@ -359,13 +367,13 @@ const fpcmakeini : array[0..246,1..240] of char=( 'export BUILDNATIVE'#010+ 'endif'#010+ #010+ - 'export OS_TA','RGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FU'+ + 'export OS_TARGET OS_SOURCE ARCH CPU','_TARGET CPU_SOURCE FULL_TARGET FU'+ 'LL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+ #010+ '[fpmakefpcdetect]'#010+ '#####################################################################'#010+ '# FPC Binary and Version Detection'#010+ - '###########','#########################################################'+ + '##################################','##################################'+ '#'#010+ '# If FPCFPMAKE is not set and we'#039're cross-compiling, try to find a'+ #010+ @@ -373,37 +381,37 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifndef FPCFPMAKE'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ - '# Search for the (native) ppc compiler which is used to do',' the lates'+ - 't build'#010+ - '# of the native rtl'#010+ + '# Search for the (native) ppc compiler which is used to do the latest '+ + 'build'#010+ + '# of ','the native rtl'#010+ #010+ 'ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDI'+ 'R)))),)'#010+ '# If that compiler is not found, use the common, installed native comp'+ 'iler'#010+ - '# Note that in this case FPCFPMAKE is not export','ed, because it could'+ - ' be that'#010+ + '# Note that in this case FPCFPMAKE is not exported, because it could b'+ + 'e',' that'#010+ '# a more suitable compiler is compiled later on'#010+ '# check if fpc exists'#010+ 'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ 'ifneq ($(FPCPROG),)'#010+ 'FPCPROG:=$(firstword $(FPCPROG))'#010+ - 'FPCFPMAKE:=$(s','hell $(FPCPROG) -PB)'#010+ - '# if a native compiler is not found, fall back to fpc'#010+ + 'FPCFPMAKE:=$(shell $(FPCPROG) -PB)'#010+ + '# ','if a native compiler is not found, fall back to fpc'#010+ 'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)'#010+ 'FPCFPMAKE:=$(firstword $(FPCPROG))'#010+ 'endif'#010+ 'else'#010+ '# fpc binary not found, fallback to ppc386'#010+ - 'override FPCFPMAKE=$(firstword $(s','trip $(wildcard $(addsuffix /ppc38'+ + 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsu','ffix /ppc38'+ '6$(SRCEXEEXT),$(SEARCHPATH)))))'#010+ 'endif'#010+ 'else'#010+ '# Use the ppc compiler. Because the path to the compiler is relative, '+ 'do not'#010+ '# evaluate the variable here, but do that on the fly.'#010+ - 'FPCFPMAKE=$(strip $(wildcard $(a','ddsuffix /compiler/ppc$(SRCEXEEXT),$'+ + 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$','(SRCEXEEXT),$'+ '(FPCDIR))))'#010+ 'FPMAKE_SKIP_CONFIG=-n'#010+ 'export FPCFPMAKE'#010+ @@ -419,7 +427,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[fpcdircheckenv]'#010+ - '############################################','########################'+ + '###################################################################','#'+ '#'#010+ '# FPCDIR Setting'#010+ '#####################################################################'#010+ @@ -427,8 +435,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ - 'ifeq ($(wildcard $(addprefix ','$(FPCDIR)/,rtl)),)'#010+ - 'override FPCDIR=wrong'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ + 'over','ride FPCDIR=wrong'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR=wrong'#010+ @@ -438,8 +446,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ - 'ifeq ($(wildcard $(addprefix $(F','PCDIR)/,rtl)),)'#010+ - 'override FPCDIR=wrong'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ + 'overrid','e FPCDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -450,15 +458,15 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ - 'override FPCDIR=/usr/lib/fpc/$','(FPC_VERSION)'#010+ + 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ - 'else'#010+ + 'els','e'#010+ 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'ife','q ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ + 'ifeq ($(wildcard $(addpref','ix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(BASEDIR)'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR=c:/pp'#010+ @@ -470,7 +478,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Cross binaries dir'#010+ 'ifndef CROSSBINDIR'#010+ - 'CROSSBINDIR:=$(wildcard $(','FPCDIR)/bin/$(TARGETSUFFIX))'#010+ + 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUF','FIX))'#010+ 'endif'#010+ #010+ '# Default binutils prefix for cross compile when the'#010+ @@ -479,9 +487,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifeq ($(OS_SOURCE),darwin)'#010+ 'DARWIN2DARWIN=1'#010+ 'endif'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ - 'ifndef BINUTILSPREFIX'#010+ + 'ifndef BINUTILSPREFI','X'#010+ 'ifndef CROSSBINDIR'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifneq ($(OS_TARGET),msdos)'#010+ @@ -490,8 +498,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+ #010+ '# For Android use standard NDK prefixes'#010+ - 'ifeq ($(OS_TARGET),','android)'#010+ - 'ifeq ($(CPU_TARGET),arm)'#010+ + 'ifeq ($(OS_TARGET),android)'#010+ + 'ifeq ($(CPU_TA','RGET),arm)'#010+ 'BINUTILSPREFIX=arm-linux-androideabi-'#010+ 'else'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ @@ -505,9 +513,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'endif'#010+ 'else'#010+ - 'BINUTILSPREFIX=$(','OS_TARGET)-'#010+ - 'endif'#010+ + 'BINUTILSPREFIX=$(OS_TARGET)-'#010+ 'endif'#010+ + 'endif',#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -515,20 +523,19 @@ const fpcmakeini : array[0..246,1..240] of char=( '# the OS for backwards compatibility'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+ 'ifeq ($(UNITSDIR),)'#010+ - 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(','OS_TARGET))'#010+ + 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ #010+ - '# Packages dir'#010+ + '# Pa','ckages dir'#010+ 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)'#010+ #010+ #010+ '[shelltools]'#010+ '#####################################################################'#010+ '# Shell tools'#010+ - '#####################################################','###############'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '# Echo that can redir (must be able run in the default OS shell)'#010+ + '# Ech','o that can redir (must be able run in the default OS shell)'#010+ 'ifndef ECHOREDIR'#010+ 'ifndef inUnix'#010+ 'ECHOREDIR=echo'#010+ @@ -542,9 +549,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ - '# Copy a whole tre','e'#010+ + '# Copy a whole tree'#010+ 'ifndef COPYTREE'#010+ - 'COPYTREE:=$(CPPROG) -Rfp'#010+ + 'COPYT','REE:=$(CPPROG) -Rfp'#010+ 'endif'#010+ #010+ '# Copy a whole tree'#010+ @@ -562,8 +569,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'DEL:=$(RMPROG) -f'#010+ 'endif'#010+ #010+ - '# Ch','eck deltree program'#010+ - 'ifndef DELTREE'#010+ + '# Check deltree program'#010+ + 'ifn','def DELTREE'#010+ 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ #010+ @@ -579,7 +586,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ - 'INSTALLEX','E:=$(GINSTALL) -c -m 755'#010+ + 'INSTALLEXE:=$(GINSTALL) -c -m 75','5'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -595,7 +602,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[defaultdirs]'#010+ - '################','####################################################'+ + '#######################################','#############################'+ '#'#010+ '# Default Directories'#010+ '#####################################################################'#010+ @@ -605,8 +612,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ #010+ - '# Units dir'#010, - 'ifdef REQUIRE_PACKAGESDIR'#010+ + '# Units dir'#010+ + 'ifdef REQUIRE_PACKAGESD','IR'#010+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ 'endif'#010+ #010+ @@ -614,9 +621,9 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ '# When zipping use the target os default, when normal install then'#010+ '# use the source os as default'#010+ - 'ifdef ZIPINSTALL',#010+ + 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ - 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ + 'ifneq ($(','findstring $(OS_TARGET),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ 'endif'#010+ 'else'#010+ @@ -627,9 +634,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# When install prefix is not set try to use prefix'#010+ - 'ifndef INSTALL_PREFIX'#010, + 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ - 'INSTALL_PREFIX=$(PREFIX)'#010+ + 'INSTALL_PR','EFIX=$(PREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -641,8 +648,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ - 'INSTALL_BASEDIR',':=/$(PACKAGE_NAME)'#010+ - 'endif'#010+ + 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ + 'endi','f'#010+ 'endif'#010+ 'endif'#010+ 'export INSTALL_PREFIX'#010+ @@ -653,8 +660,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'export INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ - '# Where to place the resulting zip f','iles'#010+ - 'ifndef DIST_DESTDIR'#010+ + '# Where to place the resulting zip files'#010+ + 'ifndef DIST_DESTDI','R'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ 'export DIST_DESTDIR'#010+ @@ -664,7 +671,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef PACKAGEDIR_MAIN'#010+ 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ 'else'#010+ - 'COMPILER_UNIT','TARGETDIR=units/$(TARGETSUFFIX)'#010+ + 'COMPILER_UNITTARGETDIR=units/$(TARGE','TSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ 'ifndef COMPILER_TARGETDIR'#010+ @@ -674,18 +681,17 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '#####################################################################'#010+ '# Install Directories'#010+ - '#################################################','###################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '# set the base directory where to install everything'#010+ + '#',' set the base directory where to install everything'#010+ 'ifndef INSTALL_BASEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/','$(PACKAGE_NAME)'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ - 'else'#010+ + 'e','lse'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ 'endif'#010+ 'endif'#010+ @@ -695,17 +701,17 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/','bin'#010+ - '# for FPC packages install the binaries under their target subdir'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ + '# for FPC packages ','install the binaries under their target subdir'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ - 'en','dif'#010+ + 'endif'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ + 'INSTALL_BINDIR',':=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -715,8 +721,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifndef INSTALL_UNITDIR'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'if','def PACKAGE_NAME'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ + 'ifdef PACKAGE_NAME'#010+ + 'INSTAL','L_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -727,10 +733,10 @@ const fpcmakeini : array[0..246,1..240] of char=( 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'endif'#010+ #010+ - '# Where the source files will be stored'#010+ + '# Where the',' source files will be stored'#010+ 'ifndef INSTALL_SOURCEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef BSDhier'#010+ @@ -743,15 +749,15 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'ifdef IN','STALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ - ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010+ + 'INSTALL','_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI'+ + 'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_SOU','RCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFI','X)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+ '-$(PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ @@ -760,7 +766,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ 'CKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_SOURCEDI','R:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/s','ource/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ @@ -774,8 +780,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef BSDhier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ - 'ifde','f linuxHier'#010+ - 'DOCPREFIXDIR=share/doc'#010+ + 'ifdef linuxHier'#010+ + 'DOCPREFIXDI','R=share/doc'#010+ 'else'#010+ 'DOCPREFIXDIR=doc'#010+ 'endif'#010+ @@ -784,8 +790,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACK','AGE_NAME)-$('+ - 'PACKAGE_VERSION)'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ + 'CKAGE_VER','SION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -796,8 +802,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where to install the examples, under linux we use the d','oc dir'#010+ - '# because the copytree command will create a subdir itself'#010+ + '# Where to install the examples, under linux we use the doc dir'#010+ + '# because the co','pytree command will create a subdir itself'#010+ 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -805,9 +811,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef BSDhier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ - 'else'#010, + 'else'#010+ 'ifdef linuxHier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ + 'INSTALL','_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ '$(PACKAGE_NAME)'#010+ @@ -817,8 +823,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'else'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/','$(PACKAGE_NAME)'+ - '-$(PACKAGE_VERSION)'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ + '(PACKA','GE_VERSION)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ @@ -830,8 +836,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ 'endif'#010+ 'endif'#010+ - 'e','lse'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ + 'else'#010+ + 'ifdef INSTALL_FPCPA','CKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ @@ -841,7 +847,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Where the some extra (data)files will be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ - 'IN','STALL_DATADIR=$(INSTALL_BASEDIR)'#010+ + 'INSTALL_DATADIR=$(INSTALL','_BASEDIR)'#010+ 'endif'#010+ #010+ 'ifndef INSTALL_SHAREDDIR'#010+ @@ -850,15 +856,15 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '#####################################################################'#010+ '# Cross compile dirs'#010+ - '#####################################','###############################'+ + '############################################################','########'+ '#'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ '# Directory where the cross compile tools are stored.'#010+ '# First check if they are available in FPCDIR. If no targets/ subdir'#010+ '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ - 'ifndef CR','OSSBINDIR'#010+ - 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ + 'ifndef CROSSBINDIR'#010+ + 'CROSSBINDIR:=','$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ '(FULL_SOURCE))'#010+ @@ -870,7 +876,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[dirlibc]'#010+ - '# On linux,',' try to find where libgcc.a is.'#010+ + '# On linux, try to find where libg','cc.a is.'#010+ 'ifeq ($(OS_SOURCE),linux)'#010+ #010+ '# Amd64 to i386?'#010+ @@ -878,9 +884,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-lib','gcc-file-name`)'#010+ - 'endif'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'endif'#010+ + 'e','ndif'#010+ 'endif'#010+ 'ifeq ($(CPU_TARGET),powerpc64)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ @@ -891,7 +897,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Try cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ - 'CROSSGCC=$(strip $(wildcard $(adds','uffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ + 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX',')gcc$(SRCEX'+ 'EEXT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ @@ -900,7 +906,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Other libraries from ld.so.conf'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "','^\#" /etc/ld.so.conf | awk '#039'{ ORS='+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | ','awk '#039'{ ORS='+ '" "; print $1 }'#039')'#010+ 'endif'#010+ 'endif'#010+ @@ -914,9 +920,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '########################################################','############'+ - '#'#010+ - '# Default extensions'#010+ + '#####################################################################'#010+ + '# Default',' extensions'#010+ '#####################################################################'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ @@ -927,9 +932,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ 'LTOEXT=.bc'#010+ - 'ASMEXT=.','s'#010+ + 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ - 'STATICLIBEXT=.a'#010+ + 'STATICLI','BEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ 'SHAREDLIBPREFIX=libfp'#010+ 'STATICLIBPREFIX=libp'#010+ @@ -937,10 +942,10 @@ const fpcmakeini : array[0..246,1..240] of char=( 'RSTEXT=.rst'#010+ '# external debug info for executable'#010+ 'EXEDBGEXT=.dbg'#010+ - '#DEBUGSYMEXT #for debugger symbol files, define only for targe','ts whi'+ - 'ch has this'#010+ + '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ + ' has this'#010+ #010+ - '# Go32v1'#010+ + '# Go','32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=v1'#010+ @@ -955,10 +960,10 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# watcom'#010+ 'ifeq ($(OS_TARGET),watcom)'#010+ - 'STATICLIBPREFIX='#010, + 'STATICLIBPREFIX='#010+ 'OEXT=.obj'#010+ 'ASMEXT=.asm'#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'S','HAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=wat'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ @@ -974,8 +979,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# Linux'#010+ - 'ifeq ($(OS_TARGE','T),linux)'#010+ - 'BATCHEXT=.sh'#010+ + 'ifeq ($(OS_TARGET),linux)'#010+ + 'BATCHEXT=.sh'#010, 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=lnx'#010+ @@ -993,8 +998,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifeq ($(OS_TARGET),freebsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHARE','DLIB=1'#010+ - 'SHORTSUFFIX=fbs'#010+ + 'HASSHAREDLIB=1'#010+ + 'SHORTSUFFIX=fbs'#010, 'endif'#010+ #010+ '# NetBSD'#010+ @@ -1014,8 +1019,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# Win32'#010+ - 'ifeq ($(OS','_TARGET),win32)'#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ + 'SHAREDL','IBEXT=.dll'#010+ 'SHORTSUFFIX=w32'#010+ 'endif'#010+ #010+ @@ -1032,9 +1037,9 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# EMX'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'BATCHEXT=.','cmd'#010+ + 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ - 'STATICLIBPREFIX='#010+ + 'STATIC','LIBPREFIX='#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=emx'#010+ 'ECHO=echo'#010+ @@ -1051,8 +1056,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# AROS'#010+ 'ifeq ($(OS_TARGET),aros)'#010+ 'EXEEXT='#010+ - 'SHAREDLIBEX','T=.library'#010+ - 'SHORTSUFFIX=aros'#010+ + 'SHAREDLIBEXT=.library'#010+ + 'SHORTSUFFIX=','aros'#010+ 'endif'#010+ #010+ '# MorphOS'#010+ @@ -1070,9 +1075,9 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# BeOS'#010+ 'ifeq ($(OS_TARGET),beos)'#010+ - 'BATCHEXT=.sh'#010, + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SHORTSUFFIX=be'#010+ + 'SHORTSUFFIX=be'#010, 'endif'#010+ #010+ '# Haiku'#010+ @@ -1092,9 +1097,9 @@ const fpcmakeini : array[0..246,1..240] of char=( '# QNX'#010+ 'ifeq ($(OS_TARGET),qnx)'#010+ 'BATCHEXT=.sh'#010+ - 'EXEEXT=',#010+ + 'EXEEXT='#010+ 'SHORTSUFFIX=qnx'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# Netware clib'#010+ 'ifeq ($(OS_TARGET),netware)'#010+ @@ -1109,11 +1114,11 @@ const fpcmakeini : array[0..246,1..240] of char=( 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=nwl'#010+ - 'IMPORTLIBPREF','IX=imp'#010+ + 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ #010+ '# MacOS'#010+ - 'ifeq ($(OS_TARGET),macos)'#010+ + 'i','feq ($(OS_TARGET),macos)'#010+ 'BATCHEXT='#010+ 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ @@ -1126,9 +1131,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=dw','n'#010+ + 'SHORTSUFFIX=dwn'#010+ 'EXEDBGEXT=.dSYM'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# gba'#010+ 'ifeq ($(OS_TARGET),gba)'#010+ @@ -1145,8 +1150,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# NativeNT'#010+ 'ifeq ($(OS_TARGET),NativeNT)'#010+ - 'SHAREDL','IBEXT=.dll'#010+ - 'SHORTSUFFIX=nativent'#010+ + 'SHAREDLIBEXT=.dll'#010+ + 'SHORTSUFFIX=','nativent'#010+ 'endif'#010+ #010+ '# wii'#010+ @@ -1165,9 +1170,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# Java'#010+ - 'ifeq ($(OS_TARGET),jav','a)'#010+ + 'ifeq ($(OS_TARGET),java)'#010+ 'OEXT=.class'#010+ - 'ASMEXT=.j'#010+ + 'ASMEXT=.','j'#010+ 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=java'#010+ 'endif'#010+ @@ -1183,9 +1188,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# MS-DOS'#010+ - 'ifeq ($(OS_TARGET),msdo','s)'#010+ + 'ifeq ($(OS_TARGET),msdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBEXT=.a'#010+ + 'STA','TICLIBEXT=.a'#010+ 'SHORTSUFFIX=d16'#010+ 'endif'#010+ #010+ @@ -1202,8 +1207,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Win16'#010+ 'ifeq ($(OS_TARGET),win16)'#010+ - 'S','TATICLIBPREFIX='#010+ - 'STATICLIBEXT=.a'#010+ + 'STATICLIBPREFIX='#010+ + 'STATICL','IBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w16'#010+ 'endif'#010+ @@ -1212,8 +1217,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# For 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+ + 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ + 'ZIPSUFFIX=$(SHORTSUFFI','X)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ @@ -1223,9 +1228,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ - 'ZIPCROSSPREFIX=$(TARGET','SUFFIX)-'#010+ + 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ 'else'#010+ - 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ + 'ZIPSUFFIX','=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'endif'#010+ 'endif'#010+ @@ -1233,10 +1238,9 @@ const fpcmakeini : array[0..246,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '#####################################################################', + '#####################################################################'#010+ #010+ - #010+ - '# Names of the binutils tools'#010+ + '# Names of the binuti','ls tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ @@ -1245,8 +1249,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# assembler, redefine it if cross compiling'#010+ 'ifndef ASPROG'#010+ - 'ifdef CROS','SBINDIR'#010+ - 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ + 'ifdef CROSSBINDIR'#010+ + 'ASPROG=$(CROSSB','INDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ @@ -1261,8 +1265,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Resource',' compiler'#010+ - 'ifndef RCPROG'#010+ + '# Resource compiler'#010+ + 'ifndef RCPROG',#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1277,9 +1281,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'else'#010+ 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ - '# NASM assembler, redefine it if cross compiling'#010+ + '# NASM assembler, re','define it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+ @@ -1292,9 +1296,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'AS=$(ASPROG)'#010+ 'LD=$(LDPROG)'#010+ 'RC=$(RCPROG)'#010+ - 'AR=$(ARP','ROG)'#010+ + 'AR=$(ARPROG)'#010+ 'NASM=$(NASMPROG)'#010+ - #010+ + #010, '# ppas.bat / ppas.sh'#010+ 'ifdef inUnix'#010+ 'PPAS=./ppas$(SRCBATCHEXT)'#010+ @@ -1310,9 +1314,9 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=$(shell $(DATE) ','+%Y%m%d)'#010+ + 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ - 'DATESTR='#010+ + 'DATESTR='#010, 'endif'#010+ #010+ '# Zip options'#010+ @@ -1330,16 +1334,15 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '##########################################################','##########'+ - '#'#010+ - '# Compiler Command Line'#010+ + '#####################################################################'#010+ + '# Compiler ','Command Line'#010+ '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ - 'override F','PCOPTDEF=$(ARCH)'#010+ - 'endif'#010+ + 'override FPCOPTDEF=$(ARCH)'#010+ + 'endif'#010, #010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ @@ -1351,17 +1354,17 @@ const fpcmakeini : array[0..246,1..240] of char=( 'override FPCOPT+=-P$(ARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(OS','_SOURCE),openbsd)'#010+ - 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'ifeq ($(OS_SOURCE),openbsd)'#010+ + 'overr','ide FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-XP$(BINUTIL','SPREFIX)'#010+ + 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ - 'ifneq ($(BINUTILSPREFIX),)'#010+ + 'ifneq ($','(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ 'endif'#010+ @@ -1370,8 +1373,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# it while compiling the fpmake file. (For example to build i386-freeb'+ 'sd'#010+ - '# with B','INUTILSPREFIX=i386-)'#010+ - 'ifndef CROSSCOMPILE'#010+ + '# with BINUTILSPREFIX=i386-)'#010+ + 'if','ndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ 'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ @@ -1379,8 +1382,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# User dirs should be first, so they are looked at first'#010+ - 'ifdef UNITDI','R'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ + 'ifdef UNITDIR'#010+ + 'override FPCOPT+=$(ad','dprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ @@ -1390,10 +1393,10 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ '# Smartlinking'#010+ - 'ifdef LINKSMART'#010+ + 'ifdef',' LINKSMART'#010+ 'override FPCOPT+=-XX'#010+ 'endif'#010+ #010+ @@ -1409,7 +1412,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# Release mode'#010+ - '# (strip, optimize ','and don'#039't load fpc.cfg)'#010+ + '# (strip, optimize and don'#039't load fpc.cfg)',#010+ 'ifdef RELEASE'#010+ 'FPCCPUOPT:=-O2'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ @@ -1426,7 +1429,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'override FPCOPT+=-O2'#010+ 'endif'#010+ #010+ - '# Verbos','e settings (warning,note,info)'#010+ + '# Verbose settings (warning,not','e,info)'#010+ 'ifdef VERBOSE'#010+ 'override FPCOPT+=-vwni'#010+ 'endif'#010+ @@ -1436,16 +1439,16 @@ const fpcmakeini : array[0..246,1..240] of char=( 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDI','R))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_LIBRARYDIR'#010+ + 'ifdef COMPILE','R_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix',' -Fi,$(COMPILER_INCLUDEDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDE','DIR))'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ @@ -1455,8 +1458,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #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 FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ + 'ifeq ($(COMPILER_TARGET','DIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ @@ -1465,8 +1468,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCOPT+=-FU$(COMPILER_UNITTARGE','TDIR)'#010+ - 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ + 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ + 'ifeq ($(COMPILER_','UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ @@ -1474,7 +1477,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGE','TDIRPREFIX=$(TARGETDIRPREFIX)'#010+ + 'override UNITTARGETDIRPREFIX=$(TARGETDIRP','REFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1485,8 +1488,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# create always pic'#039'ed code on x86_64, mips and mipsel'#010+ '# on unix-like systems'#010+ 'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+ - 'x ','solaris),)'#010+ - 'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+ + 'x solaris),)'#010+ + 'ifneq ($(fin','dstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ @@ -1499,7 +1502,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ - 'overrid','e FPCOPT+=-Fl$(GCCLIBDIR)'#010+ + 'override FPCOPT+=-Fl$(GCCLIBDI','R)'#010+ 'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ @@ -1510,18 +1513,18 @@ const fpcmakeini : array[0..246,1..240] of char=( '[command_end]'#010+ '# Add commandline options last so they can override'#010+ 'ifdef OPT'#010+ - 'override FPCOPT+=$(O','PT)'#010+ + 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Override options to compile the fpmake-binary with command-line opti'+ - 'ons provided in FPMAKEBUILDOPT'#010+ + '# Override o','ptions to compile the fpmake-binary with command-line op'+ + 'tions provided in FPMAKEBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ - 'ifdef FPCOPTDEF'#010, - 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ + 'ifdef FPCOPTDEF'#010+ + 'override FPCOPT+=$(addp','refix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ @@ -1532,8 +1535,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ - 'override FP','COPT:=!FPCEXTCMD'#010+ - 'export FPCEXTCMD'#010+ + 'override FPCOPT:=!FPCEXTCMD'#010+ + 'export',' FPCEXTCMD'#010+ 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ @@ -1544,8 +1547,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'ifdef ACROSSCOMPILE'#010+ - 'override',' FPCOPT+=$(CROSSOPT)'#010+ - 'endif'#010+ + 'override FPCOPT+=$(CROSSOPT)'#010+ + 'en','dif'#010+ #010+ '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ @@ -1553,8 +1556,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ '# or if -sh is used'#010+ - 'ifneq (,$(findstring -sh',' ,$(COMPILER)))'#010+ - 'UseEXECPPAS=1'#010+ + 'ifneq (,$(findstring -sh ,$(COMPILER)))'#010+ + 'UseEXEC','PPAS=1'#010+ 'endif'#010+ 'ifneq (,$(findstring -s ,$(COMPILER)))'#010+ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ @@ -1567,12 +1570,12 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef RUNBATCH'#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ 'else'#010+ - 'EXECPPAS:=@','$(PPAS)'#010+ + 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ 'endif'#010+ #010+ #010+ - '[loaderrules]'#010+ + '[','loaderrules]'#010+ '#####################################################################'#010+ '# Loaders'#010+ '#####################################################################'#010+ @@ -1580,7 +1583,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '.PHONY: fpc_loaders'#010+ #010+ 'ifneq ($(TARGET_LOADERS),)'#010+ - 'overr','ide ALLTARGET+=fpc_loaders'#010+ + 'override ALLTARGET+=fpc_load','ers'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ @@ -1589,7 +1592,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '%$(OEXT): %$(LOADEREXT)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' ',' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ + ' $(AS) -o $(COMPILER_U','NITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ @@ -1598,7 +1601,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' -$(DEL) $(addprefix $(COMPILER_UNITT','ARGETDIR)/,$(LOADEROFILE'+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL','E'+ 'S))'#010+ 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ @@ -1608,9 +1611,9 @@ const fpcmakeini : array[0..246,1..240] of char=( ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ - 'ES)) $(INSTA','LL_UNITDIR)'#010+ + 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ - ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + ' ',' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -1618,16 +1621,16 @@ const fpcmakeini : array[0..246,1..240] of char=( '#####################################################################'#010+ '# Units'#010+ '#####################################################################'#010+ - #010, + #010+ '.PHONY: fpc_units'#010+ #010+ - 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ + 'ifne','q ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ - 'over','ride INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override INSTALLPPUFILES+=$','(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ @@ -1635,7 +1638,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[exerules]'#010+ - '#########################################','###########################'+ + '################################################################','####'+ '#'#010+ '# Exes'#010+ '#####################################################################'#010+ @@ -1645,36 +1648,36 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Programs are not needed for a cross installation'#010+ 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ - 'override EXEFILE','S=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT)',',$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+ 'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuf'+ - 'fix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(I','MPORTLIBPREF'+ - 'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ + 'fix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX'+ + '),$(addsu','ffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILES+=$(EXEFILES) $(EX','EOFILES)'#010+ - 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ + 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override CLEAN','EXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ + 'fpc_e','xes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+ + ')'#010+ #010+ #010+ '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ - '##################################################','##################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - 'ifdef TARGET_RSTS'#010+ + 'if','def TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ @@ -1684,7 +1687,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '####','################################################################'+ + '###########################','#########################################'+ '#'#010+ #010+ '.PHONY: fpc_examples'#010+ @@ -1692,23 +1695,23 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+ - 'ES)) $(addsuffix .pas,$(TARGET_EXAMPLES',')) $(addsuffix .lpr,$(TARGET_'+ + 'ES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(T','ARGET_'+ 'EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(adds'+ - 'uffix $(LTOEXT),$(TARGET_EX','AMPLES)) $(addprefix $(STATICLIBPREFIX),$'+ + 'uffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(','STATICLIBPREFIX),$'+ '(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+ 'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ - #010, #010+ - 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + #010+ + 'override 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 CLEANE','XEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(','AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ @@ -1720,7 +1723,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[compilerules]'#010+ - '#################################','###################################'+ + '########################################################','############'+ '#'#010+ '# General compile rules'#010+ '#####################################################################'#010+ @@ -1728,7 +1731,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ - ' ',' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ + ' @$(ECHOREDIR) Compi','led > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ #010+ @@ -1741,7 +1744,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rules, available f','or both possible .pp and .pas ex'+ + '# General compile rules, available for both possible .pp an','d .pas ex'+ 'tensions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+ @@ -1751,9 +1754,9 @@ const fpcmakeini : array[0..246,1..240] of char=( ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ - ' $(MKDIRTREE) $','(COMPILER_TARGETDIR)'#010+ + ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ #010+ - '%$(PPUEXT): %.pp'#010+ + '%','$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1766,8 +1769,8 @@ const fpcmakeini : array[0..246,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ - ' $(COMPIL','ER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(COMPILER) $<'#010+ + ' $(EXECPP','AS)'#010+ #010+ '%$(EXEEXT): %.lpr'#010+ ' $(COMPILER) $<'#010+ @@ -1780,20 +1783,21 @@ const fpcmakeini : array[0..246,1..240] of char=( '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ - '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010, - 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ + 'vpath %.pp $(COMPILER_S','OURCEDIR) $(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 %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ + 'v','path %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ - '# Libr','ary'#010+ - '#####################################################################'#010+ + '# Library'#010+ + '###################','#################################################'+ + '#'#010+ #010+ '.PHONY: fpc_shared'#010+ #010+ @@ -1804,8 +1808,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'ifndef SHARED_LIBNAME'#010+ - 'SHARED_LIBNAME','=$(PACKAGE_NAME)'#010+ - 'endif'#010+ + 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ + 'endif'#010, #010+ 'ifndef SHARED_FULLNAME'#010+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ @@ -1814,7 +1818,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ - 'SHARED_LIBUNITS:=$(TARGET_UN','ITS) $(TARGET_IMPLICITUNITS)'#010+ + 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITU','NITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ 'endif'#010+ @@ -1823,7 +1827,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef HASSHAREDLIB'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ - ' ',' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ + ' $(PPUMOVE) -q $(SHAR','ED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'else'#010+ @@ -1831,8 +1835,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'fpc_shared_install:'#010+ - 'ifneq ($(SHARED_BUILD','),n)'#010+ - 'ifneq ($(SHARED_LIBUNITS),)'#010+ + 'ifneq ($(SHARED_BUILD),n)'#010+ + 'ifneq ($(SHARED_LI','BUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ 'ALL_SHAREDDIR)'#010+ @@ -1841,7 +1845,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '[installrules]'#010+ - '######################','##############################################'+ + '#############################################','#######################'+ '#'#010+ '# Install rules'#010+ '#####################################################################'#010+ @@ -1849,7 +1853,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$','(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(','INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ @@ -1858,29 +1862,29 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - '# Avoid getting the same name twice as some install ','EXE fail'#010+ - '# in this case, happends for instance for OS/2 target'#010+ + '# Avoid getting the same name twice as some install EXE fail'#010+ + '# in this case',', happends for instance for OS/2 target'#010+ 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+ 'IBEXT))'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(subst $(PPUEXT),$(LTO','EXT),$(INSTALLPPUFILES)) $(addprefix $('+ + 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)',') $(addprefix $('+ 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ 'NSTALLPPUFILES)))'#010+ 'else'#010+ - 'override INSTALLPPULINKFILES:=$(subst ','$(PPUEXT),$(OEXT),$(INSTALLPPU'+ + 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INS','TALLPPU'+ 'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+ 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ')'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTALLPPUFILENAMES:','=$(notdir $(INSTALLPPUFILES))'#010+ + 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUF','ILES))'#010+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+ 'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+ 'PUFILENAMES))'#010+ - 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITT','ARGETDIRP'+ - 'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+ + 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+ + 'FIX),$(INSTA','LLPPULINKFILENAMES)))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ @@ -1888,8 +1892,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notd','ir $('+ - 'INSTALLEXEFILES)))'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ + 'STALLEXEFILES)))',#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1900,13 +1904,13 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ - '# ','If the fpcpackage variable is set then create and install Package.'+ + '# If the fpcpackage varia','ble is set then create and install Package.'+ 'fpc,'#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+ + ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ + ' $(MKDIR) $','(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ @@ -1915,14 +1919,14 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'ifneq ($(I','NSTALLPPULINKFILES),)'#010+ - ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010+ + ' ',' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -s','f $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_FULLNAME) $(INS','TALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1932,16 +1936,16 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ - ' $(MKDIR) $(INSTALL_','SOURCEDIR)'#010+ - ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ + ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ + ' $(CO','PYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ 'ARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef EXAMPLESOURCEFI','LES'#010+ - ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + 'ifdef EXAMPLESOURCEFILES'#010+ + ' $(COPY) $(E','XAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ @@ -1949,7 +1953,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '[distinstallrules]'#010+ - '#######################################','#############################'+ + '##############################################################','######'+ '#'#010+ '# Dist Install'#010+ '#####################################################################'#010+ @@ -1960,7 +1964,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ #010+ '[zipinstallrules]'#010+ - '######################################','##############################'+ + '#############################################################','#######'+ '#'#010+ '# Zip'#010+ '#####################################################################'#010+ @@ -1968,7 +1972,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ - '# su','bdir, because the deltree can'#039't see the whole tree to remove'+ + '# subdir, because the deltr','ee can'#039't see the whole tree to remove'+ #010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ @@ -1980,8 +1984,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ - 'ifdef DIST_ZIPNA','ME'#010+ - 'ZIPNAME=$(DIST_ZIPNAME)'#010+ + 'ifdef DIST_ZIPNAME'#010+ + 'ZIPNAME=$(DIST_ZIPNA','ME)'#010+ 'else'#010+ 'ZIPNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -1996,8 +2000,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'ifdef DIST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ - 'Z','IPTARGET=install'#010+ - 'endif'#010+ + 'ZIPTARGET=install'#010+ + 'endif'#010, 'endif'#010+ #010+ '# Use tar by default under linux'#010+ @@ -2012,8 +2016,8 @@ const fpcmakeini : array[0..246,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able to run in the current OS so',' fix'#010+ - '# the path separator'#010+ + '# We need to be able to run in the current OS so fix'#010+ + '# the path separat','or'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ @@ -2022,37 +2026,37 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD_CDPACK:=cd $(subst /,$(ZI','PPATHSEP),$(PACKDIR))'#010+ - 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ + 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + 'Z','IPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAM','E)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ - 'TFILE) *'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ + 'ZIPCMD_ZIP:','=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+ + 'ESTFILE) *'#010+ 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ - ' $(DEL) $(ZIPDESTF','ILE)'#010+ - 'ifdef USEZIPWRAPPER'#010+ + ' $(DEL) $(ZIPDESTFILE)'#010+ + 'ifdef USEZIPWRAPPE','R'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZI','PWRAPPE'+ - 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ - 'ER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ + #010+ + ' $(ECH','OREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+ + 'PPER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ - 'ifdef in','Unix'#010+ - ' /bin/sh $(ZIPWRAPPER)'#010+ + 'ifdef inUnix'#010+ + ' /bin/sh $(','ZIPWRAPPER)'#010+ 'else'#010+ 'ifdef RUNBATCH'#010+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ @@ -2064,28 +2068,27 @@ const fpcmakeini : array[0..246,1..240] of char=( 'else'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ - ' $(DE','LTREE) $(PACKDIR)'#010+ + ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zipsourceinstall:'#010+ + 'fpc_','zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ 'SOURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ - 'PEX','AMPLESUFFIX)'#010+ + 'PEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ - 'fpc_zipdistinstall:'#010+ + 'fpc','_zipdistinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ '#####################################################################'#010+ '# Clean rules'#010+ - '################################################','####################'+ - '#'#010+ - #010+ + '#####################################################################'#010+ + #010, '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ @@ -2093,35 +2096,35 @@ const fpcmakeini : array[0..246,1..240] of char=( '))'#010+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ 'GFILES))'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ - 'ifdef CLEAN_PROGRAMS'#010+ + 'ifdef CLEAN_PROGRAMS',#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ - 'ifdef C','LEAN_UNITS'#010+ - 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ + 'ifdef CLEAN_UNITS'#010+ + 'override CLE','ANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLI', - 'BPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addpre'+ - 'fix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFIL'+ - 'ES)))'#010+ + ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLI'+ + 'BPREFIX),$(subst $(PPUE','XT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ + 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+ + 'ILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ - 'UFILES','))'#010+ + 'UFILES))'#010+ 'endif'#010+ - 'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+ + 'override CLEAN','PPUFILENAMES:=$(CLEANPPUFILES)'#010+ 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+ 'LENAMES))'#010+ 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ - 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(U','NITTARGETDIRPRE'+ - 'FIX),$(CLEANPPULINKFILENAMES)))'#010+ + 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+ + 'X),$(C','LEANPPULINKFILENAMES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ @@ -2130,7 +2133,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ - ' -$(','DELTREE) $(CLEANEXEDBGFILES)'#010+ + ' -$(DELTREE) $(CLEANEXEDBGF','ILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ @@ -2139,51 +2142,50 @@ const fpcmakeini : array[0..246,1..240] of char=( ' -$(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+ - 'endif'#010+ - ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+ - ' -$(DEL) $(FPCEXTFILE',') $(REDIRFILE) script*.res link*.res *_s'+ - 'cript.res *_link.res'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ - 'TCHEXT)'#010+ - #010+ - 'fpc_cleanall: $(CLEANTARGET)'#010+ - 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ - 'endif'#010+ - 'ifdef COMPIL','ER_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+ - 'en','dif'#010+ 'endif'#010+ - 'ifdef CLEAN_FILES'#010+ + 'i','fdef CLEAN_FILES'#010+ + ' -$(DEL) $(CLEAN_FILES)'#010+ + 'endif'#010+ + 'ifdef LIB_NAME'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ + 'endif'#010+ + ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+ + ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.','res link*.res *_s'+ + 'cript.res *_link.res'#010+ + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ + 'TCHEXT)'#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_F','ILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ ' -$(DELTREE) bin'#010+ ' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+ '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ - 'ifneq ($(PP','UEXT),.ppu)'#010+ - ' -$(DEL) *.o *.ppu *.a'#010+ + 'ifneq ($(PPUEXT),.ppu)'#010+ + ' -$(','DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) fpcmade.* Package.fpc *.fpm'#010+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ 'ipt.res *_link.res'#010+ - ' -$(DEL) $(PPAS) *_','ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+ + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(B','ATCHEXT) ppaslink$('+ 'BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ @@ -2193,10 +2195,10 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ - ' -$(DEL) $(FPMAKEBINOB','J)'#010+ + ' -$(DEL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ #010+ - 'fpc_distclean: cleanall'#010+ + 'fpc_distclean',': cleanall'#010+ #010+ #010+ '[baseinforules]'#010+ @@ -2206,7 +2208,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '.PHONY: fpc_baseinfo'#010+ #010+ - 'overrid','e INFORULES+=fpc_baseinfo'#010+ + 'override INFORULES+=fpc_basein','fo'#010+ #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ @@ -2214,94 +2216,94 @@ const fpcmakeini : array[0..246,1..240] of char=( ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == ','Configuration info =='#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) == Configuration info =='#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ - ' @$(ECHO) Sourc','e OS.... $(OS_SOURCE)'#010+ - ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ + ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ + ' ',' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ - ' @$(ECHO) TargetSuffix.',' $(TARGETSUFFIX)'#010+ - ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ + ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ + ' ',' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Basedir........','. $(BASEDIR)'#010+ - ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ + ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ + ' @$','(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ','GCC library..... $(GCCLIBDIR)'#010+ + ' @$(ECHO) GCC library..... $(GCCL','IBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ - ' @$(ECHO) Ar.','....... $(AR)'#010+ - ' @$(ECHO) Rc........ $(RC)'#010+ + ' @$(ECHO) Ar........ $(AR)'#010+ + ' @','$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ - ' @$(ECHO)',' Echo...... $(ECHO)'#010+ - ' @$(ECHO) Shell..... $(SHELL)'#010+ + ' @$(ECHO) Echo...... $(ECHO)'#010+ + ' ',' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ - ' ',' @$(ECHO) == Object info =='#010+ + ' @$(ECHO) == Object in','fo =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ - ' @$(EC','HO) Target Programs....... $(TARGET_PROGRAMS)'#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+ - ' @$(ECH','O)'#010+ - ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Cl','ean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ - ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010, + ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Install info =='#010+ + ' ',' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECH','O) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ + ' @$(ECHO) ZipCrossPrefix.....','.. $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @','$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ + ' @$(ECHO) Install base d','ir..... $(INSTALL_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 source dir..','. $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ - ' @$(ECHO',')'#010+ - ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Dis','t destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ - '#############','#######################################################'+ + '####################################','################################'+ '#'#010+ #010+ '.PHONY: fpc_info'#010+ @@ -2311,7 +2313,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ - '###################################','#################################'+ + '##########################################################','##########'+ '#'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ @@ -2323,7 +2325,7 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' ',' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + ' $(FPCMAKE) -w -T$','(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ 'GET_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ @@ -2331,7 +2333,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2: $(addsuffix _makefil','e_dirs,$(TARGET_DIRS) $(TARGE'+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $','(TARGE'+ 'T_EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ @@ -2340,8 +2342,9 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '[localmakefile]'#010+ '#####################################################################'#010+ - '# Loc','al Makefile'#010+ - '#####################################################################'#010+ + '# Local Makefile'#010+ + '###########','#########################################################'+ + '#'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ @@ -2350,16 +2353,17 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '[userrules]'#010+ '#####################################################################'#010+ - '# Users rules'#010, - '#####################################################################'#010+ + '# Users rules'#010+ + '#######################','#############################################'+ + '#'#010+ #010+ '[lclrules]'#010+ '#####################################################################'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ #010+ - '# LCL',' Platform'#010+ - 'ifndef LCL_PLATFORM'#010+ + '# LCL Platform'#010+ + 'ifndef LCL_PL','ATFORM'#010+ 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ @@ -2370,8 +2374,8 @@ const fpcmakeini : array[0..246,1..240] of char=( #010+ '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ - 'override LCLDIR:=$(subst \,/,$(L','CLDIR))'#010+ - 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ + 'ifeq ($(wildcar','d $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ @@ -2381,7 +2385,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ - 'ifeq ($(','wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'ifeq ($(wildcard $(LCLDIR)/unit','s/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -2389,7 +2393,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Check for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ - ' $(addsuffix /units/$(LCL_PLATFORM),','$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDI','R)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2398,7 +2402,7 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ - ' $(addsuffix /lib/lazarus/units/$(LC','L_PLATFORM),/usr/local /usr))))'#010+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local ','/usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2407,8 +2411,8 @@ const fpcmakeini : array[0..246,1..240] of char=( '# Generate dirs'#010+ 'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+ 'R)/units)'#010+ - 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/','../compon'+ - 'ents $(LCLDIR)/components)'#010+ + 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+ + 'ts $(LCLDIR)','/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ @@ -2416,7 +2420,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '################################','####################################'+ + '#######################################################','#############'+ '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ @@ -2427,19 +2431,20 @@ const fpcmakeini : array[0..246,1..240] of char=( '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)'#010+ #010+ - '[fpmakeprerul','es]'#010+ - '#####################################################################'#010+ + '[fpmakeprerules]'#010+ + '###################','#################################################'+ + '#'#010+ '# fpmake prerules'#010+ '#####################################################################'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+ - 'LOCALF','PMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+ + 'LOCALFPMAKEBIN=.$(PATHSEP)$(F','PMAKEBIN)'#010+ #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ 'd --cpu parameters'#010+ @@ -2450,11 +2455,11 @@ const fpcmakeini : array[0..246,1..240] of char=( 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ - '# Get t','he location of the bootstrap-fpmkunit units'#010+ + '# Get the location of the boot','strap-fpmkunit units'#010+ 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+ 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ - 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGED','IR_FPMKUNIT)/units_bs/$(SOURCESUFF'+ + 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$','(SOURCESUFF'+ 'IX)'#010+ 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ @@ -2462,21 +2467,21 @@ const fpcmakeini : array[0..246,1..240] of char=( 'endif'#010+ #010+ 'ifdef FPMAKE_SKIP_CONFIG'#010+ - 'overr','ide FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ + 'override FPMAKE_BUILD_OPT+=$','(FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ '[fpmakerules]'#010+ '#####################################################################'#010+ '# fpmake rules'#010+ '#####################################################################'#010+ - '.PHONY: fpc_fpmake f','pc_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+ + '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpm','ake_install fpc_fpmake_ex'+ 'ampleinstall'#010+ #010+ '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ 'ake uses it'#039's own.'#010+ 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ - '#',' Compose general fpmake-parameters'#010+ + '# Compose general fpmake','-parameters'#010+ 'ifdef FPMAKEOPT'#010+ 'FPMAKE_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ @@ -2484,7 +2489,7 @@ const fpcmakeini : array[0..246,1..240] of char=( 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ 'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+ 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ - 'FPMAKE','_OPT+=--compiler=$(FPC)'#010+ + 'FPMAKE_OPT+=--compiler=$(FPC)',#010+ 'FPMAKE_OPT+=-bu'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ @@ -2493,44 +2498,44 @@ const fpcmakeini : array[0..246,1..240] of char=( 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FP','MAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ + 'FPMAKE_INSTALL_OPT+=--pre','fix=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'override ALLTARGET+=fpc_fpmake'#010+ 'override INSTALLTARGET+=fpc_fpmake_install'#010+ 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+ - '# If no fpmake exists and (dist)clean is called, do not ','try to build'+ - ' fpmake, it will'#010+ + '# If no fpmake exists and (dist)clean is called, do not try to build f'+ + 'pmake, it',' will'#010+ '# most often fail because the dependencies are cleared.'#010+ '# In case of a clean, simply do nothing'#010+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ 'override CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ - '$(FPMKUNIT_PPU): $(FPMKUNIT_SR','C)'#010+ - ' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+ - 'T=,$(FPMAKE_BUILD_OPT))'#010+ + '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ + ' $(MAKE) ','-C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ + 'OPT=,$(FPMAKE_BUILD_OPT))'#010+ #010+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ - 'fpc_fp','make: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ + 'fpc_fpmake: $(FPMAKEBIN)'#010+ + ' ',' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $','(FPMAKE_INSTALL'+ - '_OPT)'#010+ + ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ + 'PT)'#010+ #010+ - '# This is not completely valid. Exampleinstall should only install the'+ - ' examples, while'#010+ + '#',' This is not completely valid. Exampleinstall should only install t'+ + 'he examples, while'#010+ '# fpmake -ie installs everything, including the examples. This also me'+ 'ans that on'#010+ - '# a distinstall fpmake install wil be called twic','e.'#010+ - 'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+ + '# a distinstall fpmake install wil be called twice.'#010+ + 'fpc_fpmake_examplein','stall: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ 'LL_OPT)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index f10e90d219..16396ca921 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -288,6 +288,13 @@ endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif + # Full name of the target, including CPU and OS. For OSs limited # to 8.3 we only use the target OS ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)