diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fpcm/fpcmake.inc | 677 | ||||
| -rw-r--r-- | utils/fpcm/fpcmake.ini | 4 | ||||
| -rw-r--r-- | utils/fpcm/fpcmmain.pp | 2 |
3 files changed, 341 insertions, 342 deletions
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 474f9815c1..e7624c28c3 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -497,17 +497,15 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'BINUTILSPREFIX=i686-linux-android-'#010+ 'else'#010+ - 'ifeq ($(CPU_TARGET),mipsel)'#010+ - 'BINUTILSPREFIX=mipsel-linux-android-'#010+ - 'endif'#010+ + 'BINUTILSPREFIX=$(CPU_TARGET)-linux-android-'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ 'endif'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'else'#010+ - 'BINUTILSPREFIX=$(OS_TARGET)-'#010+ + 'BINUTILSPREFIX=$(','OS_TARGET)-'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -517,7 +515,7 @@ const fpcmakeini : array[0..244,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+ @@ -527,7 +525,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[shelltools]'#010+ '#####################################################################'#010+ '# Shell tools'#010+ - '##########################','##########################################'+ + '#####################################################','###############'+ '#'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ @@ -541,10 +539,10 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# To copy pograms'#010+ 'ifndef COPY'#010+ - 'COPY:=$(CPPROG) -f','p'#010+ + 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ - '# Copy a whole tree'#010+ + '# Copy a whole tre','e'#010+ 'ifndef COPYTREE'#010+ 'COPYTREE:=$(CPPROG) -Rfp'#010+ 'endif'#010+ @@ -561,10 +559,10 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# Check delete program'#010+ 'ifndef DEL'#010+ - 'DE','L:=$(RMPROG) -f'#010+ + 'DEL:=$(RMPROG) -f'#010+ 'endif'#010+ #010+ - '# Check deltree program'#010+ + '# Ch','eck deltree program'#010+ 'ifndef DELTREE'#010+ 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ @@ -579,9 +577,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# To install programs'#010+ - 'ifndef INSTAL','LEXE'#010+ + 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ - 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ + 'INSTALLEX','E:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -596,17 +594,18 @@ const fpcmakeini : array[0..244,1..240] of char=( 'IR'#010+ #010+ #010+ - '[de','faultdirs]'#010+ - '#####################################################################'#010+ + '[defaultdirs]'#010+ + '################','####################################################'+ + '#'#010+ '# Default Directories'#010+ '#####################################################################'#010+ #010+ '# Units dir'#010+ 'ifdef REQUIRE_UNITSDIR'#010+ - 'override UNITSDIR+=$(REQUIRE_UN','ITSDIR)'#010+ + 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ #010+ - '# Units dir'#010+ + '# Units dir'#010, 'ifdef REQUIRE_PACKAGESDIR'#010+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ 'endif'#010+ @@ -614,8 +613,8 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# 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+ + '# use the source os as default'#010+ + 'ifdef ZIPINSTALL',#010+ '# Zipinstall'#010+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ @@ -627,8 +626,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When install prefix is not set try to use pr','efix'#010+ - 'ifndef INSTALL_PREFIX'#010+ + '# When install prefix is not set try to use prefix'#010+ + 'ifndef INSTALL_PREFIX'#010, 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ 'endif'#010+ @@ -640,9 +639,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'INSTALL_PREFIX=/usr/local'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_BASEDI','R:=/pp'#010+ + 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ + 'INSTALL_BASEDIR',':=/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -654,7 +653,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'export INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ - '# Where t','o place the resulting zip files'#010+ + '# Where to place the resulting zip f','iles'#010+ 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ @@ -663,9 +662,9 @@ const fpcmakeini : array[0..244,1..240] of char=( '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ - 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGE','TSUFFIX)'#010+ + 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ 'else'#010+ - 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ + 'COMPILER_UNIT','TARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ 'ifndef COMPILER_TARGETDIR'#010+ @@ -675,7 +674,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '#####################################################################'#010+ '# Install Directories'#010+ - '######################','##############################################'+ + '#################################################','###################'+ '#'#010+ #010+ '# set the base directory where to install everything'#010+ @@ -684,7 +683,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ - 'INSTALL_BASE','DIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/','$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ @@ -696,15 +695,15 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ - 'INSTALL_','BINDIR:=$(INSTALL_BASEDIR)/bin'#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+ - 'endif'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ + 'en','dif'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -714,9 +713,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010, + 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'ifdef PACKAGE_NAME'#010+ + 'if','def PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -727,8 +726,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ - 'INSTALL_L','IBDIR:=$(INSTALL_UNITDIR)'#010+ - 'endif'#010+ + 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ + 'e','ndif'#010+ 'endif'#010+ #010+ '# Where the source files will be stored'#010+ @@ -743,25 +742,25 @@ const fpcmakeini : array[0..244,1..240] of char=( 'SRCPREFIXDIR=src'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef ','INSTALL_FPCPACKAGE'#010+ - 'ifdef INSTALL_FPCSUBDIR'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ + 'ifdef IN','STALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ - ')/$(PACKAGE_N','AME)'#010+ + ')/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ - '(PACKAGE_VERSION)'#010+ + 'INSTALL_SOU','RCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+ + '-$(PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ - 'CKAGE_','NAME)'#010+ + 'CKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ + 'INSTALL_SOURCEDI','R:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ @@ -773,9 +772,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifndef INSTALL_DOCDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef BSDhier'#010+ - 'DOCPR','EFIXDIR=share/doc'#010+ + 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ - 'ifdef linuxHier'#010+ + 'ifde','f linuxHier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ 'DOCPREFIXDIR=doc'#010+ @@ -785,7 +784,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PRE','FIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$('+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACK','AGE_NAME)-$('+ 'PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ @@ -797,16 +796,16 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where to install the example','s, under linux we use the doc dir'#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+ 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VER','SI'+ - 'ON)/$(PACKAGE_NAME)'#010+ - 'else'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ + ')/$(PACKAGE_NAME)'#010+ + 'else'#010, 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ @@ -818,20 +817,20 @@ const fpcmakeini : array[0..244,1..240] of char=( 'else'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INST','ALL_PREFIX)/share/examples/$(PACKAGE_NAME)'+ + '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_VE', + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ 'RSION)'#010+ 'endif'#010+ #010+ 'endif'#010+ 'endif'#010+ - 'else'#010+ + 'e','lse'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ @@ -840,9 +839,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the some extra (data)files will be store','d'#010+ + '# Where the some extra (data)files will be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ - 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ + 'IN','STALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'ifndef INSTALL_SHAREDDIR'#010+ @@ -851,14 +850,14 @@ const fpcmakeini : array[0..244,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 CROSSBINDIR'#010+ + '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ + 'ifndef CR','OSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ @@ -867,11 +866,11 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'else'#010+ 'CROSSBINDIR='#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ #010+ '[dirlibc]'#010+ - '# On linux, try to find where libgcc.a is.'#010+ + '# On linux,',' try to find where libgcc.a is.'#010+ 'ifeq ($(OS_SOURCE),linux)'#010+ #010+ '# Amd64 to i386?'#010+ @@ -879,7 +878,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell d','irname `gcc -m32 -print-libgcc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-lib','gcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -892,7 +891,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# Try cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ - 'CROSSGC','C=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ + 'CROSSGCC=$(strip $(wildcard $(adds','uffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ 'EEXT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ @@ -901,7 +900,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# Other libraries from ld.so.conf'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTH','ERLIBDIR:=$(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+ @@ -915,7 +914,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '#############################','#######################################'+ + '########################################################','############'+ '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ @@ -925,10 +924,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ - 'PPUEXT=.ppu'#010, + 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ - 'SMARTEXT=.sl'#010+ + 'SMARTEXT=','.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ 'SHAREDLIBPREFIX=libfp'#010+ @@ -937,8 +936,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'RSTEXT=.rst'#010+ '# external debug info for executable'#010+ 'EXEDBGEXT=.dbg'#010+ - '#DEBUGSYMEXT #for debugger symbol files, defin','e only for targets whi'+ - 'ch has this'#010+ + '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ + ' ha','s this'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -955,9 +954,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# watcom'#010+ 'ifeq ($(OS_TARGET),watcom)'#010+ - 'S','TATICLIBPREFIX='#010+ + 'STATICLIBPREFIX='#010+ 'OEXT=.obj'#010+ - 'ASMEXT=.asm'#010+ + 'A','SMEXT=.asm'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=wat'#010+ 'IMPORTLIBPREFIX='#010+ @@ -973,9 +972,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Linux'#010, + '# Linux'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ - 'BATCHEXT=.sh'#010+ + 'B','ATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=lnx'#010+ @@ -991,10 +990,10 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# FreeBSD'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ - 'BATCHEXT=.sh'#010, + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=fbs'#010+ + 'SHOR','TSUFFIX=fbs'#010+ 'endif'#010+ #010+ '# NetBSD'#010+ @@ -1013,8 +1012,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'SHORTSUFFIX=obs'#010+ 'endif'#010+ #010+ - '# ','Win32'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ + '# Win32'#010+ + 'ifeq ($(OS_TARGET),wi','n32)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w32'#010+ 'endif'#010+ @@ -1031,9 +1030,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# EMX'#010+ - 'ifeq ($(OS_TARGET)',',emx)'#010+ + 'ifeq ($(OS_TARGET),emx)'#010+ 'BATCHEXT=.cmd'#010+ - 'AOUTEXT=.out'#010+ + 'AOUTEXT','=.out'#010+ 'STATICLIBPREFIX='#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=emx'#010+ @@ -1050,8 +1049,8 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# AROS'#010+ 'ifeq ($(OS_TARGET),aros)'#010+ - 'EXE','EXT='#010+ - 'SHAREDLIBEXT=.library'#010+ + 'EXEEXT='#010+ + 'SHAREDLIBEXT=.library'#010, 'SHORTSUFFIX=aros'#010+ 'endif'#010+ #010+ @@ -1069,10 +1068,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# BeOS'#010+ - 'ifeq ($(OS_TARGET),beo','s)'#010+ + 'ifeq ($(OS_TARGET),beos)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SHORTSUFFIX=be'#010+ + 'SHO','RTSUFFIX=be'#010+ 'endif'#010+ #010+ '# Haiku'#010+ @@ -1091,9 +1090,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# QNX'#010+ 'ifeq ($(OS_TARGET),qnx)'#010+ - 'BATC','HEXT=.sh'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SHORTSUFFIX=qnx'#010+ + 'SHORTSUFFI','X=qnx'#010+ 'endif'#010+ #010+ '# Netware clib'#010+ @@ -1108,9 +1107,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ - 'SHORTSUFFIX=n','wl'#010+ + 'SHORTSUFFIX=nwl'#010+ 'IMPORTLIBPREFIX=imp'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ '# MacOS'#010+ 'ifeq ($(OS_TARGET),macos)'#010+ @@ -1125,9 +1124,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=','1'#010+ + 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=dwn'#010+ - 'EXEDBGEXT=.dSYM'#010+ + 'EXEDBGEXT','=.dSYM'#010+ 'endif'#010+ #010+ '# gba'#010+ @@ -1144,8 +1143,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# NativeNT'#010+ - 'ifeq ($(OS_TARGET),N','ativeNT)'#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'ifeq ($(OS_TARGET),NativeNT)'#010+ + 'SHAREDLIBEXT=.dll'#010, 'SHORTSUFFIX=nativent'#010+ 'endif'#010+ #010+ @@ -1165,8 +1164,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Java'#010+ - 'ifeq (','$(OS_TARGET),java)'#010+ - 'OEXT=.class'#010+ + 'ifeq ($(OS_TARGET),java)'#010+ + 'OEXT=.cl','ass'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=java'#010+ @@ -1183,8 +1182,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# MS-DOS'#010+ - 'ifeq ($','(OS_TARGET),msdos)'#010+ - 'STATICLIBPREFIX='#010+ + 'ifeq ($(OS_TARGET),msdos)'#010+ + 'STATICLI','BPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHORTSUFFIX=d16'#010+ 'endif'#010+ @@ -1201,8 +1200,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_','TARGET),win16)'#010+ - 'STATICLIBPREFIX='#010+ + 'ifeq ($(OS_TARGET),win16)'#010+ + 'STATICLIBPRE','FIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w16'#010+ @@ -1212,8 +1211,8 @@ const fpcmakeini : array[0..244,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=fpcmad','e.$(SHORTSUFFIX)'#010+ - 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ + 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ + 'ZIPSUFFIX=','$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ @@ -1223,8 +1222,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ - 'ZIPCROS','SPREFIX=$(TARGETSUFFIX)-'#010+ - 'else'#010+ + 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ + 'el','se'#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'endif'#010+ @@ -1233,10 +1232,9 @@ const fpcmakeini : array[0..244,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '#####################################################','###############'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '# Names of the binutils tools'#010+ + '# Names o','f the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ @@ -1244,9 +1242,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ - 'ifndef A','SPROG'#010+ + 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ + 'ASP','ROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ @@ -1259,10 +1257,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'else'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ '# Resource compiler'#010+ - 'ifndef RCPROG'#010+ + 'i','fndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1275,11 +1273,11 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'ARPROG=$(AR','NAME)'#010+ + 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# NASM assembler, redefine it if cross compiling'#010+ + '# NASM a','ssembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+ @@ -1291,9 +1289,9 @@ const fpcmakeini : array[0..244,1..240] of char=( '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ 'LD=$(LDPROG)'#010+ - 'RC=$(','RCPROG)'#010+ + 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ - 'NASM=$(NASMPROG)'#010+ + 'NASM=$','(NASMPROG)'#010+ #010+ '# ppas.bat / ppas.sh'#010+ 'ifdef inUnix'#010+ @@ -1310,8 +1308,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=','$(shell $(DATE) +%Y%m%d)'#010+ - 'else'#010+ + 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ + 'el','se'#010+ 'DATESTR='#010+ 'endif'#010+ #010+ @@ -1330,15 +1328,15 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '##########################################','##########################'+ - '#'#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 NOC','PUDEF'#010+ - 'override FPCOPTDEF=$(ARCH)'#010+ + 'ifndef NOCPUDEF'#010+ + 'override FPCOPTDEF=$(','ARCH)'#010+ 'endif'#010+ #010+ #010+ @@ -1349,9 +1347,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ 'override FPCOPT+=-P$(ARCH)'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ - 'ifeq ($(OS_SOURCE),openbsd)'#010+ + 'ifeq ($(OS_SOURCE),op','enbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ @@ -1359,8 +1357,8 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCO','PT+=-XP$(BINUTILSPREFIX)'#010+ - 'endif'#010+ + 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ + 'en','dif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ @@ -1368,9 +1366,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# When BINUTILSPREFIX is given and we are not cross-compiling then use'+ #010+ - '# it while compiling the fpmake file. (For example to build i386-','fre'+ - 'ebsd'#010+ - '# with BINUTILSPREFIX=i386-)'#010+ + '# it while compiling the fpmake file. (For example to build i386-freeb'+ + 'sd'#010+ + '# with BINUTILSPREF','IX=i386-)'#010+ 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ @@ -1378,9 +1376,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# User dirs should be first, so they are looked at fi','rst'#010+ + '# User dirs should be first, so they are looked at first'#010+ 'ifdef UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ + 'override ','FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ @@ -1389,10 +1387,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi',',$(INCDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ - '# Smartlinking'#010+ + '# Smartl','inking'#010+ 'ifdef LINKSMART'#010+ 'override FPCOPT+=-XX'#010+ 'endif'#010+ @@ -1409,7 +1407,7 @@ const fpcmakeini : array[0..244,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 l','oad fpc.cfg)'#010+ '# fpc 2.1 has -O2 for all targets'#010+ 'ifdef RELEASE'#010+ 'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ @@ -1420,9 +1418,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'FPCCPUOPT:=-O1r'#010+ 'endif'#010+ 'else'#010+ - 'FPC','CPUOPT:=-O2'#010+ + 'FPCCPUOPT:=-O2'#010+ 'endif'#010+ - 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ + 'override ','FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ @@ -1437,8 +1435,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ - 'ifde','f VERBOSE'#010+ - 'override FPCOPT+=-vwni'#010+ + 'ifdef VERBOSE'#010+ + 'override FPCOPT+=','-vwni'#010+ 'endif'#010+ #010+ '# Needed compiler options'#010+ @@ -1448,18 +1446,18 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_LIBRARYDIR',#010+ - 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ + 'ifdef COMPILER_LIBRARYDIR'#010+ + 'override FPCOPT+=$(addpref','ix -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+ - 'endif'#010, + 'endif'#010+ #010+ '# Cross compiler utils'#010+ - 'ifdef CROSSBINDIR'#010+ + 'ifd','ef CROSSBINDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ @@ -1467,8 +1465,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ - 'over','ride TARGETDIRPREFIX='#010+ - 'else'#010+ + 'override TARGETDIRPREFIX='#010+ + 'else'#010, 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ @@ -1476,8 +1474,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '# Unit target dir (default is units/<cpu>-<os>/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ - 'ifeq ($(COMPILER_UNITTARGETDI','R),.)'#010+ - 'override UNITTARGETDIRPREFIX='#010+ + 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ + 'override UNITTARGETDI','RPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ @@ -1485,10 +1483,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ - 'endif',#010+ + 'endif'#010+ 'endif'#010+ #010+ - 'ifdef CREATESHARED'#010+ + 'ifdef CREATESHARED'#010, 'override FPCOPT+=-Cg'#010+ 'endif'#010+ #010+ @@ -1496,7 +1494,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '# on unix-like systems'#010+ 'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+ 'x solaris),)'#010+ - 'ifneq ($(findstring $(CP','U_TARGET),x86_64 mips mipsel),)'#010+ + 'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipse','l),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ @@ -1511,8 +1509,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ - 'ifd','ef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'ifdef OTHERLIBDIR'#010+ + 'override FPC','OPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1522,8 +1520,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Override options to compile the fpmake-binary with command-','line op'+ - 'tions provided in FPMAKEBUILDOPT'#010+ + '# Override options to compile the fpmake-binary with command-line opti'+ + 'ons provided in FP','MAKEBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ @@ -1533,8 +1531,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ - '# Was a config file',' specified ?'#010+ - 'ifdef CFGFILE'#010+ + '# Was a config file specified ?'#010+ + 'ifdef CFGFILE'#010, 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ @@ -1545,8 +1543,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - 'override AFULL_TARGET=$(CPU_TAR','GET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ + 'override ','AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ @@ -1557,16 +1555,16 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Compiler commandline'#010+ - 'override COMPILER:=$(','strip $(FPC) $(FPCOPT))'#010+ + 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ #010+ - '# also call ppas if with command option -s'#010+ + '# ','also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ '# or if -sh is used'#010+ 'ifneq (,$(findstring -sh ,$(COMPILER)))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ - 'ifneq (,$(findstring -s ,$(COMPILER)','))'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ + 'ifneq (,$(findstring -s ,$(COMPILER)))'#010+ + 'ifeq ($(FULL_SOURCE),$(F','ULL_TARGET))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ @@ -1582,7 +1580,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '####################################','################################'+ + '###############################################################','#####'+ '#'#010+ '# Loaders'#010+ '#####################################################################'#010+ @@ -1592,7 +1590,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifneq ($(TARGET_LOADERS),)'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ - 'overr','ide INSTALLTARGET+=fpc_loaders_install'#010+ + 'override INSTALLTARGET+=fpc_load','ers_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ @@ -1601,10 +1599,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ - ' $(AS) -o ','$*$(OEXT) $<'#010+ + ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ + 'fpc_loa','ders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1613,32 +1611,33 @@ const fpcmakeini : array[0..244,1..240] of char=( 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ 'endif'#010+ - #010, + #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ #010+ '[unitrules]'#010+ - '#####################################################################'#010+ + '########','############################################################'+ + '#'#010+ '# Units'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ - 'overr','ide ALLTARGET+=fpc_units'#010+ + 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'o','verride UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override C','LEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILE','S) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ @@ -1647,7 +1646,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[exerules]'#010+ '#####################################################################'#010+ '# Exes'#010+ - '####################################','################################'+ + '###############################################################','#####'+ '#'#010+ #010+ '.PHONY: fpc_exes'#010+ @@ -1656,18 +1655,18 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ - 'override EXEOFILES:=$(addsuf','fix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRA','MS)) $(addpre'+ 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ 'PROGRAMS)))'#010+ - 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$','(TARGET_PROGRAMS))'#010+ + 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ #010+ - 'override ALLTARGET+=fpc_exes'#010+ + 'overrid','e 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),$(TARGET_PROGRAMS)',')'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1679,7 +1678,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '############','########################################################'+ + '#######################################','#############################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1687,10 +1686,10 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRST','FILES+=$(RSTFILES)'#010+ + 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ - #010+ + #010, '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ @@ -1698,23 +1697,23 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifneq ($(TARGET_EXAMPLES','),)'#010+ + 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ - 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ - 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+ - 'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix',' $(EXEEXT),$(TARGET_EXAMPLES))'#010+ + 'override ','EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+ + 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ + '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLE','S))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ - '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARG', - 'ET_EXAMPLES)))'#010+ - 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ - #010+ + '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGE'+ + 'T_EXAMPLES)))'#010+ + 'override EXA','MPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES'+ + '))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(','addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARG','ET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1724,7 +1723,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(ad','dsuffix _all,$(TARGET_EXAMPLED'+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMP','LED'+ 'IRS))'#010+ #010+ #010+ @@ -1733,7 +1732,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_all fpc_sm','art fpc_debug fpc_release fpc_shared'#010+ + '.PHONY: fpc_all fpc_smart fpc_debug fpc_release f','pc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1744,10 +1743,10 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all DEB','UG=1'#010+ + ' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ - ' $(MAKE) all RELEASE=1'#010+ + ' ','$(MAKE) all RELEASE=1'#010+ #010+ '# General compile rules, available for both possible .pp and .pas exte'+ 'nsions'#010+ @@ -1755,7 +1754,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ - ' $(MKDIRTR','EE) $(COMPILER_UNITTARGETDIR)'#010+ + ' $(MKDIRTREE) $(COMPILER_UNITTARGETDI','R)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ @@ -1769,8 +1768,8 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ - ' ',' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(COMPILER) $<'#010+ + ' ',' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ @@ -1784,21 +1783,20 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%.res: %.rc'#010, - ' windres -i $< -o $@'#010+ + '%.res: %.rc'#010+ + ' windres -i $< -o $@',#010+ #010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUD','EDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.dpr $(COMPILE','R_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ - '###########################################','#########################'+ - '#'#010+ + '#####################################################################'#010, '# Library'#010+ '#####################################################################'#010+ #010+ @@ -1810,8 +1808,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ #010+ - 'ifn','def SHARED_LIBNAME'#010+ - 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ + 'ifndef SHARED_LIBNAME'#010+ + 'SHARED_L','IBNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ #010+ 'ifndef SHARED_FULLNAME'#010+ @@ -1820,16 +1818,16 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ - 'ifndef SHARED_LIBU','NITS'#010+ - 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ + 'ifndef SHARED_LIBUNITS'#010+ + 'SHARED_LIBUNITS:=$(TAR','GET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ 'endif'#010+ #010+ 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ - ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=','1'#010+ - 'ifneq ($(SHARED_BUILD),n)'#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)'#010+ 'endif'#010+ @@ -1838,8 +1836,8 @@ const fpcmakeini : array[0..244,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_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ 'ALL_SHAREDDIR)'#010+ @@ -1848,7 +1846,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '[installrules]'#010+ - '#########','###########################################################'+ + '####################################','################################'+ '#'#010+ '# Install rules'#010+ '#####################################################################'#010+ @@ -1856,7 +1854,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTA','LLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override INSTALLPPUFILES+=$(addsuffix $(P','PUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ @@ -1865,24 +1863,24 @@ const fpcmakeini : array[0..244,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)) $(addprefi','x $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'LES)) $(addprefix $(STATICLIBPREFIX),$(subs','t $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'else'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES',')) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'LES)) $(addprefix $(STATICLIBP','REFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES)))'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ '$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPULI','NKFILES:=$(wildcard $(addprefix $(UNITTARGETDIR'+ + 'override INSTALLPPULINKFILES:=$(wildcard $(addpr','efix $(UNITTARGETDIR'+ 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ @@ -1891,7 +1889,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INSTALLEX','EFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $('+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGE','TDIRPREFIX),$(notdir $('+ 'INSTALLEXEFILES)))'#010+ 'endif'#010+ 'endif'#010+ @@ -1901,14 +1899,14 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(MKDIR) $(INSTALL_BINDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ - 'if','def INSTALL_CREATEPACKAGEFPC'#010+ + 'ifdef INSTALL_CREATEPACKAGEFP','C'#010+ 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ - ' $(FPCM','AKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ + ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(O','S_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -1917,14 +1915,14 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) $(I','NSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_U','NITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ - ' $(INSTALL) $(LIB_FULLNAME)',' $(INSTALL_LIBDIR)'#010+ - 'ifdef inUnix'#010+ + ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ + 'ifdef in','Unix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -1934,16 +1932,16 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ - 'fpc_sourcei','nstall: distclean'#010+ - ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ + 'fpc_sourceinstall: distclean'#010+ + ' $','(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ 'ARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MKDIR) $(IN','STALL_EXAMPLEDIR)'#010+ + ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef EXAMPLESOURCEFILES'#010+ + 'ifd','ef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ @@ -1951,8 +1949,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'AMPLEDIR)'#010+ 'endif'#010+ #010+ - '[distinstallr','ules]'#010+ - '#####################################################################'#010+ + '[distinstallrules]'#010+ + '#####################','###############################################'+ + '#'#010+ '# Dist Install'#010+ '#####################################################################'#010+ #010+ @@ -1961,14 +1960,15 @@ const fpcmakeini : array[0..244,1..240] of char=( 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ - '[zipinstall','rules]'#010+ - '#####################################################################'#010+ + '[zipinstallrules]'#010+ + '####################','################################################'+ + '#'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ - '# Temporary path to',' pack a file, can only use a single deep'#010+ + '# Temporary path to pack a file, can only use ','a single deep'#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ @@ -1978,8 +1978,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Maybe create default zipname fro','m packagename'#010+ - 'ifndef ZIPNAME'#010+ + '# Maybe create default zipname from packagename'#010+ + 'ifndef ZIPNAM','E'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ @@ -1993,8 +1993,8 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ - 'ifdef D','IST_ZIPTARGET'#010+ - 'ZIPTARGET=DIST_ZIPTARGET'#010+ + 'ifdef DIST_ZIPTARGET'#010+ + 'ZIPTARGET=DIS','T_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ 'endif'#010+ @@ -2012,7 +2012,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# W','e need to be able to run in the current OS so fix'#010+ + '# We need to be able to run in',' the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ @@ -2021,35 +2021,35 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ - '# Create commands to create the ','zip/tar file'#010+ - 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + '# Create commands to create the zip/tar file'#010+ + 'ZIPCMD_CDPACK:','=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ - 'e','lse'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ + 'else'#010+ + 'ZIPDESTFILE:=$(DIST_DES','TDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ - ' $(MKD','IR) $(DIST_DESTDIR)'#010+ - ' $(DEL) $(ZIPDESTFILE)'#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))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHORE','DIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIP','CMD_ZIP))" >> $(ZIPWRAPPE'+ 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(Z','IPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPP','ER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -2062,7 +2062,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPC','MD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010, 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ @@ -2072,7 +2072,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zipinsta','ll ZIPTARGET=exampleinstall ZIPSUFFIX=$('+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall',' ZIPSUFFIX=$('+ 'ZIPEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ @@ -2083,7 +2083,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[cleanrules]'#010+ '#####################################################################'#010+ '# Clean rules'#010+ - '###','#################################################################'+ + '##############################','######################################'+ '#'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ @@ -2091,7 +2091,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ - 'override CLEANEXEDBGFILES:=$(addprefix',' $(TARGETDIRPREFIX),$(CLEANEXE'+ + 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEAN','EXE'+ 'DBGFILES))'#010+ 'endif'#010+ #010+ @@ -2099,7 +2099,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ - '$(E','XEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ + '$(EXEDBGEXT), $(CLEAN_PROGRAMS',')))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ @@ -2108,22 +2108,22 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(addprefix $(STATICLIB','PREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$','(STATICLIBEXT),$'+ '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ - 'UFILES)',')'#010+ + 'UFILES))'#010+ 'endif'#010+ - 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ - 'ILES))'#010+ + 'override CLEANPPUFI','LES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+ + 'UFILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'IX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' ',' -$(DEL) $(CLEANEXEFILES)'#010+ + ' -$(DEL) $(CLEANEXEFILES)',#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ @@ -2132,8 +2132,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CL','EANPPULINKFILES),)'#010+ - ' -$(DEL) $(CLEANPPULINKFILES)'#010+ + 'ifneq ($(CLEANPPULINKFILES),)'#010+ + ' ','-$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2142,16 +2142,16 @@ const fpcmakeini : array[0..244,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DE','L) $(LIB_NAME) $(LIB_FULLNAME)'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FULLNA','ME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$'+ '(BATCHEXT)'#010+ #010+ - 'fpc_cleanall: $(CLEANTARGET',')'#010+ + 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ + ' ',' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef CLEANPPUFILES'#010+ @@ -2160,8 +2160,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRSTFILE','S'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(DEL) $(addpref','ix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+ + #010+ 'endif'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ @@ -2169,14 +2170,14 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ ' -$(DELTREE) units'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *','$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010, 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ 'CEXTFILE) $(REDIRFILE)'#010+ - ' -$(DEL) *_ppas$(BATC','HEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT'+ + ' -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppasl','ink$(BATCHEXT'+ ')'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ @@ -2188,113 +2189,113 @@ const fpcmakeini : array[0..244,1..240] of char=( ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ ' -$(DEL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ - #010, + #010+ 'fpc_distclean: cleanall'#010+ #010+ #010+ - '[baseinforules]'#010+ + '[','baseinforules]'#010+ '#####################################################################'#010+ '# Base info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ - 'override INFORULE','S+=fpc_baseinfo'#010+ + 'override INFORULES+=fpc_baseinfo'#010+ #010+ - 'fpc_baseinfo:'#010+ + 'fpc_basein','fo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Configurat','ion 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) Source 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. $(TARGETS','UFFIX)'#010+ - ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ + ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ + ' @$(ECHO) FP','C fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Basedir......... $(BASEDI','R)'#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 librar','y..... $(GCCLIBDIR)'#010+ - ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ + ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ + ' ',' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ - ' @$(ECHO) Ar........ $(','AR)'#010+ - ' @$(ECHO) 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)'#010+ + ' @$(ECHO) == Object info =='#010+ + ' ','@$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ - ' @$(ECHO) Targe','t 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+ ' @$(ECHO)'#010+ - ' ',' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO) Clean Units.....','.... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ - ' @$','(ECHO)'#010+ - ' @$(ECHO) == Install info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) ==',' Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECHO) ZipCro','ssPrefix....... $(ZIPCROSSPREFIX)'#010+ + ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSP','REFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) I','nstall base dir..... $(INSTALL_BASEDIR)'#010+ + ' @$(ECHO) Install base dir..... $(INST','ALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ - ' @$(ECHO) Install',' source dir... $(INSTALL_SOURCEDIR)'#010+ + ' @$(ECHO) Install source dir... $(INSTALL_SO','URCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ - ' ','@$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ + ' @$(ECHO) Dist destination ','dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ - '#######################','#############################################'+ + '##################################################','##################'+ '#'#010+ #010+ '.PHONY: fpc_info'#010+ @@ -2304,11 +2305,10 @@ const fpcmakeini : array[0..244,1..240] of char=( '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ - '#############################################','#######################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ - ' \'#010+ + '.','PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+ + 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ @@ -2316,7 +2316,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' $(FP','CMAKE) -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+ @@ -2324,8 +2324,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(T','ARGET_DIRS) $(TARGE'+ - 'T_EXAMPLEDIRS))'#010+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ + 'EXAMPL','EDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ @@ -2333,8 +2333,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '[localmakefile]'#010+ '#####################################################################'#010+ - '# Local Makefil','e'#010+ - '#####################################################################'#010+ + '# Local Makefile'#010+ + '#########################','###########################################'+ + '#'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ @@ -2344,7 +2345,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[userrules]'#010+ '#####################################################################'#010+ '# Users rules'#010+ - '##########','##########################################################'+ + '#####################################','###############################'+ '#'#010+ #010+ '[lclrules]'#010+ @@ -2352,9 +2353,9 @@ const fpcmakeini : array[0..244,1..240] of char=( '# LCL Rules'#010+ '#####################################################################'#010+ #010+ - '# LCL Platform'#010, + '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ - 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ + 'ifneq (','$(findstring $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ 'LCL_PLATFORM=gtk'#010+ @@ -2365,7 +2366,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ - 'if','eq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'ifeq ($(wildcard $(LCLDIR)/un','its/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ @@ -2375,7 +2376,7 @@ const fpcmakeini : array[0..244,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)/units/$(LCL_PLATFO','RM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -2383,8 +2384,8 @@ const fpcmakeini : array[0..244,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+ - 'ifeq ($(LCLDIR),)'#010+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'ifeq ($','(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -2392,8 +2393,8 @@ const fpcmakeini : array[0..244,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/$(LCL_PLATFORM','),/usr/local /usr))))'#010+ - 'ifeq ($(LCLDIR),)'#010+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'ifeq ','($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -2401,8 +2402,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '# Generate dirs'#010+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ 'IR)/units)'#010+ - 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo','n'+ - 'ents $(LCLDIR)/components)'#010+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ + 'nts $(LCLDIR)/components)',#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ @@ -2410,7 +2411,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '########################################','############################'+ + '###################################################################','#'+ '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ @@ -2421,23 +2422,23 @@ const fpcmakeini : array[0..244,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+ '[fpmakeprerules]'#010+ - '####','################################################################'+ + '###############################','#####################################'+ '#'#010+ '# fpmake prerules'#010+ '#####################################################################'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ 'FPMAKEBINOBJ=fpmake$(OEXT)'#010+ - 'LOCALFPMAKEBIN=.$(PATHSEP)$(FP','MAKEBIN)'#010+ + 'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+ #010+ - '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ - 'd --cpu parameters'#010+ + '# Convert the OS_','TARGET and CPU_TARGET options to fpmake'#039's --os '+ + 'and --cpu parameters'#010+ 'ifdef OS_TARGET'#010+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ @@ -2445,65 +2446,65 @@ const fpcmakeini : array[0..244,1..240] of char=( 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ - '# Get the location of the boots','trap-fpmkunit units'#010+ - 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+ - 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ + '# Get the location of the bootstrap-fpmkunit units'#010+ + 'PACKAGE','DIR_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/$(','SOURCESUFF'+ - 'IX)'#010+ - 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ + 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ + ')'#010+ + 'override COMP','ILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ #010+ 'ifdef FPMAKE_SKIP_CONFIG'#010+ - 'override FPMAKE_BUILD_OPT+=$(','FPMAKE_SKIP_CONFIG)'#010+ + 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ - #010+ + #010, '[fpmakerules]'#010+ '#####################################################################'#010+ '# fpmake rules'#010+ '#####################################################################'#010+ - '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpma','ke_install fpc_fpmake_ex'+ - 'ampleinstall'#010+ + '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ + 'p','leinstall'#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+ - 'ifdef FPMAKEOPT'#010+ + '# Compose general fpmake-parameters'#010+ + 'ifdef FPMAKEOPT'#010, 'FPMAKE_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ 'FPMAKE_OPT+=$(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+ + 'FPMAKE_INS','TALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ 'ifdef UNIXHier'#010+ 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FPMAKE_INSTALL_OPT+=--pref','ix=$(INSTALL_BASEDIR)'#010+ - 'endif'#010+ + 'FPMAKE_INSTALL_OPT+=--prefix=$(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 f'+ - 'pmake, it ','will'#010+ - '# most often fail because the dependencies are cleared.'#010+ + 'pmake, it will'#010+ + '# most often fail beca','use 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_SRC)'#010+ - ' $(MAKE) -','C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ + ' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bo','otstrap $(addprefix '+ 'OPT=,$(FPMAKE_BUILD_OPT))'#010+ #010+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ @@ -2511,7 +2512,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ 'fpc_fpmake: $(FPMAKEBIN)'#010+ - ' ',' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ + ' $(LOCALFPMAKEBIN) co','mpile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ @@ -2520,12 +2521,12 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ 'PT)'#010+ #010+ - '# ','This is not completely valid. Exampleinstall should only install t'+ + '# This is not completely vali','d. 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 twice.'#010+ - 'fpc_fpmake_exampleins','tall: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ - 'LL_OPT)'#010 + 'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+ + ' ',' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INS'+ + 'TALL_OPT)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 34812d1072..8a54c8f688 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -461,9 +461,7 @@ else ifeq ($(CPU_TARGET),i386) BINUTILSPREFIX=i686-linux-android- else -ifeq ($(CPU_TARGET),mipsel) -BINUTILSPREFIX=mipsel-linux-android- -endif +BINUTILSPREFIX=$(CPU_TARGET)-linux-android- endif endif endif diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp index 5c35dd1252..6989235ab2 100644 --- a/utils/fpcm/fpcmmain.pp +++ b/utils/fpcm/fpcmmain.pp @@ -143,7 +143,7 @@ interface { wii } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false), - { android } ( true, false, false, false, false, true, false, false, false, false, false, true, false, false, true, false, false, false, false, false, false), + { android } ( true, false, false, false, false, true, false, false, false, false, false, true, false, false, true, false, true, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { aros } ( true, false, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), {dragonfly} ( false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), |