From 853f4f30ea13e0fb04e4a31c0babd2deacfdf718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Thu, 27 Jul 2023 10:30:36 +0200 Subject: [PATCH] * Pass FPC_DOTTEDUNITS on to fpmake as -ns * cpu-target checks now use CPU_OS_TARGET instead of FULL_TARGET, as the latter includes SUB_TARGET --- utils/fpcm/fpcmake.inc | 747 +++++++++++++++++++++-------------------- utils/fpcm/fpcmake.ini | 20 +- 2 files changed, 391 insertions(+), 376 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index fd4573a140..8703d35957 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..267] of string[240]=( +const fpcmakeini : array[0..268] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..267,1..240] of char=( +const fpcmakeini : array[0..268,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -304,7 +304,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'ifeq ($(FULL_TARGET),aarch64-embedded)'#010+ + 'ifeq ($(CPU_OS_TARGET),aarch64-embedded)'#010+ '# override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ @@ -314,58 +314,58 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ #010+ - 'ifeq ($(FULL_TARGET),arm-embedded)'#010+ - 'if','eq ($(SUBARCH),)'#010+ + 'ifeq ($(CPU_OS_TARGET),arm-embedded',')'#010+ + 'ifeq ($(SUBARCH),)'#010+ '# we don'#039't add a default here, people should explicitly add the SU'+ 'BARCH'#010+ '$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBA'+ 'RCH=armv4t or SUBARCH=armv7m) must be defined)'#010+ 'endif'#010+ - 'override FPCOPT+=-Cp$(SUBARC','H)'#010+ + 'override FPCOPT+=-Cp$(SU','BARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(FULL_TARGET),avr-embedded)'#010+ + 'ifeq ($(CPU_OS_TARGET),avr-embedded)'#010+ 'ifeq ($(SUBARCH),)'#010+ '# we don'#039't add a default here, people should explicitly add the SU'+ 'BARCH'#010+ '$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBA'+ - 'RCH=avr25 or SUBARCH=avr35) must b','e defined)'#010+ + 'RCH=avr25 or SUBARCH=avr35) ','must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(FULL_TARGET),mipsel-embedded)'#010+ + 'ifeq ($(CPU_OS_TARGET),mipsel-embedded)'#010+ 'ifeq ($(SUBARCH),)'#010+ '# we don'#039't add a default here, people should explicitly add the SU'+ 'BARCH'#010+ - '$(error When compiling for mipsel-embedded, a sub-archit','ecture (e.g.'+ + '$(error When compiling for mipsel-embedded, a su','b-architecture (e.g.'+ ' SUBARCH=pic32mx) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(FULL_TARGET),xtensa-embedded)'#010+ + 'ifeq ($(CPU_OS_TARGET),xtensa-embedded)'#010+ 'ifeq ($(SUBARCH),)'#010+ '$(error When compiling for xtensa-embedded, a sub-architecture (e.g. S'+ - 'UBARCH=lx106 or SUBARC','H=lx6) must be defined)'#010+ + 'UBARCH=lx106',' or SUBARCH=lx6) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(FULL_TARGET),xtensa-freertos)'#010+ + 'ifeq ($(CPU_OS_TARGET),xtensa-freertos)'#010+ 'ifeq ($(SUBARCH),)'#010+ '$(error When compiling for xtensa-freertos, a sub-architecture (e.g. S'+ - 'UBARCH=lx106 or SUBARCH=lx6) must be defined)',#010+ + 'UBARCH=lx106 or SUBARCH=lx6) must',' be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(FULL_TARGET),arm-freertos)'#010+ + 'ifeq ($(CPU_OS_TARGET),arm-freertos)'#010+ 'ifeq ($(SUBARCH),)'#010+ '$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBA'+ 'RCH=armv6m or SUBARCH=armv7em) must be defined)'#010+ 'endif'#010+ - 'override FPCOPT+=','-Cp$(SUBARCH)'#010+ + 'ove','rride FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ '# Full name of the target, including CPU and OS. For OSs limited'#010+ @@ -374,7 +374,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'TARGETSUFFIX=$(OS_TARGET)'#010+ 'SOURCESUFFIX=$(OS_SOURCE)'#010+ 'else'#010+ - 'ifneq ($(filter $','(OS_TARGET),$(LIMIT83fs)),)'#010+ + 'ifn','eq ($(filter $(OS_TARGET),$(LIMIT83fs)),)'#010+ 'TARGETSUFFIX=$(OS_TARGET)'#010+ 'else'#010+ 'TARGETSUFFIX=$(FULL_TARGET)'#010+ @@ -386,16 +386,16 @@ const fpcmakeini : array[0..267,1..240] of char=( '#'#010+ '# We may need to switch to FULL_TARGET/FULL_TARGET'#010+ '#'#010+ - 'ifneq ($(CPU_OS_TARGET),$(CPU_OS_SOU','RCE))'#010+ + 'ifneq ($(CPU_OS_TARGET','),$(CPU_OS_SOURCE))'#010+ 'CROSSCOMPILE=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 ($(filter $(CPU_OS_TARGET),$(MAKEFILETARGETS)),)'#010+ - '$(error',' The Makefile doesn'#039't support target $(FULL_TARGET), plea'+ - 'se run fpcmake first)'#010+ + 'ifeq ($(filter $(CPU_OS_TARGET),$(MAKEFILETARGE','TS)),)'#010+ + '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+ + ' run fpcmake first)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -406,7 +406,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'BSDhier=1'#010+ 'endif'#010+ #010+ - '# Detect Linux, wil','l also use its own directory hierarchy.'#010+ + '# Det','ect Linux, will also use its own directory hierarchy.'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ 'linuxHier=1'#010+ 'endif'#010+ @@ -421,13 +421,14 @@ const fpcmakeini : array[0..267,1..240] of char=( 'export BUILDNATIVE'#010+ 'endif'#010+ #010+ - 'export OS_TARGET OS_SOURC','E ARCH CPU_TARGET CPU_SOURCE SUB_TARGET SUB'+ + 'export OS_T','ARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE SUB_TARGET SUB'+ '_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'+ ' CPU_OS_TARGET CPU_OS_SOURCE'#010+ #010+ '[fpmakefpcdetect]'#010+ - '#####################################################################'#010+ - '# FPC Bin','ary and Version Detection'#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+ @@ -435,36 +436,36 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifndef FPCFPMAKE'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ - '# Search for the (nat','ive) ppc compiler which is used to do the lates'+ + '# Searc','h for the (native) ppc compiler which is used to do the lates'+ 't 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 exported, because it could'+ - ' be that'#010+ + 'il','er'#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+ + 'ifneq ($(FPCPROG','),)'#010+ + 'FPCPROG:=$(firstword $(FPCPROG))'#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 ppc3','86'#010+ + '# fpc binary not found, fa','llback to ppc386'#010+ 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$'+ '(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+ + '# evaluate the variable here, but d','o that on the fly.'#010+ 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(F'+ 'PCDIR))))'#010+ 'FPMAKE_SKIP_CONFIG=-n'#010+ @@ -480,15 +481,14 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ #010+ - '[fpcdircheckenv]'#010+ - '#######','#############################################################'+ - '#'#010+ + '[fpcdirche','ckenv]'#010+ + '#####################################################################'#010+ '# FPCDIR Setting'#010+ '#####################################################################'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ - 'override FPCDIR:=$(subst \,/,$(F','PCDIR))'#010+ + 'override FPCDIR:=$','(subst \,/,$(FPCDIR))'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ @@ -499,7 +499,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Default FPCDIR from Makefile.fpc'#010+ 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ - 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCD','IR))'#010+ + 'override FPCDIR:=$(subst \,/,','$(DEFAULT_FPCDIR))'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ @@ -511,14 +511,14 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ - 'ifeq ($(wildcard $(FPCDIR)/un','its),)'#010+ + 'ifeq ($(wildcar','d $(FPCDIR)/units),)'#010+ 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)','),)'#010+ + 'ifeq ($(wildcard $(addprefix $','(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(BASEDIR)'#010+ @@ -530,15 +530,15 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Cross binaries dir'#010+ - 'ifndef C','ROSSBINDIR'#010+ + '# Cross binarie','s dir'#010+ + 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+ 'endif'#010+ #010+ '# Default binutils prefix for cross compile when the'#010+ '# crossbindir is not set (except for Darwin)'#010+ 'ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+ - 'ifneq ($(filter ','$(OS_SOURCE),darwin ios),)'#010+ + 'if','neq ($(filter $(OS_SOURCE),darwin ios),)'#010+ 'DARWIN2DARWIN=1'#010+ 'endif'#010+ 'endif'#010+ @@ -549,9 +549,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifneq ($(OS_TARGET),msdos)'#010+ 'ifndef DARWIN2DARWIN'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+ + 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TA','RGET)-'#010+ #010+ - '# For ','Android use standard NDK prefixes'#010+ + '# For Android use standard NDK prefixes'#010+ 'ifeq ($(OS_TARGET),android)'#010+ 'ifeq ($(CPU_TARGET),arm)'#010+ 'BINUTILSPREFIX=arm-linux-androideabi-'#010+ @@ -559,7 +559,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'BINUTILSPREFIX=i686-linux-android-'#010+ 'else'#010+ - 'BINUTILSPREFIX=$(CPU_TARGET)-linux-android-'#010, + 'BINUTILSPREFIX=$(CPU_TARGET)-l','inux-android-'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -575,8 +575,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Try first the full target name, otherwise try only'#010+ '# the OS for backwards compatibility'#010+ - 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+ - 'ifeq (','$(UNITSDIR),)'#010+ + 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETS','UFFIX))'#010+ + 'ifeq ($(UNITSDIR),)'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ #010+ @@ -585,8 +585,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '[shelltools]'#010+ - '#####################################################################'#010+ - '# Shell tools'#010, + '#####################################################################'#010, + '# Shell tools'#010+ '#####################################################################'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ @@ -598,8 +598,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# To copy pograms'#010+ - 'ifnd','ef COPY'#010+ + '# To cop','y pograms'#010+ + 'ifndef COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ @@ -616,9 +616,9 @@ const fpcmakeini : array[0..267,1..240] of char=( '# To move pograms'#010+ 'ifndef MOVE'#010+ 'MOVE:=$(MVPROG) -f'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ - '# Check de','lete program'#010+ + '# Check delete program'#010+ 'ifndef DEL'#010+ 'DEL:=$(RMPROG) -f'#010+ 'endif'#010+ @@ -635,9 +635,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'else'#010+ 'INSTALL:=$(COPY)'#010+ 'endif'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ - '# To inst','all programs'#010+ + '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ @@ -651,7 +651,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ 'endif'#010+ #010+ - 'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INST','ALL INSTALLEXE M'+ + 'export ECHOREDIR COPY COPYTREE MOVE DE','L DELTREE INSTALL INSTALLEXE M'+ 'KDIR'#010+ #010+ #010+ @@ -661,8 +661,8 @@ const fpcmakeini : array[0..267,1..240] of char=( '#####################################################################'#010+ #010+ '# Units dir'#010+ - 'ifdef REQUIRE_UNITSDIR'#010+ - 'overr','ide UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ + 'ifdef REQUIRE_','UNITSDIR'#010+ + 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ #010+ '# Units dir'#010+ @@ -672,7 +672,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ - '# When zipping use the target os default, when normal install',' then'#010+ + '# When zipping use the target os default, when ','normal install then'#010+ '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ @@ -686,7 +686,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When install prefix is not',' set try to use prefix'#010+ + '# When install',' prefix is not set try to use prefix'#010+ 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ @@ -698,7 +698,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_PREFIX=/usr/local'#010+ 'else'#010+ - 'ifdef INSTALL_FPCPACK','AGE'#010+ + 'ifdef I','NSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ @@ -710,7 +710,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+ '# used recursively for all subdirs'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'export INSTALL_FPCSUBDI','R'#010+ + 'export IN','STALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ '# Where to place the resulting zip files'#010+ @@ -722,7 +722,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ - 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_M','AIN)/units/$(TARGETSUFFIX)'#010+ + 'COMPILER_UNITTARGETDIR=','$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ 'else'#010+ 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -733,15 +733,14 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '#####################################################################'#010+ - '# Install Directories'#010+ - '####','################################################################'+ - '#'#010+ + '# Install Di','rectories'#010+ + '#####################################################################'#010+ #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+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/','$(FPC_VERSION)'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -753,16 +752,16 @@ const fpcmakeini : array[0..267,1..240] of char=( '# set the directory where to install the binaries'#010+ 'ifndef INSTALL_BINDIR'#010+ 'ifdef UNIXHier'#010+ - 'INSTALL_BINDIR:=$(INSTALL_PREFIX)','/bin'#010+ + 'INSTALL_BINDIR:=$(I','NSTALL_PREFIX)/bin'#010+ 'else'#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+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX',')'#010+ 'else'#010+ - 'INSTALL','_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ @@ -773,7 +772,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/unit','s/$(TARGETSUFFIX)'#010+ + 'INSTALL_UNITDIR:=$(INSTALL','_BASEDIR)/units/$(TARGETSUFFIX)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ @@ -784,7 +783,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Where to install shared libraries'#010+ 'ifndef INSTALL_LIBDIR'#010+ 'ifdef UNIXHier'#010+ - 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/','lib'#010+ + 'INSTALL_LIBDIR:=$(IN','STALL_PREFIX)/lib'#010+ 'else'#010+ 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -799,7 +798,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef linuxHier'#010+ 'SRCPREFIXDIR=share/src'#010+ 'else'#010+ - 'SRCPREFIXDIR=src'#010, + 'SRC','PREFIXDIR=src'#010+ 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -807,7 +806,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VE','RSI'+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR',')/fpc-$(FPC_VERSI'+ 'ON)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ @@ -817,7 +816,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPC','SUBDIR)/$('+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source','/$(INSTALL_FPCSUBDIR)/$('+ 'PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ @@ -830,8 +829,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Where the doc files will be stored'#010+ 'ifndef INSTALL_DOCDIR'#010+ - 'ifdef UNIXHier'#010+ - 'i','fdef BSDhier'#010+ + 'if','def UNIXHier'#010+ + 'ifdef BSDhier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ 'ifdef linuxHier'#010+ @@ -843,9 +842,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ - 'else'#010+ - 'INSTALL_DOC','DIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$('+ - 'PACKAGE_VERSION)'#010+ + 'el','se'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ + 'CKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -854,16 +853,16 @@ const fpcmakeini : array[0..267,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ + 'endif',#010+ #010+ - '# Where to i','nstall the examples, under linux we use the doc dir'#010+ + '# Where to install the examples, under linux we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/exam','ples/fpc-$(FPC_VERSI'+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREF','IX)/share/examples/fpc-$(FPC_VERSI'+ 'ON)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ @@ -876,15 +875,15 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ 'else'#010+ #010+ - 'ifdef BSDhier'#010+ - 'INSTALL_','EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)'+ - '-$(PACKAGE_VERSION)'#010+ + 'ifdef BS','Dhier'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ + '(PACKAGE_VERSION)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ 'GE_VERSION)'#010+ 'else'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_','NAME)-$(PACKAGE_'+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/','doc/$(PACKAGE_NAME)-$(PACKAGE_'+ 'VERSION)'#010+ 'endif'#010+ #010+ @@ -899,7 +898,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the some extra (data)f','iles will be stored'#010+ + '# Where the some',' extra (data)files will be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ @@ -908,22 +907,23 @@ const fpcmakeini : array[0..267,1..240] of char=( 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+ 'endif'#010+ #010+ - '#####################################################################'#010+ - '# Cross compi','le dirs'#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+ + '# is ','found use the targets/ subdir in INSTALL_BASEDIR.'#010+ 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ - '(FULL_SOURCE))'#010+ + '(FULL_SOURCE))'#010, 'endif'#010+ 'endif'#010+ - 'el','se'#010+ + 'else'#010+ 'CROSSBINDIR='#010+ 'endif'#010+ #010+ @@ -935,8 +935,8 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Amd64 to i386?'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(filter x86_64,$(shell uname -a)),)'#010+ - 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBD','IR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ + 'ifeq ($(BINUTILSPRE','FIX),)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-m32'#010+ 'endif'#010+ @@ -947,7 +947,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '#CPU_TARGET=i386'#010+ 'ifeq ($(CPU_TARGET),powerpc)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -m32 -pri','nt-libgcc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname ','`gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-m32'#010+ 'endif'#010+ @@ -958,8 +958,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+ 'else'#010+ - 'CROSSGCCOPT=-m64'#010+ - 'endif'#010, + 'CROSSGCCO','PT=-m64'#010+ + 'endif'#010+ '#BINUTILSPREFIX'#010+ 'endif'#010+ '#CPU_TARGET=powerpc64'#010+ @@ -968,9 +968,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ - 'CROSSGCCOPT=-m32'#010+ + 'CROSSGCCOPT=-m32',#010+ 'endif'#010+ - '#BINUTI','LSPREFIX'#010+ + '#BINUTILSPREFIX'#010+ 'endif'#010+ '#filter sparc64'#010+ 'endif'#010+ @@ -978,7 +978,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# gcc mips seems not to recognize -m32/-m64'#010+ 'ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)',#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libg','cc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-mabi=64'#010+ 'endif'#010+ @@ -988,7 +988,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# gcc mips seems not to recognize -m32/-m64'#010+ 'ifneq ($(filter $(CPU_TARGET),mips mipsel),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -','print-libgcc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname `','gcc -mabi=32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-mabi=32'#010+ 'endif'#010+ @@ -999,9 +999,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(GCCLIBDIR),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+ 'endif'#010+ - '#GCCLIBDIR='#010+ + '#GCCLIBDIR='#010, 'else'#010+ - 'ifeq ($(C','ROSSGCCOPT),)'#010+ + 'ifeq ($(CROSSGCCOPT),)'#010+ 'CROSSGCCOPT=-g'#010+ 'endif'#010+ '#CROSSGCCOPT='#010+ @@ -1013,22 +1013,22 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Check if FPCFPMAKE compiler is same target as FPC'#010+ 'ifdef FPCFPMAKE'#010+ 'FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)'#010+ - 'ifeq ($(CPU_TARGET),$(FPCFPMAKE_CP','U_TARGET))'#010+ + 'ifeq ($(CPU_TARGET),','$(FPCFPMAKE_CPU_TARGET))'#010+ '# In that case use GCCLIBDIR value for FPCMAKEGCCLIBDIR'#010+ 'FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)'#010+ 'else'#010+ 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 spar'+ 'c64 x86_64 loongarch64),)'#010+ 'FPCMAKE_CROSSGCCOPT=-m64'#010+ - 'else'#010+ - 'ifneq ($(fi','lter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)'#010+ + 'el','se'#010+ + 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=64'#010+ 'else'#010+ 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=32'#010+ 'else'#010+ 'ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)'#010+ - 'FPCMAKE_CROSSGCCOPT=-mabi=lp64',#010+ + 'FPCMAKE_CROSSGCC','OPT=-mabi=lp64'#010+ 'else'#010+ 'ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=ilp32'#010+ @@ -1041,9 +1041,9 @@ const fpcmakeini : array[0..267,1..240] of char=( '#loongarch64'#010+ 'endif'#010+ '#riscv32'#010+ - 'endif'#010+ + 'endif',#010+ '#riscv64'#010+ - 'endi','f'#010+ + 'endif'#010+ '#mips/mipsel'#010+ 'endif'#010+ '#mips64/mips64el'#010+ @@ -1056,8 +1056,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ '#def FPCFPMAKE'#010+ #010+ - 'ifndef FPCMAKEGCCLIBDIR'#010+ - 'FPC','MAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+ + 'ifndef FPCMAK','EGCCLIBDIR'#010+ + 'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+ 'endif'#010+ #010+ '# Try cross gcc'#010+ @@ -1065,7 +1065,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ 'XT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ - 'GCCLIBDIR:=$(shell dirname',' `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc'+ + 'GCCLIBDIR:=$','(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc'+ '-file-name`)'#010+ 'endif'#010+ '#CROSSGCC='#010+ @@ -1078,7 +1078,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(OS_SOURCE),netbsd)'#010+ 'OTHERLIBDIR:=/usr/pkg/lib'#010+ 'endif'#010+ - 'export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLI','BDIR'#010+ + 'export GCCLIBDIR FPCMAKEGCC','LIBDIR OTHERLIBDIR'#010+ 'endif'#010+ #010+ #010+ @@ -1087,8 +1087,8 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Default extensions'#010+ '#####################################################################'#010+ #010+ - '# Default needed extensions (Go32v2,Linux)'#010+ - 'BATCHEXT=','.bat'#010+ + '# Default needed extensions (Go32v2,Li','nux)'#010+ + 'BATCHEXT=.bat'#010+ 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ @@ -1103,7 +1103,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'STATICLIBPREFIX=libp'#010+ 'IMPORTLIBPREFIX=libimp'#010+ 'RSTEXT=.rst'#010+ - '# external debug info for execut','able'#010+ + '# external debug i','nfo for executable'#010+ 'EXEDBGEXT=.dbg'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ @@ -1116,8 +1116,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'STATICLIBPREFIX='#010+ - 'SHORTSUFFIX','=dos'#010+ + 'STATICLIBPREFI','X='#010+ + 'SHORTSUFFIX=dos'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ #010+ @@ -1133,8 +1133,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Android native'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),android)'#010+ - 'BATCHEX','T=.sh'#010+ + 'ifeq ($(OS_TARGET),an','droid)'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=lnx'#010+ @@ -1153,8 +1153,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(OS_TARGET),dragonfly)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ - 'SHORTSU','FFIX=df'#010+ + 'HASSHARE','DLIB=1'#010+ + 'SHORTSUFFIX=df'#010+ 'endif'#010+ #010+ '# FreeBSD'#010+ @@ -1174,7 +1174,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# OpenBSD'#010+ - 'ifeq ($(OS_TARGET),open','bsd)'#010+ + 'ifeq ($(O','S_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1192,8 +1192,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUF','FIX=os2'#010+ + 'SHAREDLIBEXT','=.dll'#010+ + 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ @@ -1211,8 +1211,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Amiga'#010+ 'ifeq ($(OS_TARGET),amiga)'#010+ - 'EXEEXT='#010+ - 'SHAREDLIBEXT=.','library'#010+ + 'EXEEXT='#010, + 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=amg'#010+ 'endif'#010+ #010+ @@ -1231,7 +1231,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS_TARGET),atari',')'#010+ + 'ifeq ($(OS','_TARGET),atari)'#010+ 'EXEEXT=.ttp'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ @@ -1251,8 +1251,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# Solaris'#010+ - 'ifeq ($(OS_TARGET),solaris)'#010+ - 'BATCHEXT=.sh',#010+ + 'ifeq ($(OS_TARGET),solaris',')'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=sun'#010+ 'endif'#010+ @@ -1272,8 +1272,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ #010+ - '# Netware libc'#010+ - 'ifeq ','($(OS_TARGET),netwlibc)'#010+ + '# Netw','are libc'#010+ + 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=nwl'#010+ @@ -1288,9 +1288,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'SHORTSUFFIX=mac'#010+ 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ - #010+ + #010, '# Darwin'#010+ - 'ifneq',' ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+ + 'ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1306,7 +1306,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# Symbian OS'#010+ - 'ifeq ($(OS_TARGET),sym','bian)'#010+ + 'ifeq ($(','OS_TARGET),symbian)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ 'endif'#010+ @@ -1325,7 +1325,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# AIX'#010+ - 'ifeq ($(OS_TARG','ET),aix)'#010+ + 'i','feq ($(OS_TARGET),aix)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.a'#010+ @@ -1342,8 +1342,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Android java'#010+ 'ifeq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),android)'#010+ - 'OEXT=.c','lass'#010+ + 'ifeq ($(OS_TARGET),an','droid)'#010+ + 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=android'#010+ @@ -1360,8 +1360,8 @@ const fpcmakeini : array[0..267,1..240] of char=( '# MSX-DOS'#010+ 'ifeq ($(OS_TARGET),msxdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBEXT=.a'#010+ - 'SHORTSUFFIX=m','sd'#010+ + 'STATICLIBEXT=.a',#010+ + 'SHORTSUFFIX=msd'#010+ 'endif'#010+ #010+ '# Embedded'#010+ @@ -1379,8 +1379,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_TARGET),win16)'#010+ - 'STATICLIB','PREFIX='#010+ + 'ifeq ($(OS_TARGET),wi','n16)'#010+ + 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w16'#010+ @@ -1398,7 +1398,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '# For 8.3 limited OS'#039's the short suffixes'#010+ - '# Otherwise use th','e full source/target names'#010+ + '# Ot','herwise use the full source/target names'#010+ 'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ @@ -1407,7 +1407,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ZIPEXAMPLESUFFIX=exm'#010+ 'else'#010+ 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ - 'ZIPSOURCESUFFIX=.s','ource'#010+ + 'ZIPS','OURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ @@ -1419,7 +1419,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '[defaulttools]'#010+ - '#####################################################','###############'+ + '#######################################','#############################'+ '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ @@ -1428,7 +1428,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ - 'RCNAME=$(BINUTILSPREFIX)r','c'#010+ + 'RCNAME=$(BI','NUTILSPREFIX)rc'#010+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ @@ -1441,8 +1441,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# linker, but probably not used'#010+ - 'ifndef LDPROG'#010+ - 'ifdef',' CROSSBINDIR'#010+ + 'ifnde','f LDPROG'#010+ + 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'LDPROG=$(LDNAME)'#010+ @@ -1458,8 +1458,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Archiver'#010+ - 'ifndef',' ARPROG'#010+ + '# A','rchiver'#010+ + 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1470,8 +1470,8 @@ const fpcmakeini : array[0..267,1..240] of char=( '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+ - 'else',#010+ + 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(S','RCEXEEXT)'#010+ + 'else'#010+ 'NASMPROG=$(NASMNAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -1490,7 +1490,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'PPAS=ppas$(SRCBATCHEXT)'#010+ 'endif'#010+ #010+ - '# ldconfig to rebui','ld .so cache'#010+ + '# ldc','onfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ 'LDCONFIG=ldconfig'#010+ 'else'#010+ @@ -1510,9 +1510,9 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ 'TAROPT=vj'#010+ - 'TAREXT=.tar.bz2'#010+ + 'TAREXT=.tar.','bz2'#010+ 'else'#010+ - 'TAROP','T=vz'#010+ + 'TAROPT=vz'#010+ 'TAREXT=.tar.gz'#010+ 'endif'#010+ #010+ @@ -1522,7 +1522,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and a','dd FPC_CPU define, for compiling the'#010+ + '# Load commandlin','e OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(ARCH)'#010+ @@ -1531,7 +1531,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'override FPCOPT+=','-T$(OS_TARGET)'#010+ + 'ove','rride FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ @@ -1541,7 +1541,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ - 'override FPMAKE_BUILD_OPT+=-FD$(NE','W_BINUTILS_PATH)'#010+ + 'override FPMAKE_BUIL','D_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ @@ -1553,7 +1553,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When BINUTILSPREFIX is given and we are not cross-com','piling then u'+ + '# When BINUTILSPREFIX is given and we are',' not cross-compiling then u'+ 'se'#010+ '# it while compiling the fpmake file. (For example to build i386-freeb'+ 'sd'#010+ @@ -1561,7 +1561,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'override FPMAKE_BUILD_OPT+=-XP$(B','INUTILSPREFIX)'#010+ + 'override FPMAKE_BUI','LD_OPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1572,8 +1572,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ - 'ifdef OBJDIR'#010+ - 'override FPCOP','T+=$(addprefix -Fo,$(OBJDIR))'#010+ + 'ifdef OBJDIR'#010, + 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ @@ -1587,10 +1587,10 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ 'override FPCOPT+=-CX'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ '# Debug'#010+ - 'ifd','ef DEBUG'#010+ + 'ifdef DEBUG'#010+ 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ @@ -1602,9 +1602,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ - #010+ + #010, '# Strip'#010+ - 'ifdef ','STRIP'#010+ + 'ifdef STRIP'#010+ 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ @@ -1620,7 +1620,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'override FPCOPT+=$(','COMPILER_OPTIONS)'#010+ + 'overr','ide FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ @@ -1629,7 +1629,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'override FPCOPT+=$(','addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'overr','ide FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ @@ -1640,7 +1640,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target dirs and the pr','efix to use for clean/install'#010+ + '# Target d','irs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ @@ -1650,15 +1650,15 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Unit target dir (d','efault is units/-/'#010+ + '# Unit',' target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR',')/'#010+ 'endif'#010+ - 'else'#010, + 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ @@ -1668,15 +1668,15 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef SYSROOTPATH'#010+ 'override FPCOPT+=-XR$(SYSROOTPATH)'#010+ 'else'#010+ - '# if we are compiling natively on aarch64-','darwin and if -/Library/De'+ + '# if we are compiling native','ly on aarch64-darwin and if -/Library/De'+ 'veloper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+ '# add it to the compiler command line'#010+ 'ifeq ($(OS_TARGET),$(OS_SOURCE))'#010+ 'ifeq ($(OS_TARGET),darwin)'#010+ '# so far the only tested one'#010+ - 'ifeq ($(CPU_TARGET),aarch64)'#010+ - 'ifneq ($(','wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sd'+ - 'k),)'#010+ + 'ifeq ($(CPU_TARGET),aarc','h64)'#010+ + 'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+ + ',)'#010+ 'override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sd'+ 'k'#010+ 'endif'#010+ @@ -1689,14 +1689,14 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override FPCOPT+=-Cg'#010+ 'endif'#010+ #010+ - '# create always pic'#039'ed cod','e on x86_64, mips and mipsel'#010+ + '# create alw','ays pic'#039'ed code on x86_64, mips and mipsel'#010+ '# on unix-like systems'#010+ 'ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux so'+ 'laris),)'#010+ 'ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv'+ '64 powerpc64),)'#010+ - 'override FPCOPT+=-Cg'#010+ - 'en','dif'#010+ + 'override ','FPCOPT+=-Cg'#010+ + 'endif'#010+ 'endif'#010+ #010+ '# building without smartlinking on z80 makes no sense'#010+ @@ -1710,7 +1710,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '[command_libc]'#010+ - '# Add GCC lib path',' if asked'#010+ + '# Ad','d GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'ifdef FPCMAKEGCCLIBDIR'#010+ @@ -1720,7 +1720,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLI','BDIR))'#010+ + 'override FPCOPT+=$(addprefix',' -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1732,7 +1732,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Override options to compile the fpmake-binary with command-line opti'+ 'ons provided in FPMAKEBUILDOPT'#010+ - 'ifdef FPMAKEBUILD','OPT'#010+ + 'ifd','ef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ #010+ @@ -1743,8 +1743,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCOPT+=@$(CFGFILE)'#010+ - 'e','ndif'#010+ + 'override FPCOPT+','=@$(CFGFILE)'#010+ + 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ @@ -1754,7 +1754,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=$(CPU_SOURCE)-$(O','S_SOURCE)'#010+ + 'override AFULL_SOURCE=$(C','PU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ @@ -1767,7 +1767,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ #010+ - '# also call ppas if with command',' option -s'#010+ + '# also call ppas i','f with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ '# or if -sh is used'#010+ 'ifneq (,$(filter -sh,$(COMPILER)))'#010+ @@ -1775,10 +1775,10 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'ifneq (,$(filter -s,$(COMPILER)))'#010+ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ - 'UseEXECPPAS=1'#010+ + 'UseEXECPPAS=1',#010+ 'endif'#010+ 'endif'#010+ - 'i','fneq ($(UseEXECPPAS),1)'#010+ + 'ifneq ($(UseEXECPPAS),1)'#010+ 'EXECPPAS='#010+ 'else'#010+ 'ifdef RUNBATCH'#010+ @@ -1792,7 +1792,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '[loaderrules]'#010+ '#####################################################################'#010+ '# Loaders'#010+ - '#######################','#############################################'+ + '#########','###########################################################'+ '#'#010+ #010+ '.PHONY: fpc_loaders'#010+ @@ -1802,7 +1802,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(ad','dsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'override LOAD','EROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ @@ -1812,7 +1812,7 @@ const fpcmakeini : array[0..267,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADER','OFILES)'#010+ + 'fpc_loaders: $(COMPILER_UNITTARGE','TDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1823,8 +1823,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - 'ifdef COMP','ILER_UNITTARGETDIR'#010+ + ' $(MKDIR) $(INSTALL_UNITD','IR)'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ @@ -1833,7 +1833,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '################################################','####################'+ + '##################################','##################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1843,14 +1843,14 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEX','T),$(TARGET_UNITS))'#010+ + 'override UNITPPUFILES=$(add','suffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)',#010+ 'endif'#010+ #010+ - 'fpc_un','its: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ + 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -1859,23 +1859,23 @@ const fpcmakeini : array[0..267,1..240] of char=( '#####################################################################'#010+ #010+ '.PHONY: fpc_exes'#010+ - #010+ - '# Programs are',' not needed for a cross installation'#010+ + #010, + '# Programs are not needed for a cross installation'#010+ 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+ - 'x $(LTOEXT),$(TARGET_PROG','RAMS))$(addprefix $(STATICLIBPREFIX),$(adds'+ + 'x $(LTOEXT)',',$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(adds'+ 'uffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREF'+ 'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ - 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROG','RAMS))'#010+ #010+ - 'overri','de ALLTARGET+=fpc_exes'#010+ + 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS','))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(T','ARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1887,7 +1887,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '######################################','##############################'+ + '########################','############################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1895,9 +1895,9 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILES)'#010+ + 'override CLEANRSTFILES+=$(RST','FILES)'#010+ 'endif'#010+ - #010, + #010+ #010+ '[examplerules]'#010+ '#####################################################################'#010+ @@ -1907,22 +1907,22 @@ const fpcmakeini : array[0..267,1..240] of char=( '.PHONY: fpc_examples'#010+ #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ - 'HASEXAMPLES=1'#010+ - 'override',' EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAM'+ - 'PLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+ - 'EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLE','S))'#010+ + 'HASEXAMP','LES=1'#010+ + 'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+ + 'ES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EX'+ + 'AMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(','TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(adds'+ 'uffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(a'+ 'ddsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBP'+ - 'REFIX),$(addsuffix $(STATI','CLIBEXT),$(TARGET_EXAMPLES)))'#010+ + 'REFIX),$(add','suffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ #010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ - 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CL','EANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'ifeq ($(OS_TARGET),os','2)'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1932,16 +1932,17 @@ const fpcmakeini : array[0..267,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXA','MPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'fpc_examp','les: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ '[compilerules]'#010+ '#####################################################################'#010+ '# General compile rules'#010+ - '#####################################################################'#010+ + '################################################################','####'+ + '#'#010+ #010+ - '.PHONY:',' fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ + '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1951,8 +1952,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'fpc_smart:'#010+ ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ - 'fpc_debug:'#010+ - ' ','$(MAKE) all DEBUG=1'#010+ + 'fpc_d','ebug:'#010+ + ' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ @@ -1963,7 +1964,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+ 'c .res'#010+ #010+ - '$(COMPILER_UNITTARG','ETDIR):'#010+ + '$(COM','PILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ @@ -1975,7 +1976,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECP','PAS)'#010+ + ' ',' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ @@ -1990,8 +1991,8 @@ const fpcmakeini : array[0..267,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.dpr'#010+ - ' $(COMPILER) $<'#010+ - ' ','$(EXECPPAS)'#010+ + ' $(COMPILE','R) $<'#010+ + ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ @@ -1999,12 +2000,12 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.lpr $(COMPILER_SOU','RCEDIR) $(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 %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+ - 'vpath %$(PPUEXT) $(COMPILER_UNITT','ARGETDIR)'#010+ + 'vpath %$(PPUEXT) $(','COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ @@ -2013,8 +2014,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '.PHONY: fpc_shared'#010+ #010+ - 'override INSTALLTARGET+=fpc_shared_install'#010+ - #010, + 'override INSTALLTARGET+=fpc_sh','ared_install'#010+ + #010+ 'ifndef SHARED_LIBVERSION'#010+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ @@ -2025,8 +2026,8 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ 'ifndef SHARED_FULLNAME'#010+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ - 'N)$(SHAREDLIBEXT)'#010+ - 'endi','f'#010+ + 'N)$(SHAR','EDLIBEXT)'#010+ + 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ @@ -2035,13 +2036,13 @@ const fpcmakeini : array[0..267,1..240] of char=( 'IBUNITS))'#010+ 'endif'#010+ #010+ - 'fpc_shared:'#010+ - 'ifdef HASSH','AREDLIB'#010+ + 'fpc_share','d:'#010+ + 'ifdef HASSHAREDLIB'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ - 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+ - 'endif'#010, + 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILS','PREFIX)'#010+ + 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ @@ -2050,7 +2051,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ - ' $(INSTALL) $(COMPILER_UNITTARGET','DIR)/$(SHARED_FULLNAME) $(IN'+ + ' $(INSTALL) $(COMPI','LER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ 'STALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ @@ -2059,49 +2060,50 @@ const fpcmakeini : array[0..267,1..240] of char=( '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '#####################################################################'#010+ + '#############################################################','#######'+ + '#'#010+ #010+ - '.PHO','NY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ + '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),', - '$(INSTALLPPUFILES))'#010+ + 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDU','NIT)$(PPUEXT)'+ + ',$(INSTALLPPUFILES))'#010+ '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+ - 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+ - 'IBEXT)',')'#010+ + 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$','(STATI'+ + 'CLIBEXT))'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) '+ - '$(addprefix $(IMPORTLIBPREFI','X),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ + '$(addprefix $(','IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ 'NSTALLPPUFILES)))'#010+ 'else'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ - 'ATICLIBPREFIX),$(subst $(PPUEXT),$(ST','ATICLIBEXT),$(INSTALLPPUFILES))'+ + 'ATICLIBPREFIX),$(subst ','$(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ')'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+ - 'override INSTALLPPUFILES=$(addprefix $(UNI','TTARGETDIRPREFIX),$(INSTAL'+ + 'override INSTALLPPUFILES=$(a','ddprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+ 'LPPUFILENAMES))'#010+ 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+ 'FIX),$(INSTALLPPULINKFILENAMES)))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ - 'endif'#010+ + 'endif',#010+ #010+ - 'ifdef INSTAL','LEXEFILES'#010+ + 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ 'STALLEXEFILES)))'#010+ @@ -2110,15 +2112,15 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(INSTALL_BINDIR)'#010+ - ' $(I','NSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ + ' $(MKDIR) $(INSTALL_BINDI','R)'#010+ + ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ - '# a safety check is done if Makefile.fpc is available'#010+ - 'ifdef PACKAGE_','VERSION'#010+ + '# a safety check is done if Makefile.fpc is available'#010, + 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ @@ -2127,14 +2129,14 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALLPPUFILES'#010+ - ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + 'ifdef INST','ALLPPUFILES'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ - ' $(MKD','IR) $(INSTALL_LIBDIR)'#010+ + 'ifneq ($(wildcard $(LIB_FULLNAME)),)',#010+ + ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ @@ -2143,15 +2145,15 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FILES'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+ - ' $(INSTALL',') $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ + ' ',' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ - 'ARG','ET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _di','stclean,$'+ + '(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ @@ -2159,7 +2161,7 @@ const fpcmakeini : array[0..267,1..240] of char=( ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_','EXAMPLEDIRS)) $(INSTALL_'+ + ' $(COPYTREE) $(addsuffi','x /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ @@ -2168,7 +2170,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Dist Install'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_distinstal','l'#010+ + '.PHONY: ','fpc_distinstall'#010+ #010+ 'fpc_distinstall: install exampleinstall'#010+ #010+ @@ -2178,15 +2180,15 @@ const fpcmakeini : array[0..267,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zip','sourceinstall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipi','nstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ - 'else'#010+ - 'PACKDIR=/tmp/','fpc-pack'#010+ + 'else',#010+ + 'PACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -2200,7 +2202,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)','$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPRE','FIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ @@ -2219,7 +2221,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use a wrapper script by d','efault for Os/2'#010+ + '# Use a wrapp','er script by default for Os/2'#010+ 'ifndef inUnix'#010+ 'USEZIPWRAPPER=1'#010+ 'endif'#010+ @@ -2228,8 +2230,9 @@ const fpcmakeini : array[0..267,1..240] of char=( '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ - 'e','lse'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(S','RCBATCHEXT)'+ + ')'#010+ + 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ @@ -2237,7 +2240,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREX','T)'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZ','IPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ @@ -2246,21 +2249,21 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ - ' $(MAKE) $(ZIPTARG','ET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + ' $(M','AKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(ECHOREDIR) -e "$(subst ','\,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ + ' $(ECHOREDIR',') -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ 'PER)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ - ' ',' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZI','PWRAPPER)'#010+ + ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ @@ -2271,8 +2274,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'else'#010+ ' $(ZIPWRAPPER)'#010+ 'endif'#010+ - 'endif'#010+ - ' $(D','EL) $(ZIPWRAPPER)'#010+ + 'end','if'#010+ + ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ @@ -2280,9 +2283,9 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURCESUFFIX)'#010+ + 'SOURCESUFFIX)'#010, #010+ - 'fpc_zipexampl','einstall:'#010+ + 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ 'PEXAMPLESUFFIX)'#010+ @@ -2293,7 +2296,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '###############################','#####################################'+ + '#################','###################################################'+ '#'#010+ '# Clean rules'#010+ '#####################################################################'#010+ @@ -2301,7 +2304,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),','$(CLEANEXEFIL'+ + 'override CLEANEXEFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#010+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ 'GFILES))'#010+ @@ -2310,7 +2313,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ - 'override CLEANEXE','DBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+ + 'ove','rride CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+ 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ @@ -2319,27 +2322,27 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(P','PUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'override CLEANPPULINKFILE','S:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ 'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+ 'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ - 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+ - 'I','LES)))'#010+ + 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT','),$(CLEANPP'+ + 'UFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+ 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+ - 'LENAMES))'#010+ - 'overr','ide CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ + 'L','ENAMES))'#010+ + 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+ 'X),$(CLEANPPULINKFILENAMES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ - 'endif'#010, + ' -$(DEL) $(CLEANEX','EFILES)'#010+ + 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ ' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+ @@ -2348,7 +2351,7 @@ const fpcmakeini : array[0..267,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL)',' $(CLEANPPULINKFILES)'#010+ + ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2357,13 +2360,13 @@ const fpcmakeini : array[0..267,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ - 'end','if'#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 *_scr'+ 'ipt.res *_link.res'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ - 'TCHEXT)'#010, + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppasli','nk$('+ + 'BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ @@ -2374,7 +2377,7 @@ const fpcmakeini : array[0..267,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL) $(CLEANPPULINKFIL','ES)'#010+ + ' -$(DEL) $(C','LEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2385,22 +2388,22 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ ' -$(DELTREE) units'#010+ ' -$(DELTREE) bin'#010+ - ' -$(DEL) *$(OEXT)',' *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT)'+ + ' -$','(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT)'+ ' *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#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 *_s'+ - 'cript.res *_link.res'#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$(BA'+ 'TCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ 'ifdef DEBUGSYMEXT'#010+ - ' -$(DEL) *$(DE','BUGSYMEXT)'#010+ + ' ',' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ @@ -2412,7 +2415,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '[baseinforules]'#010+ '#####################################################################'#010+ - '# Base info rules',#010+ + '# B','ase info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ @@ -2422,94 +2425,94 @@ const fpcmakeini : array[0..267,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) Package Name..... $(PACKAG','E_NAME)'#010+ + ' @$(ECHO) Package Name','..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ - ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ - ' @$(ECH','O) Source CPU... $(CPU_SOURCE)'#010+ + ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010, + ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ - ' @$(ECHO) Full Ta','rget.. $(FULL_TARGET)'#010+ + ' @$(','ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#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) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ - ' @$(ECHO) UnitsDir.....','... $(UNITSDIR)'#010+ + ' @$(ECHO) ',' UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Tools info =='#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO) == Tools i','nfo =='#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ - ' @$(ECHO) Cp........ $(CPP','ROG)'#010+ + ' @$(ECHO) Cp','........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ - ' ',' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ + ' @$(ECHO) FPCMake... ','$(FPCMAKE)'#010+ + ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ - ' @$(ECHO) Target Units....','...... $(TARGET_UNITS)'#010+ + ' @$(ECHO) Ta','rget Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples...','.... $(TARGET_EXAMPLES)'#010+ + ' @$(ECHO) Targ','et Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ - ' @$(ECHO)'#010+ - ' @$(','ECHO) Install Units....... $(INSTALL_UNITS)'#010+ + ' @$(ECH','O)'#010+ + ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ',' ZipName.............. $(ZIPNAME)'#010+ + ' ',' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) FullZipName.......... $(','FULLZIPNAME)'#010+ + ' @$(ECHO) FullZipNam','e.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ - ' @$(ECHO) Install libra','ry dir.. $(INSTALL_LIBDIR)'#010+ + ' @$(ECHO) ',' Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ - ' @$(ECHO) Install example d','ir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(ECHO) Ins','tall example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ - ' @$(ECHO)'#010+ + ' @$(','ECHO)'#010+ #010+ - '[inforu','les]'#010+ + '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ '#####################################################################'#010+ @@ -2519,16 +2522,16 @@ const fpcmakeini : array[0..267,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '#######################','#############################################'+ + '#########','###########################################################'+ '#'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' fpc_makefile_dirs'#010+ + ' fpc_make','file_dirs'#010+ #010+ - 'fpc','_makefile:'#010+ + 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ @@ -2537,7 +2540,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TA','RGET) $(addsuffix /Makefile.fpc,$(TAR'+ + ' $(FPCMAKE',') -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ 'GET_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ @@ -2546,7 +2549,7 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefiles: fpc_makefile fpc_makef','ile_dirs'#010+ + 'fpc_makefiles: fpc_make','file fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ @@ -2554,8 +2557,8 @@ const fpcmakeini : array[0..267,1..240] of char=( '#####################################################################'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ - 'include fpcmake.loc'#010+ - 'end','if'#010+ + 'include f','pcmake.loc'#010+ + 'endif'#010+ #010+ #010+ '[userrules]'#010+ @@ -2564,7 +2567,7 @@ const fpcmakeini : array[0..267,1..240] of char=( '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '#########################################################','###########'+ + '###########################################','#########################'+ '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ @@ -2576,8 +2579,8 @@ const fpcmakeini : array[0..267,1..240] of char=( 'else'#010+ 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ - 'endif'#010+ - 'export LCL_P','LATFORM'#010+ + 'endi','f'#010+ + 'export LCL_PLATFORM'#010+ #010+ '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ @@ -2589,7 +2592,7 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ #010+ - '# Check if the defaul','t LCLDIR is correct'#010+ + '# 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+ @@ -2598,39 +2601,39 @@ const fpcmakeini : array[0..267,1..240] of char=( 'endif'#010+ #010+ '# Check for development version'#010+ - 'ifeq ($(LCLDIR),wrong)'#010+ - 'override ','LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ - 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'ifeq ($(LCLDIR),wr','ong)'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Check for release version'#010+ - 'ifeq ($(LCLDIR),wrong)'#010+ - 'override ','LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ - 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'ifeq ($(LCLDIR),wr','ong)'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR=$(wildcard $(LCLDIR)/u','nits/$(LCL_PLATFORM) $(LCL'+ + 'override LCLUNITDIR=$(wildca','rd $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+ 'DIR)/units)'#010+ 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+ 'ts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPON','ENTDIR)'#010+ + 'override REQUIRE_PACKAGESDI','R+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ - 'override INFORULES','+=lclinfo'#010+ + 'over','ride INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ @@ -2639,14 +2642,14 @@ const fpcmakeini : array[0..267,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Unit dir......... $(LCLUN','ITDIR)'#010+ + ' @$(ECHO) LCL Unit dir...','...... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010+ #010+ '[fpmakeprerules]'#010+ '#####################################################################'#010+ '# fpmake prerules'#010+ - '###################################################','#################'+ + '#####################################','###############################'+ '#'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+ @@ -2654,21 +2657,24 @@ const fpcmakeini : array[0..267,1..240] of char=( #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ 'd --cpu parameters'#010+ - 'ifdef OS_TARGET'#010+ - 'FPC_TARG','ETOPT+=--os=$(OS_TARGET)'#010+ + 'ifdef OS_T','ARGET'#010+ + 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ 'ifdef CPU_TARGET'#010+ 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ 'endif'#010+ + 'ifdef SUB_TARGET'#010+ + 'FPC_TARGETOPT+=--subtarget=$(SUB_TARGET)'#010+ + 'endif'#010+ #010+ '# Get the location of the bootstrap-fpmkunit units'#010+ - 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+ - 'card $(addsuffix /fpmkunit/Ma','kefile.fpc,$(PACKAGESDIR))))))'#010+ + 'PACKAGEDIR_FPMKUNIT:=','$(firstword $(subst /Makefile.fpc,,$(strip $(wi'+ + 'ldcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ ')'#010+ - 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ - 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmku','nit.pp'#010+ + 'override COMPILER_FPMAKE_UN','ITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ + 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ #010+ @@ -2676,72 +2682,75 @@ const fpcmakeini : array[0..267,1..240] of char=( 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ - '[fpmakerules]'#010+ + '[fpmakerules]'#010, '#####################################################################'#010+ - '# fpmake',' rules'#010+ + '# fpmake rules'#010+ '#####################################################################'#010+ '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ 'pleinstall'#010+ #010+ - '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ - 'ake uses it'#039's o','wn.'#010+ + '# D','o not pass the Makefile'#039's unit and binary target locations. f'+ + 'pmake uses it'#039's own.'#010+ 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ '# Compose general fpmake-parameters'#010+ 'ifdef FPMAKEOPT'#010+ - 'FPMAKE_OPT+=$(FPMAKEOPT)'#010+ + 'FPMAKE_OPT+=$(','FPMAKEOPT)'#010+ 'endif'#010+ 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ - 'FPMAKE_OPT+=--globalunit','dir=$(FPCDIR)/packages'#010+ + 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ 'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+ 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ 'FPMAKE_OPT+=-bu'#010+ + 'ifdef FPC_DOTTEDUNITS'#010+ + 'FPM','AKE_OPT+=-ns'#010+ + 'endif'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ 'ifdef UNIXHier'#010+ - 'FPMAKE_INSTALL_OPT+=--prefix=$(','INSTALL_PREFIX)'#010+ + 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ + 'FPMAKE_INSTALL_OPT+=--p','refix=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'override ALLTARGET+=fpc_fpmake'#010+ 'override INSTALLTARGET+=fpc_fpmake_install'#010+ - 'override EXAMPLE','INSTALLTARGET+=fpc_fpmake_exampleinstall'#010+ + 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+ '# If no fpmake exists and (dist)clean is called, do not try to build f'+ - 'pmake, it will'#010+ + '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+ + 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ 'override CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ - ' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+ - 'T=,$(FPMAKE_BUILD_OPT))'#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_UNI'+ - 'TDIR)) $(FPMAKE_BUILD_OPT)'#010+ + ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ + 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ 'fpc_fpmake: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ + ' ',' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) clean $(FP','MAKE_OPT)'#010+ + ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ - 'PT)'#010+ + 'PT)'#010, #010+ '# This is not completely valid. Exampleinstall should only install the'+ ' examples, while'#010+ - '# fpmake -ie installs everything, ','including the examples. This also '+ - 'means that on'#010+ + '# fpmake -ie installs everything, including the examples. This also me'+ + 'ans that on'#010+ '# a distinstall fpmake install wil be called twice.'#010+ - 'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+ + 'fpc_fpmake_example','install: $(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 1fdc956969..ffa46a2c1c 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -285,7 +285,7 @@ ARCH=$(CPU_TARGET) endif endif -ifeq ($(FULL_TARGET),aarch64-embedded) +ifeq ($(CPU_OS_TARGET),aarch64-embedded) # override FPCOPT+=-Cp$(SUBARCH) endif @@ -295,7 +295,7 @@ FPMAKE_OPT+=--subtarget=$(SUB_TARGET) endif -ifeq ($(FULL_TARGET),arm-embedded) +ifeq ($(CPU_OS_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=armv4t or SUBARCH=armv7m) must be defined) @@ -303,7 +303,7 @@ endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) +ifeq ($(CPU_OS_TARGET),avr-embedded) ifeq ($(SUBARCH),) # we don't add a default here, people should explicitly add the SUBARCH $(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) @@ -311,7 +311,7 @@ endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(CPU_OS_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) # we don't add a default here, people should explicitly add the SUBARCH $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -319,21 +319,21 @@ endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(CPU_OS_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 -ifeq ($(FULL_TARGET),xtensa-freertos) +ifeq ($(CPU_OS_TARGET),xtensa-freertos) ifeq ($(SUBARCH),) $(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),arm-freertos) +ifeq ($(CPU_OS_TARGET),arm-freertos) ifeq ($(SUBARCH),) $(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined) endif @@ -2517,6 +2517,9 @@ endif ifdef CPU_TARGET FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +ifdef SUB_TARGET +FPC_TARGETOPT+=--subtarget=$(SUB_TARGET) +endif # Get the location of the bootstrap-fpmkunit units PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2550,6 +2553,9 @@ FPMAKE_OPT+=$(FPC_TARGETOPT) FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT)) FPMAKE_OPT+=--compiler=$(FPC) FPMAKE_OPT+=-bu +ifdef FPC_DOTTEDUNITS +FPMAKE_OPT+=-ns +endif FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR) ifdef UNIXHier