diff options
| -rw-r--r-- | utils/fpcm/fpcmake.inc | 802 | ||||
| -rw-r--r-- | utils/fpcm/fpcmake.ini | 16 |
2 files changed, 409 insertions, 409 deletions
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 01b14e32eb..6d54618b0d 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -291,62 +291,56 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# Cross compile flag'#010+ - 'ifeq ($(OS_TARGET),darwin)'#010+ - 'ifneq ($(OS_SOURCE),darwin)'#010+ - 'CROSSCOMPILE=1'#010+ - 'endif'#010+ - 'else'#010+ 'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#010+ 'CROSSCOMPILE=1'#010+ 'endif'#010+ - 'endif'#010+ #010+ - '# Check if the Makef','ile supports this target, but not'#010+ + '# Check if the Makefile supports this target, but not'#010+ '# when the make target is to rebuild the makefile'#010+ - 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ + 'ifeq',' ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ 'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+ - '$(error The Makefile doesn'#039't support target $(FULL_TA','RGET), plea'+ - 'se run fpcmake first)'#010+ + '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+ + ' run fpcmake first)'#010+ 'endif'#010+ 'endif'#010+ #010+ #010+ - '# Detect BSD, since BSD uses a slightly different directory hierarchy.'+ - #010+ + '# Detect BSD, since BSD uses a slightly d','ifferent directory hierarch'+ + 'y.'#010+ 'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#010+ 'BSDhier=1'#010+ 'endif'#010+ #010+ '# Detect Linux, will also use its own directory hierarchy.'#010+ - 'if','eq ($(OS_TARGET),linux)'#010+ + 'ifeq ($(OS_TARGET),linux)'#010+ 'linuxHier=1'#010+ 'endif'#010+ #010+ - 'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL'+ - '_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+ + 'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CP','U_SOURCE FULL_TARGET FU'+ + 'LL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+ #010+ #010+ '[fpcdircheckenv]'#010+ - '#############################################################','#######'+ - '#'#010+ - '# FPCDIR Setting'#010+ '#####################################################################'#010+ + '# FPCDIR Setting'#010+ + '##############################################################','######'+ + '#'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ - 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl un','its)),)'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ #010+ - '# Default FPCDIR from Makefile.fpc'#010+ + '# Default FPCDIR f','rom Makefile.fpc'#010+ 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ - 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl',' units)),)'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -354,21 +348,21 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '[fpcdirdetect]'#010+ '# Detect FPCDIR'#010+ - 'ifeq ($(FPCDIR),wrong)'#010+ + 'ifeq ','($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ - 'override FPCDIR=/usr/lib/fpc/$(FPC_','VERSION)'#010+ + 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ - 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ + 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(a','d'+ + 'dsuffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'if','eq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ - 'override FPCDIR:=$(BASEDIR)'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ + 'override FPCDIR:=$(BASEDIR)'#010+ + 'ifeq ($(','wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR=c:/pp'#010+ 'endif'#010+ 'endif'#010+ @@ -378,36 +372,43 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '# Cross binaries dir'#010+ 'ifndef CROSSBINDIR'#010+ - 'CROSSBINDIR:=','$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+ + 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+ + 'endif'#010+ + #010+ + '# Default binutils prefix for cross com','pile when the'#010+ + '# crossbindir is not set (except for Darwin)'#010+ + 'ifeq ($(OS_TARGET),darwin)'#010+ + 'ifeq ($(OS_SOURCE),darwin)'#010+ + 'DARWIN2DARWIN=1'#010+ + 'endif'#010+ 'endif'#010+ #010+ - '# Default binutils prefix for cross compile when the'#010+ - '# crossbindir is not set'#010+ 'ifndef BINUTILSPREFIX'#010+ 'ifndef CROSSBINDIR'#010+ 'ifdef CROSSCOMPILE'#010+ - 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+ + 'ifndef DARWIN2DARWIN'#010+ + 'BINUTILSPREFIX=$(','CPU_TARGET)-$(OS_TARGET)-'#010+ + 'endif'#010+ + 'endif'#010+ 'endif'#010+ - 'endi','f'#010+ 'endif'#010+ #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/$(OS_TARGET))'#010+ + 'UNITSDIR:=$(wildcard $(FP','CDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ #010+ - '# Package','s dir'#010+ + '# Packages dir'#010+ 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/package'+ 's/base $(FPCDIR)/packages/extra)'#010+ #010+ #010+ '[shelltools]'#010+ '#####################################################################'#010+ - '# Shell tools'#010+ - '################################','####################################'+ - '#'#010+ + '# Sh','ell tools'#010+ + '#####################################################################'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ 'ifndef ECHOREDIR'#010+ @@ -418,10 +419,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# To copy pograms'#010+ + '# To copy po','grams'#010+ 'ifndef COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ '# Copy a whole tree'#010+ 'ifndef COPYTREE'#010+ @@ -437,10 +438,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifndef MOVE'#010+ 'MOVE:=$(MVPROG) -f'#010+ 'endif'#010+ - #010+ + #010, '# Check delete program'#010+ 'ifndef DEL'#010+ - 'DEL:=$(R','MPROG) -f'#010+ + 'DEL:=$(RMPROG) -f'#010+ 'endif'#010+ #010+ '# Check deltree program'#010+ @@ -455,11 +456,11 @@ const fpcmakeini : array[0..216,1..240] of char=( 'else'#010+ 'INSTALL:=$(COPY)'#010+ 'endif'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ - 'i','fdef inUnix'#010+ + 'ifdef inUnix'#010+ 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ @@ -471,18 +472,18 @@ const fpcmakeini : array[0..216,1..240] of char=( 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ 'endif'#010+ #010+ - 'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKD'+ - 'IR'#010+ + 'export ECHOREDIR COPY COPYTREE MOVE DEL DE','LTREE INSTALL INSTALLEXE M'+ + 'KDIR'#010+ #010+ #010+ - '[defaultd','irs]'#010+ + '[defaultdirs]'#010+ '#####################################################################'#010+ '# Default Directories'#010+ '#####################################################################'#010+ #010+ '# Units dir'#010+ - 'ifdef REQUIRE_UNITSDIR'#010+ - 'override UNITSDIR+=$(REQUIRE_UNITSDIR',')'#010+ + 'ifdef REQUIRE_UNIT','SDIR'#010+ + 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ #010+ '# Units dir'#010+ @@ -492,8 +493,8 @@ const fpcmakeini : array[0..216,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+ - '# use the source os as def','ault'#010+ + '# When zipping use the target os default, when norm','al install then'#010+ + '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ @@ -506,8 +507,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When install prefix is not set try to use prefix'#010+ - 'i','fndef INSTALL_PREFIX'#010+ + '# When ins','tall prefix is not set try to use prefix'#010+ + 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ 'endif'#010+ @@ -518,8 +519,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_PREFIX=/usr/local'#010+ 'else'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_BASEDIR:=/pp',#010+ + 'ifd','ef INSTALL_FPCPACKAGE'#010+ + 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -530,10 +531,10 @@ const fpcmakeini : array[0..216,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_FPCSUBDIR'#010+ + 'expor','t INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ - '# Where to plac','e the resulting zip files'#010+ + '# Where to place the resulting zip files'#010+ 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ @@ -542,7 +543,7 @@ const fpcmakeini : array[0..216,1..240] of char=( '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ - 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFI','X)'#010+ + 'COMPILER_UNITTARGET','DIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ 'else'#010+ 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -553,17 +554,16 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ #010+ '#####################################################################'#010+ - '# Install Directories'#010+ - '############################','########################################'+ - '#'#010+ + '# Instal','l Directories'#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+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ @@ -573,16 +573,16 @@ const fpcmakeini : array[0..216,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:','=$(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+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESU','FFIX)'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDI','R)/$(TARGETSUFFIX)'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ @@ -593,8 +593,8 @@ const fpcmakeini : array[0..216,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+ - 'ifdef ','INSTALL_FPCPACKAGE'#010+ + 'INSTALL_UNITDIR:=$(INS','TALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -604,9 +604,9 @@ const fpcmakeini : array[0..216,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:=','$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ - 'INSTALL_LIBDIR:','=$(INSTALL_UNITDIR)'#010+ + 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -618,18 +618,18 @@ const fpcmakeini : array[0..216,1..240] of char=( 'else'#010+ 'ifdef linuxHier'#010+ 'SRCPREFIXDIR=share/src'#010+ - 'else'#010+ + 'else',#010+ 'SRCPREFIXDIR=src'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTAL','L_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_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_NAME)'#010+ - 'e','ndif'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFI','XDIR)/fpc-$(FPC_VERSI'+ + 'ON)/$(PACKAGE_NAME)'#010+ + 'endif'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ '(PACKAGE_VERSION)'#010+ @@ -637,8 +637,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ - 'CKAGE_NAME)'#010, + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/so','urce/$(INSTALL_FPCSUBDIR)/$('+ + 'PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -649,10 +649,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# Where the doc files will be stored'#010+ - 'ifndef INSTALL_DOCDIR'#010+ + 'ifndef INSTALL_DOCDI','R'#010+ 'ifdef UNIXHier'#010+ 'ifdef BSDhier'#010+ - 'DOCPREFIXDI','R=share/doc'#010+ + 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ 'ifdef linuxHier'#010+ 'DOCPREFIXDIR=share/doc'#010+ @@ -662,10 +662,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ - '(PACKAGE_NAME)'#010+ + '(PACKAGE_NAME',')'#010+ 'else'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$','(DOCPREFIXDIR)/$(PACKAGE_NAME)-$('+ - 'PACKAGE_VERSION)'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ + 'CKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -674,17 +674,17 @@ const fpcmakeini : array[0..216,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - '# Where to install the examples, und','er 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/examples/fpc-$(FPC_VERSION'+ - ')/','$(PACKAGE_NAME)'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_','PREFIX)/share/examples/fpc-$(FPC_VERSI'+ + 'ON)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ @@ -696,16 +696,16 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ 'else'#010+ #010+ - 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PR','EFIX)/share/examples/$(PACKAGE_NAME)'+ - '-$(PACKAGE_VERSION)'#010+ + 'ifde','f BSDhier'#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_VE'+ - 'RSION)',#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREF','IX)/doc/$(PACKAGE_NAME)-$(PACKAGE_'+ + 'VERSION)'#010+ 'endif'#010+ #010+ 'endif'#010+ @@ -719,8 +719,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the some extra (data)files will be stored'#010+ - 'ifnd','ef INSTALL_DATADIR'#010+ + '# Where the ','some extra (data)files will be stored'#010+ + 'ifndef INSTALL_DATADIR'#010+ 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ @@ -728,27 +728,27 @@ const fpcmakeini : array[0..216,1..240] of char=( 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+ 'endif'#010+ #010+ - '#####################################################################'#010+ - '# Cross compile 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 INSTA','LL_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_SOURC','E))'#010+ 'endif'#010+ 'endif'#010+ 'else'#010+ 'CROSSBINDIR='#010+ 'endif'#010+ #010+ - #010, + #010+ '[dirlibc]'#010+ '# On linux, try to find where libgcc.a is.'#010+ 'ifeq ($(OS_SOURCE),linux)'#010+ @@ -757,8 +757,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifndef GCCLIBDIR'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ - 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname',' `gcc -m32 -print-libgcc-file-name`)'#010+ + 'ifeq ($(BI','NUTILSPREFIX),)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -769,19 +769,19 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Try cross gcc'#010+ + '# Tr','y cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ - 'CROSSGCC=$(st','rip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ - 'EEXT),$(SEARCHPATH))))'#010+ + 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ + 'XT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Other libraries from ld.so.conf'#010+ + '# Other libraries fr','om ld.so.conf'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBD','IR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+ - '" "; print $1 }'#039')'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ + '"; print $1 }'#039')'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -793,19 +793,18 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ #010+ - '[extensions]'#010+ - '###################################','#################################'+ - '#'#010+ + '[exten','sions]'#010+ + '#####################################################################'#010+ '# Default extensions'#010+ '#####################################################################'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ 'BATCHEXT=.bat'#010+ - 'LOADEREXT=.as'#010+ + 'LOADEREXT=.as'#010, 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ - 'OEXT=.','o'#010+ + 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ @@ -814,21 +813,21 @@ const fpcmakeini : array[0..216,1..240] of char=( 'STATICLIBPREFIX=libp'#010+ 'IMPORTLIBPREFIX=libimp'#010+ 'RSTEXT=.rst'#010+ - '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ - ' has this'#010+ + '#DEBUGSYMEXT #for debugger symbol files, define only for targe','ts whi'+ + 'ch has this'#010+ #010+ - '# 1.0.x has target spec','ific extensions for ppu files and objects'#010+ + '# 1.0.x has target specific extensions for ppu files and objects'#010+ 'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ '# short version for 1.1 and above - no target specific extensions'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ - 'STATICLIBPREFIX='#010+ + 'STATICLIBPR','EFIX='#010+ 'SHORTSUFFIX=v1'#010+ 'endif'#010+ #010+ '# Go32v2'#010+ - 'ifeq ','($(OS_TARGET),go32v2)'#010+ + 'ifeq ($(OS_TARGET),go32v2)'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=dos'#010+ 'endif'#010+ @@ -843,10 +842,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# Linux'#010+ - 'ifeq ($(OS_TARGET),linux)'#010+ + 'ifeq ($(OS_T','ARGET),linux)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAR','EDLIB=1'#010+ + 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=lnx'#010+ 'endif'#010+ #010+ @@ -862,12 +861,12 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ + 'HASSHAREDLIB=','1'#010+ 'SHORTSUFFIX=nbs'#010+ 'endif'#010+ #010+ '# OpenBSD'#010+ - 'ifeq ($','(OS_TARGET),openbsd)'#010+ + 'ifeq ($(OS_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -882,10 +881,10 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '# OS/2'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'BATCHEXT=.cmd'#010+ + 'BATCHEXT=.cm','d'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBE','XT=.dll'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'endif'#010+ @@ -901,10 +900,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# Amiga'#010+ - 'ifeq ($(OS_TARGET),amiga)'#010+ + 'ifeq ($(OS_TARGET),amiga',')'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ - 'SHORTSUFFI','X=amg'#010+ + 'SHORTSUFFIX=amg'#010+ 'endif'#010+ #010+ '# MorphOS'#010+ @@ -921,10 +920,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# BeOS'#010+ - 'ifeq ($(OS_TARGET),beos)'#010+ + 'ifeq ($(OS_TARGET)',',beos)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SHORTSUFFIX=be',#010+ + 'SHORTSUFFIX=be'#010+ 'endif'#010+ #010+ '# Haiku'#010+ @@ -942,11 +941,11 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# QNX'#010+ - 'ifeq ($(OS_TARGET),qnx)'#010+ + 'ifeq ($(OS_TARGET),qnx)'#010, 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=qnx'#010+ - 'endif',#010+ + 'endif'#010+ #010+ '# Netware clib'#010+ 'ifeq ($(OS_TARGET),netware)'#010+ @@ -962,10 +961,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'SHORTSUFFIX=nwl'#010+ 'endif'#010+ #010+ - '# MacOS'#010+ + '# MacO','S'#010+ 'ifeq ($(OS_TARGET),macos)'#010+ 'BATCHEXT='#010+ - 'EXEE','XT='#010+ + 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ 'SHORTSUFFIX=mac'#010+ 'endif'#010+ @@ -981,12 +980,12 @@ const fpcmakeini : array[0..216,1..240] of char=( '# gba'#010+ 'ifeq ($(OS_TARGET),gba)'#010+ 'EXEEXT=.gba'#010+ - 'SHAREDLIBEXT=.so'#010+ + 'SHAREDLIBEXT=.s','o'#010+ 'SHORTSUFFIX=gba'#010+ 'endif'#010+ #010+ '# Symbian OS'#010+ - 'ifeq',' ($(OS_TARGET),symbian)'#010+ + 'ifeq ($(OS_TARGET),symbian)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ 'endif'#010+ @@ -999,9 +998,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'PPUEXT=.pp1'#010+ 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ - 'SMARTEXT=.sl1'#010+ + 'S','MARTEXT=.sl1'#010+ 'STATICLIBEXT=.a1'#010+ - 'SHAREDLIBEXT','=.so1'#010+ + 'SHAREDLIBEXT=.so1'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=v1'#010+ 'endif'#010+ @@ -1018,9 +1017,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'SHORTSUFFIX=wat'#010+ 'endif'#010+ #010+ - '# Linux'#010+ + '#',' Linux'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ - 'BATCHEXT=','.sh'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=lnx'#010+ @@ -1037,10 +1036,10 @@ const fpcmakeini : array[0..216,1..240] of char=( '# NetBSD'#010+ 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ + 'EX','EEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=nbs'#010+ - 'endif',#010+ + 'endif'#010+ #010+ '# OpenBSD'#010+ 'ifeq ($(OS_TARGET),openbsd)'#010+ @@ -1057,11 +1056,11 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ASMEXT=.sw'#010+ 'SMARTEXT=.slw'#010+ 'STATICLIBEXT=.aw'#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'SH','AREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w32'#010+ 'endif'#010+ #010+ - '# O','S/2'#010+ + '# OS/2'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'BATCHEXT=.cmd'#010+ 'PPUEXT=.ppo'#010+ @@ -1077,9 +1076,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# Amiga'#010+ - 'ifeq ($(OS_TARGET),amiga)'#010+ + 'i','feq ($(OS_TARGET),amiga)'#010+ 'EXEEXT='#010+ - 'PPUEXT=.p','pu'#010+ + 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ @@ -1095,12 +1094,12 @@ const fpcmakeini : array[0..216,1..240] of char=( 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ - 'EXEEXT=.ttp'#010+ + 'EXEEXT=.tt','p'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ #010+ '# BeOS'#010+ - 'ifeq ($(OS','_TARGET),beos)'#010+ + 'ifeq ($(OS_TARGET),beos)'#010+ 'BATCHEXT=.sh'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ @@ -1116,11 +1115,11 @@ const fpcmakeini : array[0..216,1..240] of char=( 'BATCHEXT=.sh'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ - 'OEXT=.o'#010+ + 'OEXT=.o'#010, 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ - 'SHORT','SUFFIX=sun'#010+ + 'SHORTSUFFIX=sun'#010+ 'endif'#010+ #010+ '# QNX'#010+ @@ -1137,11 +1136,11 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '# Netware'#010+ 'ifeq ($(OS_TARGET),netware)'#010+ - 'STATICLIBPREFIX='#010+ + 'STATICLIB','PREFIX='#010+ 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ - 'SMAR','TEXT=.sl'#010+ + 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.nlm'#010+ 'EXEEXT=.nlm'#010+ @@ -1156,9 +1155,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ - 'SHAREDLIBEXT=.nlm'#010+ + 'S','HAREDLIBEXT=.nlm'#010+ 'EXEEXT=.nlm'#010+ - 'SHORTSUFFIX=n','wl'#010+ + 'SHORTSUFFIX=nwl'#010+ 'endif'#010+ #010+ '# MacOS'#010+ @@ -1175,18 +1174,18 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '#end of target specific settings'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ - '# For 8.3 limited OS'#039's the short suff','ixes'#010+ + '# For 8.3 limited OS'#039's the short suffixes'#010+ '# Otherwise use the full source/target names'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ - 'ZIPEXAMPLESUFFIX=exm'#010+ + 'ZIPEXAM','PLESUFFIX=exm'#010+ 'else'#010+ - 'FPCMADE=fpcmade.$(TARGE','TSUFFIX)'#010+ + 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ 'ZIPSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ @@ -1196,18 +1195,17 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'endif'#010+ - 'endif'#010+ + 'endif'#010, #010+ '[defaulttools]'#010+ - '##########################','##########################################'+ - '#'#010+ + '#####################################################################'#010+ '# Default Tools'#010+ '#####################################################################'#010+ #010+ '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ - 'LDNAME=$(BINUTILSPREFIX)ld'#010+ - 'ARNAME=$(BINUTILSPREFIX)a','r'#010+ + 'LDNAME=$(B','INUTILSPREFIX)ld'#010+ + 'ARNAME=$(BINUTILSPREFIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ @@ -1219,9 +1217,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# assembler, redefine it if cross compiling'#010+ + '# assembler, redefine it ','if cross compiling'#010+ 'ifndef ASPROG'#010+ - 'ifdef CRO','SSBINDIR'#010+ + 'ifdef CROSSBINDIR'#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ @@ -1232,12 +1230,12 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ - 'else'#010+ + 'el','se'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Resourc','e compiler'#010+ + '# Resource compiler'#010+ 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ @@ -1249,11 +1247,11 @@ const fpcmakeini : array[0..216,1..240] of char=( '# Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ + 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(','SRCEXEEXT)'#010+ 'else'#010+ 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ @@ -1268,11 +1266,11 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef inUnix'#010+ 'LDCONFIG=ldconfig'#010+ 'else'#010+ - 'LDCONFIG='#010+ + 'LDCONFI','G='#010+ 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=$(shell $(DA','TE) +%Y%m%d)'#010+ + 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ 'endif'#010+ @@ -1284,9 +1282,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifeq ($(OS_TARGET),go32v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ + 'i','feq ($(OS_TARGET),win32)'#010+ 'UPXPROG:=1'#010+ - 'endif'#010, + 'endif'#010+ 'ifdef UPXPROG'#010+ 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ @@ -1299,13 +1297,13 @@ const fpcmakeini : array[0..216,1..240] of char=( 'UPXPROG='#010+ 'endif'#010+ 'endif'#010+ - 'export UPXPROG'#010+ + 'export UPXPR','OG'#010+ #010+ '# Zip options'#010+ 'ZIPOPT=-9'#010+ 'ZIPEXT=.zip'#010+ #010+ - '#',' Tar options'#010+ + '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ 'TAROPT=vj'#010+ 'TAREXT=.tar.bz2'#010+ @@ -1317,9 +1315,8 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '[command_begin]'#010+ '#####################################################################'#010+ - '# Compiler Command Line'#010+ - '################################','####################################'+ - '#'#010+ + '# Compiler Com','mand Line'#010+ + '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ @@ -1328,7 +1325,7 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ #010+ - '# Load commandline OPT and add target and u','nit dir to be sure'#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+ 'endif'#010+ @@ -1338,10 +1335,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ - 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'override',' FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ - 'if','ndef CROSSBOOTSTRAP'#010+ + 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ @@ -1350,9 +1347,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# User dirs should be first, so they are looked at first'#010+ + '# User dirs should be first, so th','ey are looked at first'#010+ 'ifdef UNITDIR'#010+ - 'overr','ide FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ @@ -1361,10 +1358,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ + 'override FPCO','PT+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ - '# Sm','artlinking'#010+ + '# Smartlinking'#010+ 'ifdef LINKSMART'#010+ 'override FPCOPT+=-XX'#010+ 'endif'#010+ @@ -1378,10 +1375,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef DEBUG'#010+ 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# Release mode'#010+ - '# (strip, optimize and don',#039't load fpc.cfg)'#010+ + '# (strip, optimize and don'#039't load fpc.cfg)'#010+ '# fpc 2.1 has -O2 for all targets'#010+ 'ifdef RELEASE'#010+ 'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ @@ -1389,12 +1386,12 @@ const fpcmakeini : array[0..216,1..240] of char=( 'FPCCPUOPT:=-OG2p3'#010+ 'endif'#010+ 'ifeq ($(CPU_TARGET),powerpc)'#010+ - 'FPCCPUOPT:=-O1r'#010+ + 'FPCCPUOPT:=','-O1r'#010+ 'endif'#010+ 'else'#010+ 'FPCCPUOPT:=-O2'#010+ 'endif'#010+ - 'overr','ide FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ + 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ @@ -1408,9 +1405,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'override FPCOPT+=-O2'#010+ 'endif'#010+ #010+ - '# Verbose settings (warning,note,info)'#010+ + '# Verbose settings (warn','ing,note,info)'#010+ 'ifdef VERBOSE'#010+ - 'override FPCO','PT+=-vwni'#010+ + 'override FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ '# Needed compiler options'#010+ @@ -1420,17 +1417,17 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_LIBRARYDIR'#010+ - 'override FPCOPT+=$(add','prefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ + 'ifdef ','COMPILER_LIBRARYDIR'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_','INCLUDEDIR))'#010+ 'endif'#010+ #010+ - '# Cross compiler utils',#010+ + '# Cross compiler utils'#010+ 'ifdef CROSSBINDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ @@ -1438,9 +1435,9 @@ const fpcmakeini : array[0..216,1..240] of char=( '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ - 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ + 'ifeq ($(COMPILER','_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ - 'e','lse'#010+ + 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ @@ -1448,19 +1445,19 @@ const fpcmakeini : array[0..216,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_UNITTARGETDIR),.)'#010+ - 'override UNITTARG','ETDIRPREFIX='#010+ + 'ifeq ($(CO','MPILER_UNITTARGETDIR),.)'#010+ + 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ + 'override UNITTARGETDIRPREFIX=$(TAR','GETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'ifdef CREATESHA','RED'#010+ + 'ifdef CREATESHARED'#010+ 'override FPCOPT+=-Cg'#010+ #010+ 'ifeq ($(CPU_TARGET),i386)'#010+ @@ -1472,8 +1469,8 @@ const fpcmakeini : array[0..216,1..240] of char=( '# create always pic'#039'ed code on x86_64'#010+ 'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ - 'ifeq ($(CPU_TARGET),x86_64)'#010+ - 'override FPCOPT+=-','Cg'#010+ + 'ifeq',' ($(CPU_TARGET),x86_64)'#010+ + 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1488,8 +1485,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ - 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix ','-Fl,$(OTHERLIBDIR))'#010+ + 'ifdef',' OTHERLIBDIR'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1501,8 +1498,8 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ - 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ - 'endi','f'#010+ + 'override',' FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ + 'endif'#010+ #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ @@ -1512,11 +1509,11 @@ const fpcmakeini : array[0..216,1..240] of char=( '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ - 'override FPCOPT:=!FPCEXTCMD'#010+ + 'override FPCOPT:=!F','PCEXTCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - 'override ','AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ + 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ @@ -1524,10 +1521,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ 'ifdef ACROSSCOMPILE'#010+ - 'override FPCOPT+=$(CROSSOPT)'#010+ + 'override FPCOPT+','=$(CROSSOPT)'#010+ 'endif'#010+ #010+ - '# Compiler commandline',#010+ + '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ '# also call ppas if with command option -s'#010+ @@ -1535,8 +1532,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ - 'ifdef RUNBATC','H'#010+ + 'ifeq ($(','FULL_SOURCE),$(FULL_TARGET))'#010+ + 'ifdef RUNBATCH'#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ 'else'#010+ 'EXECPPAS:=@$(PPAS)'#010+ @@ -1548,8 +1545,8 @@ const fpcmakeini : array[0..216,1..240] of char=( '[loaderrules]'#010+ '#####################################################################'#010+ '# Loaders'#010+ - '#####################################################################', - #010+ + '###########################','#########################################'+ + '#'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ @@ -1558,20 +1555,20 @@ const fpcmakeini : array[0..216,1..240] of char=( 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'override LOADEROFILES:=$(addsuf','fix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ - '%$(O','EXT): %$(LOADEREXT)'#010+ + '%$(OEXT): %$(LOADEREXT)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFIL','ES)'#010+ #010+ 'fpc_loaders_clean:'#010+ - 'ifdef COMPILER_UNI','TTARGETDIR'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ ')'#010+ 'else'#010+ @@ -1580,33 +1577,33 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(INSTALL) $(addpre','fix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+ - 'ILES)) $(INSTALL_UNITDIR)'#010+ + 'ifdef COMPILER','_UNITTARGETDIR'#010+ + ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ + 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ #010+ #010+ '[unitrules]'#010+ - '#####################################################################'#010+ - '# Units'#010+ - '################','####################################################'+ + '####################################################','################'+ '#'#010+ + '# Units'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ - 'override IMPLICITUNITPPUFI','LES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+ - 'TUNITS))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$','(TARGET_UNITS))'#010+ + 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ + 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ - 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)',#010+ + 'fpc_units:',' $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -1616,20 +1613,20 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ '.PHONY: fpc_exes'#010+ #010+ - '# Programs are not needed for a cross installation'#010+ - 'ifndef CR','OSSINSTALL'#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)) $(addprefi'+ - 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+ - '$','(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ + 'x $(STATICLIBPREFIX),$(addsuf','fix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ + ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ 'PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ - 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFIL','ES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'if','eq ($(OS_TARGET),os2)'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1637,16 +1634,17 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ + 'fpc_exes: $(COMPILER_TARGETDIR) $(C','OMPILER_UNITTARGETDIR) $(EXEFILES'+ + ')'#010+ #010+ #010+ - '[rstr','ules]'#010+ + '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ - 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010, + 'override RSTFI','LES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ @@ -1655,27 +1653,28 @@ const fpcmakeini : array[0..216,1..240] of char=( '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '#####################################################################'#010+ + '#########################################################','###########'+ + '#'#010+ #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 EXAMPLE','FILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ + 'XAMPLES)) $(addsuffix ','.dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ - '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(ST','ATICLIBEXT),$(TAR'+ + '))) $(add','prefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'GET_EXAMPLES)))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(ad','dsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'ifeq ($(OS','_TARGET),emx)'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ @@ -1687,15 +1686,15 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ #010+ '[compilerules]'#010+ - '##############################################','######################'+ + '####','################################################################'+ '#'#010+ '# General compile rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ - '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ - ' @$(ECHORE','DIR) Compiled > $(FPCMADE)'#010+ + '$(FPCMADE): $(ALLDE','PENDENCIES) $(ALLTARGET)'#010+ + ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ #010+ @@ -1708,7 +1707,7 @@ const fpcmakeini : array[0..216,1..240] of char=( 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rules, available for both possi','ble .pp and .pas ex'+ + '# Gener','al compile rules, available for both possible .pp and .pas ex'+ 'tensions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ @@ -1717,9 +1716,9 @@ const fpcmakeini : array[0..216,1..240] of char=( ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ - ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ + ' ',' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ #010+ - '%','$(PPUEXT): %.pp'#010+ + '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1731,9 +1730,9 @@ const fpcmakeini : array[0..216,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEXT): %.pas'#010+ + '%$(EXEEXT): %.p','as'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPP','AS)'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.lpr'#010+ ' $(COMPILER) $<'#010+ @@ -1746,19 +1745,19 @@ const fpcmakeini : array[0..216,1..240] of char=( '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ - '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ - 'vpath %.pp $(COMPILER_S','OURCEDIR) $(COMPILER_INCLUDEDIR)'#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_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUD','EDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ - 'v','path %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ '# Library'#010+ - '##############################################################','######'+ + '####################','################################################'+ '#'#010+ #010+ '.PHONY: fpc_shared'#010+ @@ -1772,25 +1771,25 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifndef SHARED_LIBNAME'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ - #010+ + #010, 'ifndef SHARED_FULLNAME'#010+ - 'SHARED_FULLNAME=$(S','HAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERS'+ - 'ION)$(SHAREDLIBEXT)'#010+ + 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ + 'N)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ - 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ - 'override SHARED_LIBUNITS:=$(filter-ou','t $(INSTALL_BUILDUNIT),$(SHARED'+ - '_LIBUNITS))'#010+ + 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUN','ITS)'#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+ - ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ - 'o','$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ + ' $(PPUMOVE) -q $(SHARE','D_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ + ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ @@ -1799,7 +1798,7 @@ const fpcmakeini : array[0..216,1..240] of char=( 'fpc_shared_install:'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ - 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_','FULLNAME)),)'#010+ + 'ifneq ($(wi','ldcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ 'ALL_SHAREDDIR)'#010+ 'endif'#010+ @@ -1807,63 +1806,63 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '[installrules]'#010+ - '#####################################################################'#010+ - '# Install rules'#010+ - '######################','##############################################'+ + '##################################################################','##'+ '#'#010+ + '# Install rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ - 'endif'#010+ + 'endif',#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALL','PPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT)'+ - ',$(INSTALLPPUFILES))'#010+ + 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ + '(INSTALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX','T'+ - '),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT'+ - '),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ + 'LES)) $(addprefix $(STATIC','LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ + 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ - '$(INSTALLPPUFILES)))'#010+ - 'overrid','e INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIR'+ - 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ + 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPRE','FIX),$(notdi'+ + 'r $(INSTALLPPUFILES)))'#010+ + 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ - 'ifdef INSTALLEXEFILES'#010+ + 'ifdef INSTAL','LEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'over','ride INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $('+ - 'INSTALLEXEFILES)))'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ + 'STALLEXEFILES)))'#010+ 'endif'#010+ 'endif'#010+ #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+ - '# Compress the exes if upx is defined'#010+ + '# Compress ','the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ - ' ',' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ + ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ - '# If the fpcpackage variable is set then create and install Package.fp'+ - 'c,'#010+ - '# a safety ch','eck is done if Makefile.fpc is available'#010+ + '# If the fpcpackage variable is set then cre','ate and install Package.'+ + 'fpc,'#010+ + '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) Package.fpc $(INSTALL_UN','ITDIR)'#010+ + ' ',' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1872,41 +1871,41 @@ const fpcmakeini : array[0..216,1..240] of char=( ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ - ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ - 'e','ndif'#010+ + ' $(INSTALL) $','(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_','NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FILE','S'#010+ + 'ifdef INSTALL_FILES'#010+ ' $(MKDIR) $(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+ + ' $(COPYTREE) $(BASEDIR)/','* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall',': $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ - 'endif'#010+ + 'en','dif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COP','YTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ - 'EXAMPLEDIR)'#010+ + ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ + 'AMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ - '##############################################################','######'+ + '####################','################################################'+ '#'#010+ #010+ '.PHONY: fpc_distinstall'#010+ @@ -1917,15 +1916,16 @@ const fpcmakeini : array[0..216,1..240] of char=( '[zipinstallrules]'#010+ '#####################################################################'#010+ '# Zip'#010+ - '#####################################################################'#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+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ - 'ifndef PACKDIR'#010+ + 'ifnde','f PACKDIR'#010+ 'ifndef inUnix'#010+ - 'PACKDIR=$(BASEDIR)','/../fpc-pack'#010+ + 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ @@ -1938,10 +1938,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'else'#010+ 'ZIPNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCRO','SSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ @@ -1954,11 +1954,11 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ '# Use tar by default under linux'#010+ - 'ifndef USEZIP'#010+ + 'ifn','def USEZIP'#010+ 'ifdef inUnix'#010+ 'USETAR=1'#010+ 'endif'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ '# Use a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ @@ -1968,40 +1968,39 @@ const fpcmakeini : array[0..216,1..240] of char=( '# We need to be able to run in the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ - 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_D','ESTDIR)/fpczip$(SRCBATCHEXT)'+ - ')'#010+ + 'ZIPPATHSEP=$(PATHSEP',')'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ - 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ + 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(','BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST','_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ - 'TFILE) *'#010+ + 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(','ZIPOPT) $(ZIPD'+ + 'ESTFILE) *'#010+ 'endif'#010+ #010+ - 'fpc_zipins','tall:'#010+ + 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ - '# Handle gecho separate as we need to espace \ with \\'#010+ + '# Handle gecho separate as we need to esp','ace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' ',' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ - 'PER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ + 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ - 'ER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))"',' >> $(ZIPWRA'+ + 'PPER)'#010+ 'else'#010+ - ' echo $(ZIPC','MD_CDPACK) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ @@ -2009,9 +2008,9 @@ const fpcmakeini : array[0..216,1..240] of char=( ' /bin/sh $(ZIPWRAPPER)'#010+ 'else'#010+ 'ifdef RUNBATCH'#010+ - ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ + ' $(R','UNBATCH) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPW','RAPPER)'#010+ + ' $(ZIPWRAPPER)'#010+ 'endif'#010+ 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ @@ -2021,7 +2020,7 @@ const fpcmakeini : array[0..216,1..240] of char=( ' $(DELTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(','Z'+ + ' $(MAKE) fpc_zipin','stall ZIPTARGET=sourceinstall ZIPSUFFIX=$(Z'+ 'IPSOURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ @@ -2031,19 +2030,19 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ + ' $(MAKE) fpc_zipins','tall ZIPTARGET=distinstall'#010+ #010+ #010+ - '[cleanrules]'#010, + '[cleanrules]'#010+ '#####################################################################'#010+ '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclea','n'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=','$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ - 'ES))'#010+ + 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ + '))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ @@ -2051,22 +2050,22 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(add','prefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + 'override CLEANPPULINKFILES:=$(subst',' $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ - 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT','),$(CLEAN'+ + 'override CLEANPPU','LINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ 'PPUFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ - 'IX),$(CLEANPPULINKFILES)))'#010+ + 'IX),$(CLEANPPULINKFILES))',')'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ - 'ifdef C','LEANEXEFILES'#010+ + 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ @@ -2075,9 +2074,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTA','RGETDIRPREFIX),$(CLEANRSTFILES))'+ - #010+ + 'ifdef CLEANRST','FILES'#010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ @@ -2085,8 +2083,8 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ - 'PCEXTFILE) ','$(REDIRFILE)'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc ','$(PPAS) script.res link.res $'+ + '(FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ @@ -2095,9 +2093,9 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL) $(CLEANPPUFILES)'#010+ + ' ',' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq',' ($(CLEANPPULINKFILES),)'#010+ + 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ @@ -2105,14 +2103,14 @@ const fpcmakeini : array[0..216,1..240] of char=( 'endif'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT',') *$(ASMEXT) *$(STATICL'+ + ' ',' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ 'IBEXT) *$(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) $(REDIRFIL','E)'#010+ + ' -$(DEL) fpcmade.* Package.fpc $(PPAS) sc','ript.res link.res $('+ + 'FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ @@ -2125,7 +2123,7 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '########################################################','############'+ + '##############','######################################################'+ '#'#010+ '# Base info rules'#010+ '#####################################################################'#010+ @@ -2136,92 +2134,92 @@ const fpcmakeini : array[0..216,1..240] of char=( #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Package info =='#010+ - ' @$(EC','HO) Package Name..... $(PACKAGE_NAME)'#010+ + ' ','@$(ECHO) == Package info =='#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+ + ' @$(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) Full Source.. $(FULL_SO','URCE)'#010+ + ' @$(ECHO) Target OS.... $(OS_TARGET)',#010+ + ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Directory info =='#010+ + ' @$(ECHO) == Directory i','nfo =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ','Required pkgs... $(REQUIRE_PACKAGES)'#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+ + ' @$(ECH','O) == Tools info =='#010+ ' @$(ECHO)'#010+ - ' ',' @$(ECHO) As........ $(AS)'#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........ $(CPPROG)'#010+ - ' @','$(ECHO) Rm........ $(RMPROG)'#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) Upx....... $(UPXPROG)'#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) Target ','Loaders........ $(TARGET_LOADERS)'#010+ + ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ - ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$','(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#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 Files......... $(CLEAN_FILES)'#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECH','O) 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) DateStr.............. $(','DATESTR)'#010+ + ' @$(ECHO)'#010, + ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ - ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO)',' FullZipName.......... $(FULLZIPNAME)'#010+ + ' @$(ECHO) ZipSuffix','............ $(ZIPSUFFIX)'#010+ + ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ - ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ - ' ',' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ + ' @$(ECHO) Ins','tall 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 doc dir...... $(INSTALL_DOCDIR)'#010+ - ' @','$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#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 zip name........ $(DIST_ZIPNAME)',#010+ + ' @$(EC','HO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ @@ -2229,18 +2227,18 @@ const fpcmakeini : array[0..216,1..240] of char=( '# Info rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_info'#010+ + '.PHONY: fpc_i','nfo'#010+ #010+ 'fpc_info: $(INFORULES)'#010+ #010+ - '[makefilerule','s]'#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+ + '.PHONY: fpc_makefile fpc_makefiles ','fpc_makefile_sub1 fpc_makefile_su'+ + 'b2 \'#010+ + ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ @@ -2248,26 +2246,27 @@ const fpcmakeini : array[0..216,1..240] of char=( 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_DIRS))'#010+ + 'T_D','IRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' ',' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ - 'GET_EXAMPLEDIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ 'EXAMPLEDIRS))'#010+ #010+ - 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ + 'fpc_makefile_dirs: fpc_ma','kefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefil','es: fpc_makefile fpc_makefile_dirs'#010+ + 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ - '#####################################################################'#010+ + '###########################################################','#########'+ + '#'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc)',',)'#010+ + 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -2276,19 +2275,18 @@ const fpcmakeini : array[0..216,1..240] of char=( '#####################################################################'#010+ '# Users rules'#010+ '#####################################################################'#010+ - #010+ + #010, '[lclrules]'#010+ - '###############################','#####################################'+ - '#'#010+ + '#####################################################################'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ - 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ + 'ifneq ($(findstring $(OS_TARGET),win32 wi','n64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLATFOR','M=gtk'#010+ + 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ @@ -2297,10 +2295,10 @@ const fpcmakeini : array[0..216,1..240] of char=( 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ - 'override LCLDIR=wrong'#010+ + 'override LC','LDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override LCLDIR=wron','g'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ #010+ '# Check if the default LCLDIR is correct'#010+ @@ -2308,42 +2306,42 @@ const fpcmakeini : array[0..216,1..240] of char=( 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ - 'endif'#010+ + 'endif',#010+ 'endif'#010+ #010+ '# Check for development version'#010+ - 'if','eq ($(LCLDIR),wrong)'#010+ + 'ifeq ($(LCLDIR),wrong)'#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+ + 'e','ndif'#010+ 'endif'#010+ #010+ '# Check for release version'#010+ - 'if','eq ($(LCLDIR),wrong)'#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+ - 'override LCLDIR=wrong'#010+ + 'override LCLDIR=wrong',#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCL','UNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ - 'LDIR)/units)'#010+ + 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ + 'IR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#010+ - 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ + 'export LCLDIR LCLUNITDIR LCLCOMPO','NENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override ','REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '########################################################','############'+ + '##############','######################################################'+ '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ @@ -2353,8 +2351,8 @@ const fpcmakeini : array[0..216,1..240] of char=( ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ - ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO',') LCL Unit dir......... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LCLDI','R............... $(LCLDIR)'#010+ + ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 266586c3c3..40cd9646b7 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -276,15 +276,9 @@ SOURCESUFFIX=$(FULL_SOURCE) endif # Cross compile flag -ifeq ($(OS_TARGET),darwin) -ifneq ($(OS_SOURCE),darwin) -CROSSCOMPILE=1 -endif -else ifneq ($(FULL_TARGET),$(FULL_SOURCE)) CROSSCOMPILE=1 endif -endif # Check if the Makefile supports this target, but not # when the make target is to rebuild the makefile @@ -362,14 +356,22 @@ CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif # Default binutils prefix for cross compile when the -# crossbindir is not set +# crossbindir is not set (except for Darwin) +ifeq ($(OS_TARGET),darwin) +ifeq ($(OS_SOURCE),darwin) +DARWIN2DARWIN=1 +endif +endif + ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE +ifndef DARWIN2DARWIN BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif +endif # Try first the full target name, otherwise try only # the OS for backwards compatibility |