From 6234729fbc10a65f4030024778499e240fa7464c Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 10 Apr 2004 15:55:24 +0000 Subject: [PATCH] + add -O1 for powerpc if RELEASE=1 --- utils/fpcm/fpcmake.inc | 392 ++++++++++++++++++++--------------------- utils/fpcm/fpcmake.ini | 4 + 2 files changed, 199 insertions(+), 197 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 4e27ee2dc3..d469f909da 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1259,8 +1259,12 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifeq ($(','CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ 'else'#010+ + 'ifeq ($(CPU_TARGET),powerpc)'#010+ + 'FPCCPUOPT:=-O1'#010+ + 'else'#010+ 'FPCCPUOPT:='#010+ 'endif'#010+ + 'endif'#010+ 'override FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ @@ -1270,9 +1274,9 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ - '# Optimizer (i386 only for now)'#010+ + '# Opti','mizer (i386 only for now)'#010+ 'ifdef OPTIMIZE'#010+ - 'ifeq ($(CPU_TA','RGET),i386)'#010+ + 'ifeq ($(CPU_TARGET),i386)'#010+ 'override FPCOPT+=-OG2p3'#010+ 'endif'#010+ 'endif'#010+ @@ -1284,17 +1288,17 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ + 'over','ride FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ - 'ifdef COMPILER_U','NITDIR'#010+ + 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#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+ - 'end','if'#010+ + 'over','ride FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ @@ -1304,8 +1308,8 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target dirs and the prefix to use for clean/install'#010+ - 'ifdef COMP','ILER_TARGETDIR'#010+ + '# Target ','dirs and the prefix to use for clean/install'#010+ + 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ @@ -1314,29 +1318,29 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Unit target dir'#010+ + '# Uni','t target dir'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCO','PT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ + 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ - 'ifdef COMPILER_TARGETDIR'#010+ - 'override COMPILER_UNITTARGETDIR=$(COMPILER_TA','RGETDIR)'#010+ + 'ifdef COMPILER_','TARGETDIR'#010+ + 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Temporary hack to add HASUNIX define for linux 1.0.6 compiler'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ - 'ifeq ($(FPC_VERSION),1.0.6)'#010+ + 'ifeq ($(FPC_VERSION),1.0.','6)'#010+ 'override FPCOPTDEF+=HASUNIX'#010+ 'endif'#010+ 'endif'#010+ #010+ - '[command_li','bc]'#010+ + '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ @@ -1347,9 +1351,9 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[command_end]'#010+ - '# Add commandline options last so they can override'#010+ + '# Add com','mandline options last so they can override'#010+ 'ifdef OPT'#010+ - 'ov','erride FPCOPT+=$(OPT)'#010+ + 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ @@ -1359,10 +1363,10 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCOPT+=@$(CFGFILE)'#010+ + 'ov','erride FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ - '# Use the environment',' to pass commandline options?'#010+ + '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ @@ -1371,9 +1375,9 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ - #010+ + #010, '# also call ppas if with command option -s'#010+ - '# but only i','f the FULL_SOURCE and FULL_TARGET are equal'#010+ + '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -1384,7 +1388,7 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '###########################################################','#########'+ + '####','################################################################'+ '#'#010+ '# Loaders'#010+ '#####################################################################'#010+ @@ -1393,8 +1397,8 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ 'ifdef TARGET_LOADERS'#010+ 'override ALLTARGET+=fpc_loaders'#010+ - 'override CLEANTARGET+=fpc_loaders_clean'#010+ - 'override INSTALLTARGET+=fpc_loader','s_install'#010+ + 'override CLEANTARGE','T+=fpc_loaders_clean'#010+ + 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ @@ -1405,17 +1409,17 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ - ' -$(DEL) $(LOADEROFILES)'#010+ + ' ',' -$(DEL) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_install:'#010+ - ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ #010+ #010+ '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ - '############################################################','########'+ + '#####','###############################################################'+ '#'#010+ #010+ '.PHONY: fpc_units'#010+ @@ -1424,9 +1428,9 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override ALLTARGET+=fpc_units'#010+ #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ - 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ - 'NITS))'#010+ - 'override INSTALLPPUFIL','ES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override IMPLICITUNITPPUFILES=$(addsuffix $(','PPUEXT),$(TARGET_IMPLICI'+ + 'TUNITS))'#010+ + 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ @@ -1434,24 +1438,24 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[exerules]'#010+ - '#####################################################################'#010+ - '# Exes'#010+ - '########','############################################################'+ + '##############################','######################################'+ '#'#010+ + '# Exes'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_exes'#010+ #010+ 'ifdef TARGET_PROGRAMS'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ - 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ - 'x $(STA','TICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ + 'override EXEOFILES:=$(','addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+ + 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ ')'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ - 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix ','$(AOUTEXT),$(TARGET_PROGRAMS))'#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+ @@ -1462,7 +1466,7 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '################################################################','####'+ + '#########','###########################################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1470,33 +1474,32 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILES)'#010+ + 'override CLEAN','RSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ '[examplerules]'#010+ - '##########','##########################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Examples'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifdef TARGET_EXAMPLES'#010+ + 'ifdef TARGET_EXAMPLES',#010+ 'HASEXAMPLES=1'#010+ - 'override EXAMPLESOURCEFILES:=$(wildcard ','$(addsuffix .pp,$(TARGET_EXA'+ - 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET'+ - '_EXAMPLES)))'#010+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ + 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_E'+ + 'XAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) ','$(ad'+ + 'override ','EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+ 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ 'ES)))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#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+ + 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ @@ -1504,19 +1507,18 @@ const fpcmakeini : array[0..191,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ - 'S))'#010+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsu','ffix _all,$(TARGET_EXAMPLED'+ + 'IRS))'#010+ #010+ #010+ '[compilerules]'#010+ - '#####','###############################################################'+ - '#'#010+ + '#####################################################################'#010+ '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#010+ + '.PHONY: fpc_all fpc_smart',' fpc_debug fpc_release'#010+ #010+ - '$(FPCMADE): $(ALLDEPENDENCIES) ','$(ALLTARGET)'#010+ + '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ @@ -1527,11 +1529,11 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ #010+ - 'fpc_release:'#010+ + 'fpc_rele','ase:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile r','ules, available for both possible .pp and .pas ex'+ - 'tensions'#010+ + '# General compile rules, available for both possible .pp and .pas exte'+ + 'nsions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res'#010+ #010+ @@ -1539,9 +1541,9 @@ const fpcmakeini : array[0..191,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(PPUEXT): %.pas'#010+ + '%$','(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPP','AS)'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ @@ -1553,27 +1555,27 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '%$(EXEEXT): %.dpr'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(EXECPP','AS)'#010+ #010+ '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ - '# Search ','paths for .ppu and .pp and .pas .dpr'#010+ + '# Search paths for .ppu and .pp and .pas .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %$(PPUEXT) $(COMPILER_UNITT','ARGETDIR)'#010+ + 'vpath %.dpr $(COMPILER_SOURCEDIR) $','(COMPILER_INCLUDEDIR)'#010+ + 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[libraryrules]'#010+ '#####################################################################'#010+ '# Library'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_shared'#010+ + '.PHONY: ','fpc_shared'#010+ #010+ 'ifndef LIB_FULLNAME'#010+ 'ifdef LIB_VERSION'#010+ - 'LIB_F','ULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ + 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ 'else'#010+ 'LIB_FULLNAME=$(LIB_NAME)'#010+ 'endif'#010+ @@ -1582,21 +1584,20 @@ const fpcmakeini : array[0..191,1..240] of char=( '# Default sharedlib units are all unit objects'#010+ 'ifndef LIB_SHAREDUNITS'#010+ 'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ 'fpc_shared: all'#010+ 'ifdef HASSHAREDLIB'#010+ - ' $(PPUMOVE',') $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ + ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ '[installrules]'#010+ - '#####################################################################'#010+ + '#####################################################################'#010, '# Install rules'#010+ - '#######################################','#############################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ @@ -1604,21 +1605,21 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ - 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:=$(filte','r-out $(INSTALL_BUILDUNIT)$(PPUEXT)'+ - ',$(INSTALLPPUFILES))'#010+ + 'if','def INSTALL_BUILDUNIT'#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)'+ - ',$(INSTALLPPUFI','LES)))'#010+ + 'LES)) $(addprefix $(STATICLIBP','REFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'T),$(INSTALLPPUFILES)))'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ 'PPUFILES))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ - 'EFIX),$(INSTALLPPULINKFILES)))'#010+ + 'EFIX),$(INSTALLPPULINKFILES',')))'#010+ '# Implicitly install Package.fpc'#010+ - 'override INSTALL_C','REATEPACKAGEFPC=1'#010+ + 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ @@ -1627,24 +1628,24 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ - 'ifdef INSTALLEXEFILES'#010+ + 'ifdef INSTALLEXEFILE','S'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+ - '# Compress the exe','s if upx is defined'#010+ + '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ - 'ifdef FPCMAKE'#010+ - '# If the fpcpackage variable is set then create and',' install Package.'+ - 'fpc,'#010+ + 'ifdef FPCM','AKE'#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$(OS_TARGET) Makefile.fpc'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) Pac','kage.fpc $(INSTALL_UNITDIR)'#010+ + ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1652,43 +1653,42 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'ifneq ($(INSTALLPPULINKFILES),)'#010+ - ' $(INSTALL) $(INSTALLPPULINKFILES)',' $(INSTALL_UNITDIR)'#010+ + 'ifneq ($(INSTALLPP','ULINKFILES),)'#010+ + ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_','FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'end','if'#010+ 'ifdef INSTALL_FILES'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ - ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ - ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR',')'#010+ + ' $(MKDIR) $(INSTALL_SOURCEDI','R)'#010+ + ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ - ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + ' $(COPY) $(EXAMPLESOU','RCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef TARGET_EXAM','PLEDIRS'#010+ + 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ 'AMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ - '# Dist Install'#010+ - '#########################################','###########################'+ - '#'#010+ + '#',' Dist Install'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ @@ -1696,17 +1696,17 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[zipinstallrules]'#010+ - '#####################################################################'#010+ + '#####################################################################'#010, '# Zip'#010+ - '#################################################','###################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ - '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ + '# subdir, because the deltree can'#039't ','see the whole tree to remove'+ + #010+ 'ifndef PACKDIR'#010+ - 'ifndef inUn','ix'#010+ + 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ @@ -1717,10 +1717,10 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ - 'else'#010+ + 'else'#010, 'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ @@ -1734,11 +1734,11 @@ const fpcmakeini : array[0..191,1..240] of char=( '# Use tar by default under linux'#010+ 'ifndef USEZIP'#010+ 'ifdef inUnix'#010+ - 'USETAR=1'#010+ + 'USETAR=1',#010+ '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+ @@ -1747,39 +1747,40 @@ const fpcmakeini : array[0..191,1..240] of char=( '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP','),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+ + ')'#010+ 'else'#010+ - 'ZIPPATHSEP','=/'#010+ + 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ - 'ZIPCMD_ZIP:=$(T','ARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ + 'ZIPDESTFI','LE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ + 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ 'endif'#010+ #010+ - 'fpc_zipinstall:'#010+ - ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(P','ACKDIR) ZIPINSTALL=1'#010+ + 'fpc_zipi','nstall:'#010+ + ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ - 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))','" > $(ZIPWRAP'+ - 'PER)'#010+ + 'ifneq ($(ECHOREDIR),echo)'#010, + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ + 'R)'#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 $(ZI','PCMD_CDPACK) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ @@ -1789,7 +1790,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)',#010+ + ' ',' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ @@ -1798,8 +1799,8 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm', - #010+ + ' $(MAKE',') fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=ex'+ + 'm'#010+ 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ @@ -1809,7 +1810,7 @@ const fpcmakeini : array[0..191,1..240] of char=( '[cleanrules]'#010+ '#####################################################################'#010+ '# Clean rules'#010+ - '############################################################','########'+ + '#####','###############################################################'+ '#'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ @@ -1820,14 +1821,14 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ + 'override CLEANP','PUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ - 'i','fdef CLEANPPUFILES'#010+ + 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ 'LEANPPUFILES)))'#010+ - 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEA','NPP'+ + 'override C','LEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+ 'UFILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'IX),$(CLEANPPULINKFILES)))'#010+ @@ -1835,30 +1836,30 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ + ' -$(DEL) $(CLEAN','EXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL) $(C','LEANPPUFILES)'#010+ + ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ - 'endif'#010+ + 'end','if'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ - 'end','if'#010+ + 'endif'#010+ 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ - 'PCEXTFILE) $(REDIRFILE)'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res lin','k.res $'+ + '(FPCEXTFILE) $(REDIRFILE)'#010+ #009#009#010+ - 'fpc_distclean: clea','n'#010+ + 'fpc_distclean: clean'#010+ #010+ '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ '# set if targetdir or unittargetdir is specified'#010+ @@ -1866,14 +1867,14 @@ const fpcmakeini : array[0..191,1..240] of char=( 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ - 'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ - 'ifdef CLEANE','XEFILES'#010+ + 'fpc_','cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ + 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res',' link.res $'+ + ' ',' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $'+ '(FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ @@ -1882,10 +1883,10 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '#####################################################################'#010+ - '# Base info rules'#010+ - '###############','#####################################################'+ + '################################################','####################'+ '#'#010+ + '# Base info rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ @@ -1894,91 +1895,90 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' ','@$(ECHO) Package Version.. $(PACKAGE_VERSION)'#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) FPC ','Version.. $(FPC_VERSION)'#010+ + ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ - ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ - ' @$(ECHO) Full Target.. $(FULL_TA','RGET)'#010+ + ' @$(ECHO) Full Source.. $','(FULL_SOURCE)'#010+ + ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ - ' @$(ECHO) FPCDir.......... $(FPCDIR',')'#010+ + ' @$(ECHO) Basedir.........',' $(BASEDIR)'#010+ + ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ - ' @$(ECHO) Other li','brary... $(OTHERLIBDIR)'#010+ + ' @$(ECHO) G','CC library..... $(GCCLIBDIR)'#010+ + ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ - ' @$(ECHO) Ar........ $(AR)'#010+ + ' @$(ECHO) Ar..','...... $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ - ' ',' @$(ECHO)'#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..... $(SHEL','L)'#010+ + ' @$(ECHO) ',' Echo...... $(ECHO)'#010+ + ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ - ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ + ' @$(ECHO) Zip....','... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Ob','ject 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 Prog','rams....... $(TARGET_PROGRAMS)'#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 ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target ExampleDirs..','.. $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ - ' @$(EC','HO) 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 Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) Install FP','C Package.. $(INSTALL_FPCPACKAGE)'#010+ + ' @$(ECHO) ZipSuffi','x............ $(ZIPSUFFIX)'#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+ - ' @$(ECH','O) Install units 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+ - ' @$(ECH','O) Install data dir..... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Ins','tall example dir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ - ' @$(ECHO)'#010+ + ' @$(','ECHO)'#010+ #010+ '[inforules]'#010+ - '####################################','################################'+ - '#'#010+ + '#####################################################################'#010+ '# Info rules'#010+ '#####################################################################'#010+ #010+ @@ -1987,17 +1987,17 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '################################################################','####'+ + '#########','###########################################################'+ '#'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' fpc_makefile_dirs'#010+ + ' fpc_make','file_dirs'#010+ #010+ 'fpc_makefile:'#010+ - ' $(FPCMAKE) -w -T$(OS_T','ARGET) Makefile.fpc'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ @@ -2005,8 +2005,8 @@ const fpcmakeini : array[0..191,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_'+ @@ -2014,30 +2014,28 @@ const fpcmakeini : array[0..191,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_make','file fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ - '###############','#####################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ - 'include fpcmake.loc'#010+ + 'include f','pcmake.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+ @@ -2047,10 +2045,10 @@ const fpcmakeini : array[0..191,1..240] of char=( 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ 'endif'#010+ - 'export LCL_PLATFORM'#010+ + 'export LCL_PLATF','ORM'#010+ #010+ '# Check if the specified LCLDIR is correct'#010+ - 'ifdef L','CLDIR'#010+ + 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ @@ -2059,9 +2057,9 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ #010+ - '# Check if the default LCLDIR is correct'#010+ + '# Check if the default LC','LDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ - 'override LCLDIR:=$','(subst \,/,$(DEFAULT_LCLDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2069,8 +2067,8 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Check for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca','r'+ - 'd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'override LCLD','IR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ + 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2078,38 +2076,38 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca','r'+ - 'd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'override LCLD','IR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ + 'rd $(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 LCLCOMPONEN','TDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+ - 'nents $(LCLDIR)/components)'#010+ + 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/unit','s/$(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 REQUIRE_PACKAGESDIR+=$(LCLCOMPONEN','TDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ - '[lclinf','orules]'#010+ + '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ - 'override INFORULES+=lclinfo'#010+ + 'override INFORULES+=','lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ - ' @$(ECHO) ==',' 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.... $(LCLCOMPO','NENTDIR)'#010+ + ' @$(ECHO) LCL Unit dir......... $(LCLUNIT','DIR)'#010+ + ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 67a149d4dd..be53dd6691 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -1219,8 +1219,12 @@ ifdef RELEASE ifeq ($(CPU_TARGET),i386) FPCCPUOPT:=-OG2p3 else +ifeq ($(CPU_TARGET),powerpc) +FPCCPUOPT:=-O1 +else FPCCPUOPT:= endif +endif override FPCOPT+=-Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif