From 1602d3743ce4dd7881d913d75aa52eafce6b336e Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 14 Sep 2018 14:07:38 +0000 Subject: [PATCH] Add SHAREDLIBEXT=.a for AIX OS to fpcmake.ini git-svn-id: trunk@39757 - --- utils/fpcm/fpcmake.inc | 419 ++++++++++++++++++++--------------------- utils/fpcm/fpcmake.ini | 1 + 2 files changed, 209 insertions(+), 211 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 92079184d3..474f9815c1 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1160,11 +1160,12 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifeq ($(OS_TARGET),aix)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ + 'SHAREDLIBEXT=.a'#010+ 'SHORTSUFFIX=aix'#010+ 'endif'#010+ #010+ '# Java'#010+ - 'ifeq ($(OS_TARGET),jav','a)'#010+ + 'ifeq (','$(OS_TARGET),java)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ @@ -1182,7 +1183,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# MS-DOS'#010+ - 'ifeq ($(OS_TARGET),msdo','s)'#010+ + 'ifeq ($','(OS_TARGET),msdos)'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHORTSUFFIX=d16'#010+ @@ -1200,8 +1201,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_TARGET),win16)'#010+ - 'S','TATICLIBPREFIX='#010+ + 'ifeq ($(OS_','TARGET),win16)'#010+ + 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w16'#010+ @@ -1211,7 +1212,7 @@ 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=fpcmade.$(SHORTSUFFIX)',#010+ + 'FPCMADE=fpcmad','e.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ @@ -1222,7 +1223,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ - 'ZIPCROSSPREFIX=$(TARGET','SUFFIX)-'#010+ + 'ZIPCROS','SPREFIX=$(TARGETSUFFIX)-'#010+ 'else'#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ @@ -1232,8 +1233,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '#####################################################################', - #010+ + '#####################################################','###############'+ + '#'#010+ #010+ '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ @@ -1243,8 +1244,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ - 'ifndef ASPROG'#010+ - 'ifdef CROS','SBINDIR'#010+ + 'ifndef A','SPROG'#010+ + 'ifdef CROSSBINDIR'#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ @@ -1258,9 +1259,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'else'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - '# Resource',' compiler'#010+ + '# Resource compiler'#010+ 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ @@ -1274,9 +1275,9 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'ARPROG=$(ARNAME)'#010+ + 'ARPROG=$(AR','NAME)'#010+ + 'endif'#010+ 'endif'#010+ - 'endi','f'#010+ #010+ '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ @@ -1290,8 +1291,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ 'LD=$(LDPROG)'#010+ - 'RC=$(RCPROG)'#010+ - 'AR=$(ARP','ROG)'#010+ + 'RC=$(','RCPROG)'#010+ + 'AR=$(ARPROG)'#010+ 'NASM=$(NASMPROG)'#010+ #010+ '# ppas.bat / ppas.sh'#010+ @@ -1309,7 +1310,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=$(shell $(DATE) ','+%Y%m%d)'#010+ + 'DATESTR:=','$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ 'endif'#010+ @@ -1329,15 +1330,15 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '##########################################################','##########'+ + '##########################################','##########################'+ '#'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ - 'ifndef NOCPUDEF'#010+ - 'override F','PCOPTDEF=$(ARCH)'#010+ + 'ifndef NOC','PUDEF'#010+ + 'override FPCOPTDEF=$(ARCH)'#010+ 'endif'#010+ #010+ #010+ @@ -1348,9 +1349,9 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ 'override FPCOPT+=-P$(ARCH)'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - 'ifeq ($(OS','_SOURCE),openbsd)'#010+ + 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ @@ -1358,7 +1359,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-XP$(BINUTIL','SPREFIX)'#010+ + 'override FPCO','PT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ @@ -1367,9 +1368,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-freeb'+ - 'sd'#010+ - '# with B','INUTILSPREFIX=i386-)'#010+ + '# it while compiling the fpmake file. (For example to build i386-','fre'+ + 'ebsd'#010+ + '# with BINUTILSPREFIX=i386-)'#010+ 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ @@ -1377,8 +1378,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# User dirs should be first, so they are looked at first'#010+ - 'ifdef UNITDI','R'#010+ + '# User dirs should be first, so they are looked at fi','rst'#010+ + 'ifdef UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ @@ -1388,8 +1389,8 @@ 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+ - 'endi','f'#010+ + 'override FPCOPT+=$(addprefix -Fi',',$(INCDIR))'#010+ + 'endif'#010+ #010+ '# Smartlinking'#010+ 'ifdef LINKSMART'#010+ @@ -1408,7 +1409,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 load fpc.cfg)'#010+ '# fpc 2.1 has -O2 for all targets'#010+ 'ifdef RELEASE'#010+ 'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ @@ -1419,8 +1420,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'FPCCPUOPT:=-O1r'#010+ 'endif'#010+ 'else'#010+ - 'FPCCPUOPT:=-O2'#010+ - 'endi','f'#010+ + 'FPC','CPUOPT:=-O2'#010+ + 'endif'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ @@ -1436,8 +1437,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ - 'ifdef VERBOSE'#010+ - 'overri','de FPCOPT+=-vwni'#010+ + 'ifde','f VERBOSE'#010+ + 'override FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ '# Needed compiler options'#010+ @@ -1447,17 +1448,17 @@ 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+=$(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+ - 'endif'#010+ + 'endif'#010, #010+ - '# Cross compile','r utils'#010+ + '# Cross compiler utils'#010+ 'ifdef CROSSBINDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ @@ -1466,7 +1467,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ - 'override TARGETDIRPR','EFIX='#010+ + 'over','ride TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ @@ -1475,8 +1476,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ - 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ - 'override U','NITTARGETDIRPREFIX='#010+ + 'ifeq ($(COMPILER_UNITTARGETDI','R),.)'#010+ + 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ @@ -1484,10 +1485,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 CR','EATESHARED'#010+ + 'ifdef CREATESHARED'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ #010+ @@ -1495,7 +1496,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 $(CPU_TARGET),x86_64',' mips mipsel),)'#010+ + 'ifneq ($(findstring $(CP','U_TARGET),x86_64 mips mipsel),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ @@ -1510,8 +1511,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ - 'ifdef OTHERLIBDIR'#010+ - 'o','verride FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'ifd','ef OTHERLIBDIR'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1521,8 +1522,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 opti'+ - 'ons pro','vided in FPMAKEBUILDOPT'#010+ + '# Override options to compile the fpmake-binary with command-','line op'+ + 'tions provided in FPMAKEBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ @@ -1532,8 +1533,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+ - 'ifd','ef CFGFILE'#010+ + '# Was a config file',' specified ?'#010+ + 'ifdef CFGFILE'#010+ 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ @@ -1544,7 +1545,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET',')'#010+ + 'override AFULL_TARGET=$(CPU_TAR','GET)-$(OS_TARGET)'#010+ 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ @@ -1556,7 +1557,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Compiler commandline'#010+ - 'override COMPILER:=$(strip $(FPC) $(F','PCOPT))'#010+ + 'override COMPILER:=$(','strip $(FPC) $(FPCOPT))'#010+ #010+ '# also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ @@ -1564,8 +1565,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '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),$(FULL_TARGET))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ @@ -1581,7 +1582,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '####################################################','################'+ + '####################################','################################'+ '#'#010+ '# Loaders'#010+ '#####################################################################'#010+ @@ -1591,7 +1592,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+ - 'override INSTALLTARGE','T+=fpc_loaders_install'#010+ + 'overr','ide INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ @@ -1600,8 +1601,8 @@ 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+ - 'end','if'#010+ + ' $(AS) -o ','$*$(OEXT) $<'#010+ + 'endif'#010+ #010+ 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ @@ -1612,18 +1613,18 @@ const fpcmakeini : array[0..244,1..240] of char=( 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ 'endif'#010+ - #010+ - 'fpc_loaders_inst','all:'#010+ + #010, + 'fpc_loaders_install:'#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+ - 'endif'#010+ + 'e','ndif'#010+ #010+ #010+ - '[unitrule','s]'#010+ + '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1631,13 +1632,13 @@ const fpcmakeini : array[0..244,1..240] of char=( '.PHONY: fpc_units'#010+ #010+ 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ - 'override ALLTARGET+=f','pc_units'#010+ + 'overr','ide ALLTARGET+=fpc_units'#010+ #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+ + 'override C','LEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ @@ -1646,7 +1647,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[exerules]'#010+ '#####################################################################'#010+ '# Exes'#010+ - '####################################################','################'+ + '####################################','################################'+ '#'#010+ #010+ '.PHONY: fpc_exes'#010+ @@ -1655,18 +1656,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:=$(addsuffix $(OEXT),$(TA','RGET_PROGRAMS)) $(addpre'+ + 'override EXEOFILES:=$(addsuf','fix $(OEXT),$(TARGET_PROGRAMS)) $(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+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGE','T_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(','AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1678,7 +1679,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '############################','########################################'+ + '############','########################################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1686,7 +1687,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILE','S)'#010+ + 'override CLEANRST','FILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ @@ -1697,23 +1698,23 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifneq ($(TARGET_EXAMPLES),)'#010+ - 'HASEXAMPLES=','1'#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),$(TAR','GET_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 $(STATICLIBEXT),$(TARGE'+ - 'T_EXAMPLES)))'#010+ - 'o','verride EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES'+ - '))'#010+ + '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARG', + 'ET_EXAMPLES)))'#010+ + 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ + #010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUT','EXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(','addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1723,7 +1724,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(T','ARGET_EXAMPLED'+ + 'fpc_examples: all $(EXAMPLEFILES) $(ad','dsuffix _all,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ @@ -1732,7 +1733,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_all fpc_smart fpc_debug fp','c_release fpc_shared'#010+ + '.PHONY: fpc_all fpc_sm','art fpc_debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1743,9 +1744,9 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all DEBUG=1'#010+ + ' $(MAKE) all DEB','UG=1'#010+ #010+ - 'fpc_releas','e:'#010+ + 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ '# General compile rules, available for both possible .pp and .pas exte'+ @@ -1754,7 +1755,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+ - ' $(MKDIRTREE) $(COMPILER_U','NITTARGETDIR)'#010+ + ' $(MKDIRTR','EE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ @@ -1768,7 +1769,7 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ - ' $(COMPILER',') $<'#010+ + ' ',' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ @@ -1783,20 +1784,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_INCLUDEDIR)'#010+ - 'vpath %.dp','r $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUD','EDIR)'#010+ + 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ - '###########################################################','#########'+ + '###########################################','#########################'+ '#'#010+ '# Library'#010+ '#####################################################################'#010+ @@ -1809,7 +1810,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ #010+ - 'ifndef SHARED_LIBNA','ME'#010+ + 'ifn','def SHARED_LIBNAME'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ #010+ @@ -1819,16 +1820,16 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ - 'ifndef SHARED_LIBUNITS'#010+ - 'SHARED_LIBU','NITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ + 'ifndef SHARED_LIBU','NITS'#010+ + 'SHARED_LIBUNITS:=$(TARGET_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 ($(SHARE','D_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+ @@ -1837,7 +1838,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ 'fpc_shared_install:'#010+ - 'ifneq ($(SHARED_BUILD),n',')'#010+ + 'ifneq ($','(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ @@ -1847,7 +1848,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ #010+ '[installrules]'#010+ - '#########################','###########################################'+ + '#########','###########################################################'+ '#'#010+ '# Install rules'#010+ '#####################################################################'#010+ @@ -1855,7 +1856,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$(ad','dsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override INSTA','LLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ @@ -1864,24 +1865,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+ + '# 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)) $(addprefix $(STATICLIBPRE','FIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'LES)) $(addprefi','x $(STATICLIBPREFIX),$(subst $(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 $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES)))'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ '$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPULINKFILES:=$(wildc','ard $(addprefix $(UNITTARGETDIR'+ + 'override INSTALLPPULI','NKFILES:=$(wildcard $(addprefix $(UNITTARGETDIR'+ 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ @@ -1890,7 +1891,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INSTALLEXEFILES:=$(addpre','fix $(TARGETDIRPREFIX),$(notdir $('+ + 'override INSTALLEX','EFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $('+ 'INSTALLEXEFILES)))'#010+ 'endif'#010+ 'endif'#010+ @@ -1900,14 +1901,14 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(MKDIR) $(INSTALL_BINDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ - 'ifdef INSTALL_CREA','TEPACKAGEFPC'#010+ + 'if','def INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ - ' $(FPCMAKE) -p -T$(CPU_','TARGET)-$(OS_TARGET) Makefile.fpc'#010+ + ' $(FPCM','AKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -1916,13 +1917,13 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) $(INSTALLPPUFILES) ','$(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(I','NSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ - ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDI','R)'#010+ + ' $(INSTALL) $(LIB_FULLNAME)',' $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ @@ -1933,14 +1934,14 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ - 'fpc_sourceinstall: distclea','n'#010+ + 'fpc_sourcei','nstall: 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) $(INSTALL_EXAMPLEDIR',')'#010+ + ' $(MKDIR) $(IN','STALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ @@ -1950,9 +1951,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'AMPLEDIR)'#010+ 'endif'#010+ #010+ - '[distinstallrules]'#010+ - '##########','##########################################################'+ - '#'#010+ + '[distinstallr','ules]'#010+ + '#####################################################################'#010+ '# Dist Install'#010+ '#####################################################################'#010+ #010+ @@ -1961,15 +1961,14 @@ const fpcmakeini : array[0..244,1..240] of char=( 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ - '[zipinstallrules]'#010+ - '#########','###########################################################'+ - '#'#010+ + '[zipinstall','rules]'#010+ + '#####################################################################'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ - '# Temporary path to pack a file, ca','n 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+ @@ -1979,8 +1978,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Maybe create default zipname from packagename'#010+ - 'if','ndef ZIPNAME'#010+ + '# Maybe create default zipname fro','m packagename'#010+ + 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ @@ -1994,8 +1993,8 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ - 'ifdef DIST_ZIPTARGET'#010+ - 'ZI','PTARGET=DIST_ZIPTARGET'#010+ + 'ifdef D','IST_ZIPTARGET'#010+ + 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ 'endif'#010+ @@ -2013,7 +2012,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be abl','e to run in the current OS so fix'#010+ + '# W','e need to be able to run in the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ @@ -2022,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+ - 'ZIP','CMD_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+ - 'else'#010+ - 'ZIPDESTFILE:','=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ + 'e','lse'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(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+ - ' $(MKDIR) $(DIST_DESTD','IR)'#010+ + ' $(MKD','IR) $(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+ - ' $(ECHOREDIR) -e "$(subst',' \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ + ' $(ECHORE','DIR) -e "$(subst \,\\,$(ZIPCMD_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 $(ZIPCMD_CDBASE) >>',' $(ZIPWRAPPER)'#010+ + ' echo $(Z','IPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -2063,7 +2062,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPC','MD_CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPC','MD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ @@ -2073,7 +2072,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=exa','mpleinstall ZIPSUFFIX=$('+ + ' $(MAKE) fpc_zipinsta','ll ZIPTARGET=exampleinstall ZIPSUFFIX=$('+ 'ZIPEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ @@ -2084,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+ @@ -2092,7 +2091,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ - 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREF','IX),$(CLEANEXE'+ + 'override CLEANEXEDBGFILES:=$(addprefix',' $(TARGETDIRPREFIX),$(CLEANEXE'+ 'DBGFILES))'#010+ 'endif'#010+ #010+ @@ -2100,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 '+ - '$(EXEDBGEXT), $(CLE','AN_PROGRAMS)))'#010+ + '$(E','XEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ @@ -2109,22 +2108,22 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(addprefix $(STATICLIBPREFIX),$(subst ','$(PPUEXT),$(STATICLIBEXT),$'+ + ') $(addprefix $(STATICLIB','PREFIX),$(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),$(CLEANPP'+ - 'UFILES))'#010+ + 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ + 'ILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'IX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLE','ANEXEFILES)'#010+ + ' ',' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ @@ -2133,7 +2132,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES)',',)'#010+ + 'ifneq ($(CL','EANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ @@ -2143,15 +2142,15 @@ const fpcmakeini : array[0..244,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $','(LIB_FULLNAME)'#010+ + ' -$(DE','L) $(LIB_NAME) $(LIB_FULLNAME)'#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+ - 'ifdef CLEANEXE','FILES'#010+ + 'fpc_cleanall: $(CLEANTARGET',')'#010+ + 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -2161,9 +2160,8 @@ const fpcmakeini : array[0..244,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL',') $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+ - #010+ + 'ifdef CLEANRSTFILE','S'#010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ @@ -2171,14 +2169,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$(BATCHEXT) ppas$(BATC','HEXT) ppaslink$(BATCHEXT'+ + ' -$(DEL) *_ppas$(BATC','HEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT'+ ')'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ @@ -2190,8 +2188,8 @@ const fpcmakeini : array[0..244,1..240] of char=( ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ ' -$(DEL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ - #010+ - 'fpc_distclean: c','leanall'#010+ + #010, + 'fpc_distclean: cleanall'#010+ #010+ #010+ '[baseinforules]'#010+ @@ -2201,7 +2199,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '.PHONY: fpc_baseinfo'#010+ #010+ - 'override INFORULES+=fpc_baseinfo'#010, + 'override INFORULE','S+=fpc_baseinfo'#010+ #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ @@ -2209,94 +2207,94 @@ const fpcmakeini : array[0..244,1..240] of char=( ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Configuration info =='#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO) == Configurat','ion 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. $(TARGETSUFFIX)'#010+ - ' @','$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ + ' @$(ECHO) TargetSuffix. $(TARGETS','UFFIX)'#010+ + ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ - ' @$(EC','HO) FPCDir.......... $(FPCDIR)'#010+ + ' @$(ECHO) Basedir......... $(BASEDI','R)'#010+ + ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) GCC library..... $(GCCLIBD','IR)'#010+ + ' @$(ECHO) GCC librar','y..... $(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+ - ' @$(E','CHO) Rc........ $(RC)'#010+ + ' @$(ECHO) Ar........ $(','AR)'#010+ + ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ - ' @$(ECHO) Echo...... $(ECHO)'#010+ - ' ',' @$(ECHO) Shell..... $(SHELL)'#010+ + ' @$(ECHO) Echo....','.. $(ECHO)'#010+ + ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Object info ','=='#010+ + ' @$(ECHO) ',' == Object info =='#010+ ' @$(ECHO)'#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) Targe','t 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) ZipCrossPrefix....... ','$(ZIPCROSSPREFIX)'#010+ + ' @$(ECHO) ZipCro','ssPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install base dir.','.... $(INSTALL_BASEDIR)'#010+ + ' @$(ECHO) I','nstall base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ - ' @$(ECHO) Install source dir... $','(INSTALL_SOURCEDIR)'#010+ + ' @$(ECHO) Install',' source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Dist d','estination 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+ @@ -2306,7 +2304,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ - '#############################################################','#######'+ + '#############################################','#######################'+ '#'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ @@ -2318,7 +2316,7 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' $(FPCMAKE) -w -T$(OS','_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + ' $(FP','CMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ 'GET_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ @@ -2326,7 +2324,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TA','RGE'+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(T','ARGET_DIRS) $(TARGE'+ 'T_EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ @@ -2335,9 +2333,8 @@ const fpcmakeini : array[0..244,1..240] of char=( #010+ '[localmakefile]'#010+ '#####################################################################'#010+ - '# Local Makefile'#010+ - '##############','######################################################'+ - '#'#010+ + '# Local Makefil','e'#010+ + '#####################################################################'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ @@ -2347,7 +2344,7 @@ const fpcmakeini : array[0..244,1..240] of char=( '[userrules]'#010+ '#####################################################################'#010+ '# Users rules'#010+ - '##########################','##########################################'+ + '##########','##########################################################'+ '#'#010+ #010+ '[lclrules]'#010+ @@ -2355,8 +2352,8 @@ const fpcmakeini : array[0..244,1..240] of char=( '# LCL Rules'#010+ '#####################################################################'#010+ #010+ - '# LCL Platform'#010+ - 'ifndef LCL_PLATF','ORM'#010+ + '# LCL Platform'#010, + 'ifndef LCL_PLATFORM'#010+ 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ @@ -2368,7 +2365,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+ - 'ifeq ($(wildcard $','(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'if','eq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ @@ -2378,7 +2375,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_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -2386,7 +2383,7 @@ 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+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)','/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2395,7 +2392,7 @@ 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 /us','r))))'#010+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM','),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2404,8 +2401,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)/../compone'+ - 'nts $(LCLDIR)/','components)'#010+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo','n'+ + 'ents $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ @@ -2413,7 +2410,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '########################################################','############'+ + '########################################','############################'+ '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ @@ -2424,23 +2421,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)$(FPMAKEBIN)'#010+ + 'LOCALFPMAKEBIN=.$(PATHSEP)$(FP','MAKEBIN)'#010+ #010+ - '# Conv','ert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os '+ - 'and --cpu parameters'#010+ + '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ + 'd --cpu parameters'#010+ 'ifdef OS_TARGET'#010+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ @@ -2448,42 +2445,42 @@ const fpcmakeini : array[0..244,1..240] of char=( 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ - '# Get the location of the bootstrap-fpmkunit un','its'#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+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ - 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ - ')'#010+ - 'ov','erride COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ + 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(','SOURCESUFF'+ + 'IX)'#010+ + 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ #010+ 'ifdef FPMAKE_SKIP_CONFIG'#010+ - 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONF','IG)'#010+ + 'override FPMAKE_BUILD_OPT+=$(','FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ '[fpmakerules]'#010+ '#####################################################################'#010+ '# fpmake rules'#010+ '#####################################################################'#010+ - '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_f','pmake_ex'+ + '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpma','ke_install fpc_fpmake_ex'+ 'ampleinstall'#010+ #010+ '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ 'ake uses it'#039's own.'#010+ 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ - '# Compose general fpmake-parameters'#010+ - '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+=-bu'#010, + 'FPMAKE_OPT+=--compiler=$(FPC)'#010, + 'FPMAKE_OPT+=-bu'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ 'ifdef UNIXHier'#010+ @@ -2491,22 +2488,22 @@ const fpcmakeini : array[0..244,1..240] of char=( 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BAS','EDIR)'#010+ + 'FPMAKE_INSTALL_OPT+=--pref','ix=$(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 ofte','n fail because the dependencies are cleared.'#010+ + 'pmake, it ','will'#010+ + '# most often fail because the dependencies are cleared.'#010+ '# In case of a clean, simply do nothing'#010+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ 'override CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ - ' $(MAKE) -C $(PACKAGEDIR_F','PMKUNIT) bootstrap $(addprefix '+ + ' $(MAKE) -','C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ 'OPT=,$(FPMAKE_BUILD_OPT))'#010+ #010+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ @@ -2514,7 +2511,7 @@ const fpcmakeini : array[0..244,1..240] of char=( 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ 'fpc_fpmake: $(FPMAKEBIN)'#010+ - ' $(LOCALFP','MAKEBIN) compile $(FPMAKE_OPT)'#010+ + ' ',' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ @@ -2523,12 +2520,12 @@ const fpcmakeini : array[0..244,1..240] of char=( ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ 'PT)'#010+ #010+ - '# This is not comp','letely valid. Exampleinstall should only install t'+ + '# ','This is not completely valid. Exampleinstall should only install t'+ 'he examples, while'#010+ '# fpmake -ie installs everything, including the examples. This also me'+ 'ans that on'#010+ '# a distinstall fpmake install wil be called twice.'#010+ - 'fpc_fpmake_exampleinstall: $(FPMAKEBI','N)'#010+ + 'fpc_fpmake_exampleins','tall: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ 'LL_OPT)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 071978d0ec..34812d1072 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -1104,6 +1104,7 @@ endif ifeq ($(OS_TARGET),aix) BATCHEXT=.sh EXEEXT= +SHAREDLIBEXT=.a SHORTSUFFIX=aix endif