From 017d82efb7040dd762fb19bc01a31e5d2cc9bbfe Mon Sep 17 00:00:00 2001 From: pierre Date: Sun, 4 Jan 2015 15:30:43 +0000 Subject: [PATCH] Regenerated after 29384: Add -Cg option for mips and mipsel cpu's on unix-like systems git-svn-id: trunk@29385 - --- utils/fpcm/fpcmake.inc | 490 ++++++++++++++++++++--------------------- 1 file changed, 242 insertions(+), 248 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index d39e357122..944159bc06 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1460,21 +1460,22 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override FPCOPT+=-Cg'#010+ 'endif'#010+ #010+ - '# create always pic'#039'ed code on x86_64'#010+ - 'ifneq ($(find','string $(OS_TARGET),dragonfly freebsd openbsd netbsd li'+ - 'nux solaris),)'#010+ - 'ifeq ($(CPU_TARGET),x86_64)'#010+ + '# create always pic'#039'ed code on x86_64, mips and mip','sel'#010+ + '# on unix-like systems'#010+ + 'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+ + 'x solaris),)'#010+ + 'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifdef LINKSHARED'#010+ - '#!!! deactived for testing override FPCOPT+=-XD'#010+ + '#!!! deactived for test','ing override FPCOPT+=-XD'#010+ 'endif'#010+ #010+ #010+ '[command_libc]'#010+ - '# Add GCC lib path i','f asked'#010+ + '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ @@ -1484,10 +1485,10 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #010+ '[command_end]'#010+ - '# Add commandline options last so they can override'#010+ + '# Add commandline op','tions last so they can override'#010+ 'ifdef OPT'#010+ 'override FPCOPT+=$(OPT)'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ @@ -1496,10 +1497,10 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCOPT+=@$(CFGFILE)'#010+ + 'override FPCO','PT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ - '# Use the environment to pass commandline opt','ions?'#010+ + '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ @@ -1507,9 +1508,9 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'override AFULL_SOURCE=','$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ - 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010, + 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ 'endif'#010+ #010+ @@ -1520,21 +1521,21 @@ const fpcmakeini : array[0..225,1..240] of char=( '# Compiler commandline'#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_T','ARGET are equal'#010+ + '# also call ppa','s if with command option -s'#010+ + '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ '# or if -sh is used'#010+ 'ifneq (,$(findstring -sh ,$(COMPILER)))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'ifneq (,$(findstring -s ,$(COMPILER)))'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ + 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010, 'UseEXECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(UseEXECPPAS),1)'#010+ 'EXECPPAS='#010+ 'else'#010+ - 'if','def RUNBATCH'#010+ + 'ifdef RUNBATCH'#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ 'else'#010+ 'EXECPPAS:=@$(PPAS)'#010+ @@ -1544,9 +1545,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ '[loaderrules]'#010+ '#####################################################################'#010+ - '# Loaders'#010+ - '################################################################','####'+ - '#'#010+ + '# Load','ers'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ @@ -1554,9 +1554,9 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ - #010+ + #010, 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ - 'endif'#010, + 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1565,10 +1565,10 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(COMPI','LER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ - 'ifdef COMPILE','R_UNITTARGETDIR'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ ')'#010+ 'else'#010+ @@ -1576,34 +1576,34 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(','INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(INSTALL) $(a','ddprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+ - 'ILES)) $(INSTALL_UNITDIR)'#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 IMPLICITUNIT','PPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+ - 'TUNITS))'#010+ + 'override UNITP','PUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ + 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICIT','UNITPPUFILES)'#010+ 'endif'#010+ #010+ - 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUF','ILES)'#010+ + 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -1611,27 +1611,27 @@ const fpcmakeini : array[0..225,1..240] of char=( '# Exes'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_exes'#010+ + '.PHON','Y: fpc_exes'#010+ #010+ '# Programs are not needed for a cross installation'#010+ - 'ifnd','ef CROSSINSTALL'#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_'+ - 'PROGRAMS)))'#010+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre','f'+ + 'ix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'+ + ' $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_P'+ + 'ROGRAMS)))'#010+ 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ #010+ - 'override ALLTARGET+=fpc_exes'#010+ + 'override ALLTARGET+=','fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILE','S+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(','TARGET_PROGRAMS))'#010+ + 'ifeq ','($(OS_TARGET),emx)'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1640,10 +1640,10 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '#####################################################################'#010+ - '# Resource strings'#010+ - '###############################','#####################################'+ + '####################################################','################'+ '#'#010+ + '# Resource strings'#010+ + '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ @@ -1652,9 +1652,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ #010+ #010+ - '[examplerules]'#010+ - '##################################################################','##'+ - '#'#010+ + '[examplerules',']'#010+ + '#####################################################################'#010+ '# Examples'#010+ '#####################################################################'#010+ #010+ @@ -1662,24 +1661,24 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ - 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ - 'LES)) $(addsuffix .p','as,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ + 'override EXAMPLESOURCE','FILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+ + 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ - 'refix $','(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ + 'override ','EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+ + 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'GET_EXAMPLES)))'#010+ - 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ + 'override EXAMPLEDBGFILES:','=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES'+ + '))'#010+ #010+ - #010+ - 'override CLEANEXEFILE','S+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))',#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $','(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ @@ -1690,16 +1689,15 @@ const fpcmakeini : array[0..225,1..240] of char=( 'S))'#010+ #010+ #010+ - '[compilerules]'#010+ - '#######################################################','#############'+ - '#'#010+ + '[c','ompilerules]'#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+ - ' @$(ECHOREDIR) Comp','iled > $(FPCMADE)'#010+ + '$(','FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ + ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ #010+ @@ -1710,20 +1708,20 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ - ' $(MAKE) all RELEASE=1'#010+ + ' $(MAKE) all R','ELEASE=1'#010+ #010+ - '# General compile rules, available for both possible .pp a','nd .pas ex'+ - 'tensions'#010+ + '# General compile rules, available for both possible .pp and .pas exte'+ + 'nsions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ - '$(COMPILER_TARGETDIR):'#010+ + '$(COMPILE','R_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ #010+ - '%$(PPUEXT)',': %.pp'#010+ + '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1733,13 +1731,13 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(EXECPPAS)',#010+ #010+ '%$(EXEEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(E','XEEXT): %.lpr'#010+ + '%$(EXEEXT): %.lpr'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1750,20 +1748,21 @@ const fpcmakeini : array[0..225,1..240] of char=( '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ - '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ - 'vpath %.pp $(COMPILER_SOURCEDIR)',' $(COMPILER_INCLUDEDIR)'#010+ + '# Search pa','ths 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_INCLUDEDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %$(O','EXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ '# Library'#010+ - '#####################################################################'#010+ - #010, + '###','#################################################################'+ + '#'#010+ + #010+ '.PHONY: fpc_shared'#010+ #010+ 'override INSTALLTARGET+=fpc_shared_install'#010+ @@ -1773,27 +1772,27 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ #010+ 'ifndef SHARED_LIBNAME'#010+ - 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ + 'SHARED_LIBNAME=$(PACK','AGE_NAME)'#010+ 'endif'#010+ #010+ 'ifndef SHARED_FULLNAME'#010+ - 'SHARED_FULLNAME=$(SHAREDLIBP','REFIX)$(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-out $(INSTA','LL_BUILDUNIT),$(SHARED'+ - '_LIBUNITS))'#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 ($(SHARED_BUILD),n)'#010+ - ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ - 'o$(SHARED_','FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ + ' $(PP','UMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ + ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ @@ -1801,8 +1800,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ 'fpc_shared_install:'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ - 'ifneq ($(SHARED_LIBUNITS),)'#010+ - 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)','),)'#010+ + 'ifneq ($(SHARED_LIBUNI','TS),)'#010+ + 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ 'ALL_SHAREDDIR)'#010+ 'endif'#010+ @@ -1810,129 +1809,127 @@ const fpcmakeini : array[0..225,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+ + 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INST','ALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:','=$(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),$(STATICLIBEXT)'+ - ',$(INST','ALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ + 'LES)) $(a','ddprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ - '$(INSTALLPPUFILES)))'#010+ - 'override INSTALL','PPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIR'+ - 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ + 'override INSTALLPPUFILES:=$(addprefix $','(UNITTARGETDIRPREFIX),$(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+ + 'en','dif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INST','ALLEXEFILES:=$(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+ + ' $(MKDIR) $(INSTALL_BI','NDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ - 'end','if'#010+ + 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ - '# a safety check is done if Makefile.fpc is available'#010+ + '# a safety check is done if Makefile.fpc is availab','le'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ - ' $','(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ + ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALLPPUFILES'#010+ + 'ifdef I','NSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL',') $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ + 'ifneq ($(wildcard $(LIB_FULLNAME)','),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ - ' $(INSTALL) $(LIB_FULL','NAME) $(INSTALL_LIBDIR)'#010+ + ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL_DATADIR)'#010+ + ' $(MKDIR) $(INSTALL_DATADIR)'#010, ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ - 'fpc_so','urceinstall: distclean'#010+ + 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAM','PLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ - 'AMPLEDIR)'#010+ + ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLE','DIRS)) $(INSTALL_'+ + 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ - '#############','#######################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Dist Install'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ - 'fpc_distinstall: install exampleinstall'#010+ + 'fpc_','distinstall: install exampleinstall'#010+ #010+ #010+ '[zipinstallrules]'#010+ - '############','########################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinstall fpc_zipsourcei','nstall fpc_zipexampleinstall'#010+ #010+ - '# Temporary path to pack a file, can o','nly 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+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ - 'PACKDIR=/tmp/fpc-pack'#010+ + 'PACKDIR=/tmp/fpc-pac','k'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Maybe create default zipname from packagename'#010+ - 'ifnde','f ZIPNAME'#010+ + 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ @@ -1941,13 +1938,13 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSU','FFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ 'ifdef DIST_ZIPTARGET'#010+ - 'ZIPTA','RGET=DIST_ZIPTARGET'#010+ + 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ 'endif'#010+ @@ -1960,49 +1957,49 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use a wrapper script by default for Os/2'#010+ + '# Use a wrapper script by default ','for Os/2'#010+ 'ifndef inUnix'#010+ 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able t','o run in the current OS so fix'#010+ + '# We need to be able to run in the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ 'else'#010+ - 'ZIPPATHSEP=/'#010+ + 'ZIP','PATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD','_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#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+ + 'ZIPC','MD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(','DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#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_DESTDIR)',#010+ + ' $(MAKE) $(ZIPTARGET) INS','TALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ - 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,','\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ - 'R)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(','ZIPCMD_CDPACK))" > $(ZIPWRAP'+ + 'PER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ + #010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(','ZIPWRAPPER)'#010+ + ' ech','o $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -2013,9 +2010,9 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(ZIPWRAPPER)'#010+ 'endif'#010+ 'endif'#010+ - ' $(DEL) $(ZIPWRAPPER)'#010+ + ' $(DEL) $(Z','IPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_','CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ @@ -2023,10 +2020,10 @@ const fpcmakeini : array[0..225,1..240] of char=( ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ 'SOURCESUFFIX)'#010+ #010+ - 'fpc_zipexampleinstall:'#010+ + 'fpc_zipexampleinstal','l:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=exampl','einstall ZIPSUFFIX=$('+ - 'ZIPEXAMPLESUFFIX)'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ + 'PEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ @@ -2034,25 +2031,25 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '#####################################################################'#010+ - '# Clean rules'#010+ - '######################','##############################################'+ + '######################################','##############################'+ '#'#010+ + '# Clean rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ - '))'#010+ - 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX)',',$(CLEANEXE'+ - 'DBGFILES))'#010+ + 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEAN','EXEFIL'+ + 'ES))'#010+ + 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ + 'GFILES))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ - 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ - '$(EXEDBGEXT), $(CLEAN_','PROGRAMS)))'#010+ + 'override CLEANEXEDBGFILE','S+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+ + 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ @@ -2060,50 +2057,50 @@ const fpcmakeini : array[0..225,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(addprefix $(STATICLIBPREFIX),$(subst $(P','PUEXT),$(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),$(CLEANPP'+ - 'UFILES))'#010+ + 'override CLEANPPULINKFILES+=','$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ + 'PPUFILES))'#010+ 'endif'#010+ - 'override CL','EANPPUFILES:=$(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+ + 'fp','c_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANE','XEFILES)'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ ' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+ 'endif'#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+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ - ' -$(DEL) $(CLEAN_FILES)'#010+ + ' -$(DEL) ','$(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LI','B_FULLNAME)'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ #010+ - 'fpc_cleanall: $(CLEANTARGET)'#010+ + 'fpc_cleanall: ','$(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010, + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef CLEANPPUFILES'#010+ @@ -2112,28 +2109,27 @@ const fpcmakeini : array[0..225,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(','CLEANRSTFILES))'+ - #010+ + 'ifdef',' CLEANRSTFILES'#010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(ST','ATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ - ' ',' -$(DEL) *.o *.ppu *.a'#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)'#010+ + ' -$(DEL)',' *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ - 'i','fdef DEBUGSYMEXT'#010+ + 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ #010+ @@ -2142,9 +2138,8 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ '[baseinforules]'#010+ '#####################################################################'#010+ - '# Base info rules'#010+ - '######################################################','##############'+ - '#'#010+ + '# Ba','se info rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ @@ -2153,96 +2148,95 @@ const fpcmakeini : array[0..225,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' @$(ECHO) Package Version.. $(PACKAGE_V','ERSION)'#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) Source CPU... $(CPU_SOURCE)'#010+ - ' @$(ECHO) Targe','t CPU... $(CPU_TARGET)'#010+ + ' ',' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ + ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ - ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ - ' @$(ECHO) SourceSuffix. $','(SOURCESUFFIX)'#010+ + ' @$(E','CHO) Full Target.. $(FULL_TARGET)'#010+ + ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ - ' @$(ECHO)'#010+ + ' ','@$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ - ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) PackagesDir..... $(PA','CKAGESDIR)'#010+ + ' @$(ECHO) ','UnitsDir........ $(UNITSDIR)'#010+ + ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Tools info =='#010+ + ' @$(ECHO) == Tools in','fo =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ - ' @$','(ECHO) Ld........ $(LD)'#010+ + ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ - ' @$(ECHO) Cp........ $(CPPROG)'#010+ + ' @$(ECHO) Cp.','....... $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' @$(','ECHO) GInstall.. $(GINSTALL)'#010+ + ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ + ' @$(ECHO) FPCMake... $','(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) ','Zip....... $(ZIPPROG)'#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 Implici','t Units. $(TARGET_IMPLICITUNITS)'#010+ + ' @$(ECHO) Tar','get 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 Exampl','eDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Targe','t Examples....... $(TARGET_EXAMPLES)'#010+ + ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO',')'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ - ' @$','(ECHO) Install Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ - ' @$(ECHO) Zip','Prefix............ $(ZIPPREFIX)'#010+ + ' ',' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ + ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ - ' @$(ECHO) Install FPC Package.. $(','INSTALL_FPCPACKAGE)'#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) Install un','its dir.... $(INSTALL_UNITDIR)'#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 da','ta dir..... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Inst','all example dir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ - ' @$(ECHO)'#010+ + ' @$(E','CHO)'#010+ #010+ '[inforules]'#010+ - '##################################################','##################'+ - '#'#010+ + '#####################################################################'#010+ '# Info rules'#010+ '#####################################################################'#010+ #010+ @@ -2251,16 +2245,17 @@ const fpcmakeini : array[0..225,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '#####################################################################'#010+ - '# Rebuil','d Makefile'#010+ + '##########','##########################################################'+ + '#'#010+ + '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' fpc_makefile_dirs'#010+ + ' fpc_makef','ile_dirs'#010+ #010+ 'fpc_makefile:'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) Makefil','e.fpc'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ @@ -2268,8 +2263,8 @@ const fpcmakeini : array[0..225,1..240] of char=( 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_EXAMPLEDIRS))'#010, + ' $(FPCMAKE)',' -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + 'GET_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ @@ -2277,30 +2272,28 @@ const fpcmakeini : array[0..225,1..240] of char=( #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ + 'fpc_makefiles: fpc_makef','ile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ - '#############################','#######################################'+ - '#'#010+ + '#####################################################################'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ - 'include fpcmake.loc'#010+ + 'include fp','cmake.loc'#010+ 'endif'#010+ #010+ #010+ '[userrules]'#010+ - '######################################','##############################'+ - '#'#010+ + '#####################################################################'#010+ '# Users rules'#010+ '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '#####################################################################'#010+ - '# LCL Rules'#010+ - '##############################','######################################'+ + '############################################','########################'+ '#'#010+ + '# LCL Rules'#010+ + '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ @@ -2309,10 +2302,10 @@ const fpcmakeini : array[0..225,1..240] of char=( 'else'#010+ 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'export LCL_PLATFORM'#010+ #010+ - '# Check if the specified LCLDIR is correct',#010+ + '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ @@ -2322,57 +2315,58 @@ const fpcmakeini : array[0..225,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ #010+ - '# Check if the default LCLDIR is correct'#010+ + '# Ch','eck if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ - 'override L','CLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Check for development version'#010+ - 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword ','$(wildca'+ - 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'ifeq ($(LCLDIR)',',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+ 'endif'#010+ #010+ '# Check for release version'#010+ - 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword ','$(wildca'+ - 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'ifeq ($(LCLDIR)',',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+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ - 'IR)/units)'#010+ - 'override LCL','COMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+ - 'nents $(LCLDIR)/components)'#010+ + 'override LCLUNITDIR:=$(wi','ldcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ + 'LDIR)/units)'#010+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ + 'nts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ - 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010, + 'override REQUIRE_PACKA','GESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '#####################################################################'#010+ + '#####################################################################', + #010+ 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ - ' @$(E','CHO) == LCL info =='#010+ + ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ - ' @$(ECHO) LCL Component dir.... $(','LCLCOMPONENTDIR)'#010+ + ' @$(ECHO) LCL Unit d','ir......... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 );