From 5966fcce74d303cd055128431678c84f9c875795 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 29 Apr 2012 14:19:32 +0000
Subject: [PATCH] * PIC does not require using the external assembler anymore -
removed 2.0.x-ism
git-svn-id: trunk@21116 -
---
utils/fpcm/fpcmake.inc | 526 ++++++++++++++++++++---------------------
utils/fpcm/fpcmake.ini | 7 -
2 files changed, 258 insertions(+), 275 deletions(-)
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 24e607ac18..d83d49d4e3 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1370,47 +1370,40 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
'ifdef CREATESHARED'#010+
'override FPCOPT+=-Cg'#010+
- #010+
- 'ifeq ($(CPU_TARGET),i386)'#010+
- 'override FPCOPT+=-Aas'#010+
- 'endif'#010+
- #010+
'endif'#010+
#010+
'# create always pic'#039'ed code on x86_64'#010+
- 'ifeq ($(findstring 2.','0.,$(FPC_VERSION)),)'#010+
'ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris)'+
',)'#010+
- 'ifeq ($(CPU_TARGET),x86_64)'#010+
+ 'ifeq',' ($(CPU_TARGET),x86_64)'#010+
'override FPCOPT+=-Cg'#010+
'endif'#010+
'endif'#010+
- 'endif'#010+
#010+
'ifdef LINKSHARED'#010+
'#!!! deactived for testing override FPCOPT+=-XD'#010+
'endif'#010+
#010+
#010+
- '[comm','and_libc]'#010+
+ '[command_libc]'#010+
'# Add GCC lib path if asked'#010+
'ifdef GCCLIBDIR'#010+
'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
'endif'#010+
- 'ifdef OTHERLIBDIR'#010+
+ 'ifdef OTHER','LIBDIR'#010+
'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
'endif'#010+
#010+
#010+
'[command_end]'#010+
'# Add commandline options last so they can override'#010+
- 'ifdef ','OPT'#010+
+ 'ifdef OPT'#010+
'override FPCOPT+=$(OPT)'#010+
'endif'#010+
#010+
'# Add defines from FPCOPTDEF to FPCOPT'#010+
'ifdef FPCOPTDEF'#010+
- 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
+ 'override FPCOP','T+=$(addprefix -d,$(FPCOPTDEF))'#010+
'endif'#010+
#010+
'# Was a config file specified ?'#010+
@@ -1418,33 +1411,33 @@ const fpcmakeini : array[0..218,1..240] of char=(
'override FPCOPT+=@$(CFGFILE)'#010+
'endif'#010+
#010+
- '# Use the envir','onment to pass commandline options?'#010+
+ '# Use the environment to pass commandline options?'#010+
'ifdef USEENV'#010+
'override FPCEXTCMD:=$(FPCOPT)'#010+
- 'override FPCOPT:=!FPCEXTCMD'#010+
+ 'override FPCOPT:=!FPCEXTC','MD'#010+
'export FPCEXTCMD'#010+
'endif'#010+
#010+
'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
#010+
- 'ifneq ($(A','FULL_TARGET),$(AFULL_SOURCE))'#010+
+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
'override ACROSSCOMPILE=1'#010+
'endif'#010+
#010+
'ifdef ACROSSCOMPILE'#010+
- 'override FPCOPT+=$(CROSSOPT)'#010+
+ 'override FPCOPT+=$(CRO','SSOPT)'#010+
'endif'#010+
#010+
'# Compiler commandline'#010+
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
#010+
'# also call ppas if with command option -s'#010+
- '# but only if the F','ULL_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+
- 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+
+ 'ifeq ($(FULL_S','OURCE),$(FULL_TARGET))'#010+
'ifdef RUNBATCH'#010+
'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
'else'#010+
@@ -1455,161 +1448,161 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
#010+
'[loaderrules]'#010+
- '#########','###########################################################'+
- '#'#010+
- '# Loaders'#010+
'#####################################################################'#010+
+ '# Loaders'#010+
+ '#################################','###################################'+
+ '#'#010+
#010+
'.PHONY: fpc_loaders'#010+
#010+
'ifneq ($(TARGET_LOADERS),)'#010+
'override ALLTARGET+=fpc_loaders'#010+
- 'override CLEANTARG','ET+=fpc_loaders_clean'#010+
+ 'override CLEANTARGET+=fpc_loaders_clean'#010+
'override INSTALLTARGET+=fpc_loaders_install'#010+
#010+
- 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
+ 'override LOADEROFILES:=$(addsuffix $(','OEXT),$(TARGET_LOADERS))'#010+
'endif'#010+
#010+
'%$(OEXT): %$(LOADEREXT)'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
- ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT',') $<'#010+
+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
'else'#010+
' $(AS) -o $*$(OEXT) $<'#010+
'endif'#010+
#010+
'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
#010+
- 'fpc_loaders_clean:'#010+
+ 'f','pc_loaders_clean:'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+
')'#010+
'else'#010+
- ' -$(D','EL) $(LOADEROFILES)'#010+
+ ' -$(DEL) $(LOADEROFILES)'#010+
'endif'#010+
#010+
'fpc_loaders_install:'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
- 'ifdef COMPILER_UNITTARGETDIR'#010+
+ 'ifdef COMPILER_UNITT','ARGETDIR'#010+
' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
'ES)) $(INSTALL_UNITDIR)'#010+
'else'#010+
- ' $(INSTALL) $(LOADERO','FILES) $(INSTALL_UNITDIR)'#010+
+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
'endif'#010+
#010+
#010+
'[unitrules]'#010+
- '#####################################################################'#010+
+ '##########################################################','##########'+
+ '#'#010+
'# Units'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_units'#010+
#010+
- 'ifneq ($(TARGET_UNITS)$(TA','RGET_IMPLICITUNITS),)'#010+
+ 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+
'override ALLTARGET+=fpc_units'#010+
#010+
- 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGE','T_UNITS))'#010+
'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
'NITS))'#010+
- 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLI','CITUNITPPUFILES)'#010+
+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'endif'#010+
#010+
- 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
+ 'fpc_units: $(COM','PILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
#010+
#010+
'[exerules]'#010+
'#####################################################################'#010+
'# Exes'#010+
- '#########','###########################################################'+
- '#'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_exes'#010+
#010+
- '# Programs are not needed for a cross installation'#010+
+ '# Programs are not neede','d for a cross installation'#010+
'ifndef CROSSINSTALL'#010+
'ifneq ($(TARGET_PROGRAMS),)'#010+
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
- 'o','verride EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+
- 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
+ 'x $(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 INSTALLEXEFILES+=$(','EXEFILES)'#010+
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+
'ifeq ($(OS_TARGET),os2)'#010+
- 'override CL','EANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
- 'endif'#010+
- 'ifeq ($(OS_TARGET),emx)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
'endif'#010+
+ 'ifeq ($(OS_TARGET),emx)'#010+
+ 'override CLEANEXEF','ILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
+ 'endif'#010+
'endif'#010+
'endif'#010+
#010+
- 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES',')'+
- #010+
+ 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+
#010+
#010+
'[rstrules]'#010+
'#####################################################################'#010+
- '# Resource strings'#010+
+ '# Resource strings'#010,
'#####################################################################'#010+
#010+
'ifdef TARGET_RSTS'#010+
- 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGE','T_RSTS))'#010+
+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
#010+
'override CLEANRSTFILES+=$(RSTFILES)'#010+
'endif'#010+
#010+
#010+
'[examplerules]'#010+
- '#####################################################################'#010+
+ '###################################','#################################'+
+ '#'#010+
'# Examples'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_example','s'#010+
+ '.PHONY: fpc_examples'#010+
#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+
- 'overrid','e EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
- 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
- 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+
- '))) $(addprefix $(IMPORTLIBPREFIX),$(addsu','ffix $(STATICLIBEXT),$(TAR'+
+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(T','ARGET_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)) $(ad'+
+ 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
+ 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+
'GET_EXAMPLES)))'#010+
- 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+
- #010+
+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EX','AMPLES'+
+ '))'#010+
#010+
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+
- 'ifeq ($(OS_TARGET),os2)',#010+
+ 'ifeq ($(OS_TARGET),os2)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+
'ifeq ($(OS_TARGET),emx)'#010+
- 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+ 'overri','de CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+
'endif'#010+
'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+
'HASEXAMPLES=1'#010+
'endif'#010+
#010+
- 'fpc_example','s: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+
- 'IRS))'#010+
+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
+ 'S))'#010+
#010+
#010+
'[compilerules]'#010+
- '#####################################################################'#010+
- '# General compile rules'#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+
+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTAR','GET)'#010+
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
#010+
'fpc_all: $(FPCMADE)'#010+
@@ -1617,22 +1610,22 @@ const fpcmakeini : array[0..218,1..240] of char=(
'fpc_smart:'#010+
' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
#010+
- 'fpc_deb','ug:'#010+
+ 'fpc_debug:'#010+
' $(MAKE) all DEBUG=1'#010+
#010+
'fpc_release:'#010+
' $(MAKE) all RELEASE=1'#010+
#010+
- '# General compile rules, available for both possible .pp and .pas exte'+
- 'nsions'#010+
+ '# General compile rules, av','ailable for both possible .pp and .pas ex'+
+ 'tensions'#010+
#010+
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+
#010+
- '$(COMPILER_UNITTA','RGETDIR):'#010+
+ '$(COMPILER_UNITTARGETDIR):'#010+
' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
#010+
'$(COMPILER_TARGETDIR):'#010+
- ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
+ ' $(MKDIRTREE) $(','COMPILER_TARGETDIR)'#010+
#010+
'%$(PPUEXT): %.pp'#010+
' $(COMPILER) $<'#010+
@@ -1640,14 +1633,14 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
'%$(PPUEXT): %.pas'#010+
' $(COMPILER) $<'#010+
- ' $(EXE','CPPAS)'#010+
+ ' $(EXECPPAS)'#010+
#010+
'%$(EXEEXT): %.pp'#010+
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
'%$(EXEEXT): %.pas'#010+
- ' $(COMPILER) $<'#010+
+ ' $(COMPILE','R) $<'#010+
' $(EXECPPAS)'#010+
#010+
'%$(EXEEXT): %.lpr'#010+
@@ -1656,193 +1649,191 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
'%$(EXEEXT): %.dpr'#010+
' $(COMPILER) $<'#010+
- ' ',' $(EXECPPAS)'#010+
+ ' $(EXECPPAS)'#010+
#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+
+ 'v','path %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
- 'vpath %.lpr $(COMPILER_S','OURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
- 'vpath %.inc $(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+
+ '# Library'#010+
+ '########################################','############################'+
+ '#'#010+
#010+
'.PHONY: fpc_shared'#010+
#010+
'override INSTALLTARGET+=fpc_shared_install'#010+
#010+
'ifndef SHARED_LIBVERSION'#010+
- 'SHARED_LIBVERSIO','N=$(FPC_VERSION)'#010+
+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
'endif'#010+
#010+
'ifndef SHARED_LIBNAME'#010+
'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
'endif'#010+
#010+
- 'ifndef SHARED_FULLNAME'#010+
+ 'ifndef SHARED_FULLNA','ME'#010+
'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+
'N)$(SHAREDLIBEXT)'#010+
'endif'#010+
#010+
- '# Default sharedlib units are all unit',' objects'#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 $(INSTALL_BUILDUNIT),$(SHARED_L'+
- 'IBUNITS))'#010+
+ 'override SHARED','_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED'+
+ '_LIBUNITS))'#010+
'endif'#010+
#010+
'fpc_shared:'#010+
'ifdef HASSHAREDLIB'#010+
- ' $(MAKE) all CREATESHARED=','1 LINKSHARED=1 CREATESMART=1'#010+
+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
'ifneq ($(SHARED_BUILD),n)'#010+
- ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
- 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+
+ ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMP','ILER_UNITTARGETDIR)'+
+ ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+
'endif'#010+
'else'#010+
' @$(ECHO) Shared Libraries not supported'#010+
'endif'#010+
#010+
- 'f','pc_shared_install:'#010+
+ 'fpc_shared_install:'#010+
'ifneq ($(SHARED_BUILD),n)'#010+
'ifneq ($(SHARED_LIBUNITS),)'#010+
- 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
+ 'ifneq ($(wildcard $(COMPILER_UN','ITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
'ALL_SHAREDDIR)'#010+
'endif'#010+
'endif'#010+
- 'endi','f'#010+
+ 'endif'#010+
#010+
'[installrules]'#010+
'#####################################################################'#010+
- '# Install rules'#010+
+ '# Install rules'#010,
'#####################################################################'#010+
#010+
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
#010+
- 'ifdef I','NSTALL_UNITS'#010+
+ 'ifdef INSTALL_UNITS'#010+
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
'endif'#010+
#010+
- 'ifdef INSTALL_BUILDUNIT'#010+
+ 'ifdef INSTALL_BUIL','DUNIT'#010+
'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
'(INSTALLPPUFILES))'#010+
'endif'#010+
#010+
'ifdef INSTALLPPUFILES'#010+
- 'override INS','TALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
- 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
+ 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $','(PPUEXT),$(STATICLIBEX'+
'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+
'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
- 'ifne','q ($(UNITTARGETDIRPREFIX),)'#010+
+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
- '$(INSTALLPPUFILES)))'#010+
+ '$(INST','ALLPPUFILES)))'#010+
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
'endif'#010+
- '# Im','plicitly install Package.fpc'#010+
+ '# Implicitly install Package.fpc'#010+
'override INSTALL_CREATEPACKAGEFPC=1'#010+
'endif'#010+
#010+
'ifdef INSTALLEXEFILES'#010+
- 'ifneq ($(TARGETDIRPREFIX),)'#010+
+ 'ifneq ($(T','ARGETDIRPREFIX),)'#010+
'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
'STALLEXEFILES)))'#010+
'endif'#010+
'endif'#010+
#010+
- 'fpc_install: all $','(INSTALLTARGET)'#010+
+ 'fpc_install: all $(INSTALLTARGET)'#010+
'ifdef INSTALLEXEFILES'#010+
' $(MKDIR) $(INSTALL_BINDIR)'#010+
- ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
+ ' $(INSTALLEXE) $(INSTALL','EXEFILES) $(INSTALL_BINDIR)'#010+
'endif'#010+
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
'ifdef FPCMAKE'#010+
- '# If the fpcpackage variable is set then create and insta','ll Package.'+
- 'fpc,'#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+
+ 'ifneq ($(wil','dcard Makefile.fpc),)'#010+
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
- ' $(INST','ALL) Package.fpc $(INSTALL_UNITDIR)'#010+
+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+
'endif'#010+
'endif'#010+
'endif'#010+
'ifdef INSTALLPPUFILES'#010+
- ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
+ ' $(MKDIR) $(INS','TALL_UNITDIR)'#010+
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+
- ' $(INSTALL) $(INSTALLPPULI','NKFILES) $(INSTALL_UNITDIR)'#010+
+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
'endif'#010+
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
- ' $(MKDIR) $(INSTALL_LIBDIR)'#010+
+ ' $(MKDIR) $(INSTALL_LIBDIR',')'#010+
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
'ifdef inUnix'#010+
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
'endif'#010+
- 'e','ndif'#010+
+ 'endif'#010+
'endif'#010+
'ifdef INSTALL_FILES'#010+
' $(MKDIR) $(INSTALL_DATADIR)'#010+
- ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
+ ' $(INSTALL) $(INSTALL_FILES) $','(INSTALL_DATADIR)'#010+
'endif'#010+
#010+
'fpc_sourceinstall: distclean'#010+
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
- ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_S','OURCEDIR)'#010+
+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
#010+
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
'ifdef HASEXAMPLES'#010+
- ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
+ ' $','(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef EXAMPLESOURCEFILES'#010+
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
- 'ifdef TAR','GET_EXAMPLEDIRS'#010+
+ 'ifdef TARGET_EXAMPLEDIRS'#010+
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
'AMPLEDIR)'#010+
'endif'#010+
#010+
- '[distinstallrules]'#010+
+ '[','distinstallrules]'#010+
'#####################################################################'#010+
'# Dist Install'#010+
- '#################################','###################################'+
- '#'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_distinstall'#010+
#010+
'fpc_distinstall: install exampleinstall'#010+
- #010+
+ #010,
#010+
'[zipinstallrules]'#010+
'#####################################################################'#010+
'# Zip'#010+
- '#########################################','###########################'+
- '#'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
#010+
- '# Temporary path to pack a file, can only use a single deep'#010+
+ '# Tempo','rary 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+
- 'ifn','def inUnix'#010+
+ 'ifndef inUnix'#010+
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
'else'#010+
'PACKDIR=/tmp/fpc-pack'#010+
'endif'#010+
'endif'#010+
#010+
- '# Maybe create default zipname from packagename'#010+
+ '# Maybe create default',' zipname from packagename'#010+
'ifndef ZIPNAME'#010+
'ifdef DIST_ZIPNAME'#010+
'ZIPNAME=$(DIST_ZIPNAME)'#010+
@@ -1851,12 +1842,12 @@ const fpcmakeini : array[0..218,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- 'ifndef FUL','LZIPNAME'#010+
+ 'ifndef FULLZIPNAME'#010+
'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
'endif'#010+
#010+
'# ZipTarget'#010+
- 'ifndef ZIPTARGET'#010+
+ 'ifndef ZIPTA','RGET'#010+
'ifdef DIST_ZIPTARGET'#010+
'ZIPTARGET=DIST_ZIPTARGET'#010+
'else'#010+
@@ -1866,183 +1857,182 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
'# Use tar by default under linux'#010+
'ifndef USEZIP'#010+
- 'if','def inUnix'#010+
+ 'ifdef inUnix'#010+
'USETAR=1'#010+
'endif'#010+
'endif'#010+
#010+
'# Use a wrapper script by default for Os/2'#010+
'ifndef inUnix'#010+
- 'USEZIPWRAPPER=1'#010+
+ 'USEZIPWRAPPER=','1'#010+
'endif'#010+
#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+
+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
'else'#010+
'ZIPPATHSEP=/'#010+
'endif'#010+
#010+
- '# Create commands to create the zip/tar file'#010+
+ '# Create commands to',' create the zip/tar file'#010+
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
- 'ifd','ef USETAR'#010+
+ 'ifdef USETAR'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
- 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPD','ESTFILE) *'#010+
'else'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
- 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIP','D'+
- 'ESTFILE) *'#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+
+ ' ',' $(MKDIR) $(DIST_DESTDIR)'#010+
' $(DEL) $(ZIPDESTFILE)'#010+
'ifdef USEZIPWRAPPER'#010+
- '# Handle gecho separate as we need to espace \ with \\',#010+
+ '# Handle gecho separate as we need to espace \ with \\'#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))" >> $(ZIPWRAP',
- 'PER)'#010+
+ ' ',' $(ECHOREDIR) -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 $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
'endif'#010+
'ifdef inUnix'#010+
' /bin/sh $(ZIPWRAPPER)'#010+
'else'#010+
'ifdef RUNBATCH'#010+
- ' $(RUNBATCH) $(ZI','PWRAPPER)'#010+
+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+
'else'#010+
' $(ZIPWRAPPER)'#010+
'endif'#010+
'endif'#010+
' $(DEL) $(ZIPWRAPPER)'#010+
'else'#010+
- ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
+ ' $(ZIPCMD_CDPA','CK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+
#010+
'fpc_zipsourceinstall:'#010+
- ' $(MAKE) fpc_zipinstall ZIPTARG','ET=sourceinstall ZIPSUFFIX=$(Z'+
- 'IPSOURCESUFFIX)'#010+
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
+ 'SOURCESUFFIX)'#010+
#010+
'fpc_zipexampleinstall:'#010+
'ifdef HASEXAMPLES'#010+
- ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
- 'PEXAMPLESUFFIX)'#010+
+ ' $(MAKE) ','fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+
+ 'ZIPEXAMPLESUFFIX)'#010+
'endif'#010+
#010+
'fpc_zipdistinstall:'#010+
- ' $(MAKE) fpc_zipinstall ZIPTARGE','T=distinstall'#010+
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
#010+
#010+
'[cleanrules]'#010+
'#####################################################################'#010+
- '# Clean rules'#010+
+ '# Cle','an rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
#010+
- 'ifdef EXEF','ILES'#010+
+ 'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
'))'#010+
- 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+
- 'GFILES))'#010+
+ 'override CLEANEXEDBGFILES:','=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXE'+
+ 'DBGFILES))'#010+
'endif'#010+
#010+
'ifdef CLEAN_PROGRAMS'#010+
- 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),','$(addsuffix $'+
- '(EXEEXT), $(CLEAN_PROGRAMS)))'#010+
- 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+
- '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+
+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(a','ddsuffi'+
+ 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
'endif'#010+
#010+
'ifdef CLEAN_UNITS'#010+
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
- 'endif'#010,
+ 'endif'#010+
#010+
'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
- ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
- 'LEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA'+
- 'TICLIBEXT','),$(CLEANPPUFILES)))'#010+
+ ') $(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),$(CL','EAN'+
+ 'PPUFILES))'#010+
'endif'#010+
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
'ILES))'#010+
- 'override CLEANPPULINKFILES:=$(wildcard ','$(addprefix $(UNITTARGETDIRPR'+
- 'EFIX),$(CLEANPPULINKFILES)))'#010+
+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
+ 'IX),$(CLEANPPULINKFILES)))'#010+
'endif'#010+
#010+
'fpc_clean: $(CLEANTARGET)'#010+
- 'ifdef CLEANEXEFILES'#010+
+ 'ifdef CLEANEX','EFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'# DELTREE instead of DEL because on Mac OS X these are directories'#010+
- 'ifdef CLEANEXEDBGFILES'#010,
+ 'ifdef CLEANEXEDBGFILES'#010+
' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
'endif'#010+
'ifdef CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+
+ 'endif',#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+
+ 'endif'#010+
+ 'ifdef LIB_NAME'#010+
+ ' ',' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
+ 'endif'#010+
+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
+ 'PCEXTFILE) $(REDIRFILE)'#010+
+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
+ #010+
+ 'fpc_cleanall: $(CLEANTARGET)'#010+
+ 'ifdef CLEANEXEFILES'#010+
+ ' ',' -$(DEL) $(CLEANEXEFILES)'#010+
+ 'endif'#010+
+ 'ifdef COMPILER_UNITTARGETDIR'#010+
+ 'ifdef CLEANPPUFILES'#010+
+ ' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKFILES)'#010+
'endif'#010+
'ifdef CLEANRSTFILES'#010+
- ' -$(DEL) $(addprefix $(UNITTARGETDI','RPREFIX),$(CLEANRSTFILES))'+
+ ' -$(DEL) $(addp','refix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
#010+
'endif'#010+
- 'ifdef CLEAN_FILES'#010+
- ' -$(DEL) $(CLEAN_FILES)'#010+
- 'endif'#010+
- 'ifdef LIB_NAME'#010+
- ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
- 'endif'#010+
- ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
- 'PCEXTFILE) $(REDI','RFILE)'#010+
- ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
- #010+
- 'fpc_cleanall: $(CLEANTARGET)'#010+
- 'ifdef CLEANEXEFILES'#010+
- ' -$(DEL) $(CLEANEXEFILES)'#010+
- 'endif'#010+
- 'ifdef COMPILER_UNITTARGETDIR'#010+
- 'ifdef CLEANPPUFILES'#010+
- ' -$(DEL) $(CLEANPPUFILES)'#010+
- 'endif'#010+
- 'ifneq ($(CL','EANPPULINKFILES),)'#010+
- ' -$(DEL) $(CLEANPPULINKFILES)'#010+
- 'endif'#010+
- 'ifdef CLEANRSTFILES'#010+
- ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
- 'endif'#010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
' -$(DEL) $(CLEAN_FILES)'#010+
'endif'#010+
- ' -$(DELTREE) un','its'#010+
+ ' -$(DELTREE) units'#010+
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
- 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEX','T)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+
- ' -$(DEL) fpcmade.* Package.fpc $(P','PAS) script.res link.res $('+
- 'FPCEXTFILE) $(REDIRFILE)'#010+
+ ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
+ 'CEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *_ppas$(BATCHEXT)'#010+
'ifdef AOUTEXT'#010+
- ' -$(DEL) *$(AOUTEXT)'#010+
+ ' ',' -$(DEL) *$(AOUTEXT)'#010+
'endif'#010+
'ifdef DEBUGSYMEXT'#010+
' -$(DEL) *$(DEBUGSYMEXT)'#010+
@@ -2052,10 +2042,10 @@ const fpcmakeini : array[0..218,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+
@@ -2063,137 +2053,138 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
'fpc_baseinfo:'#010+
' @$(ECHO)'#010+
- ' ',' @$(ECHO) == Package info =='#010+
+ ' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
- ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
+ ' @$(ECHO)',' Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+
- ' @$(ECHO) FP','C.......... $(FPC)'#010+
+ ' @$(ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
- ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#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) Target OS.... $(OS_TARGET)'#010+
' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
- ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
+ ' ',' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
- ' @$(ECHO) FPC fpmake... $(FPCFPMAK','E)'#010+
+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
+ ' @$(ECHO) Required p','kgs... $(REQUIRE_PACKAGES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
- ' ',' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
- ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
+ ' ','@$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
- ' @$(ECHO) Other libra','ry... $(OTHERLIBDIR)'#010+
+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+
- ' @$(ECHO) As........ $(AS)'#010+
+ ' @$(ECH','O) As........ $(AS)'#010+
' @$(ECHO) Ld........ $(LD)'#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) R','m........ $(RMPROG)'#010+
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+
- ' @$(ECHO) Shell..... $(SHELL)'#010,
+ ' @$(ECHO) Shell..... $(SHELL)'#010+
' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
- ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
+ ' @$(ECHO) PPUMove..','. $(PPUMOVE)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+
- ' @$(EC','HO) Target Loaders........ $(TARGET_LOADERS)'#010+
+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+
- ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
+ ' ',' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
- ' @$(E','CHO) Target Dirs........... $(TARGET_DIRS)'#010+
- ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010,
' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
- ' ',' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
+ ' @$(ECHO) Install Units....','... $(INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+
- ' ',' @$(ECHO)'#010+
+ ' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
- ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
+ ' @$(ECHO) ZipName.............. $','(ZIPNAME)'#010+
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
- ' @$(ECHO',') ZipSuffix............ $(ZIPSUFFIX)'#010+
+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
- ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#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 binary dir... $(INSTALL_BINDIR)'#010+
+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDI','R)'#010+
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
- ' @$(EC','HO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
- ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDI','R)'#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) Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+
#010+
'[inforules]'#010+
- '#####################################################################'#010+
+ '###################','#################################################'+
+ '#'#010+
'# Info rules'#010+
'#####################################################################'#010+
#010+
- '.','PHONY: fpc_info'#010+
+ '.PHONY: fpc_info'#010+
#010+
'fpc_info: $(INFORULES)'#010+
#010+
'[makefilerules]'#010+
- '#####################################################################'#010+
+ '###############################################','#####################'+
+ '#'#010+
'# Rebuild Makefile'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_makefile fp','c_makefiles fpc_makefile_sub1 fpc_makefile_su'+
- 'b2 \'#010+
+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
+ ' \'#010+
' fpc_makefile_dirs'#010+
#010+
'fpc_makefile:'#010+
- ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
+ ' $(FPC','MAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
#010+
'fpc_makefile_sub1:'#010+
'ifdef TARGET_DIRS'#010+
- ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fp','c,$(TAR'+
- 'GET_DIRS))'#010+
+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
+ '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 /Makef','ile.fpc,$(TAR'+
+ 'GET_EXAMPLEDIRS))'#010+
'endif'#010+
#010+
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
'EXAMPLEDIRS))'#010+
#010+
- 'fpc_makefile_','dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
#010+
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+
- '[localmakefile]'#010+
+ '[localmakefile',']'#010+
'#####################################################################'#010+
'# Local Makefile'#010+
- '###############################################','#####################'+
- '#'#010+
+ '#####################################################################'#010+
#010+
'ifneq ($(wildcard fpcmake.loc),)'#010+
'include fpcmake.loc'#010+
@@ -2201,19 +2192,19 @@ const fpcmakeini : array[0..218,1..240] of char=(
#010+
#010+
'[userrules]'#010+
- '#####################################################################'#010+
- '# Users rules'#010+
- '###########################################################','#########'+
+ '#######','#############################################################'+
'#'#010+
+ '# Users rules'#010+
+ '#####################################################################'#010+
#010+
'[lclrules]'#010+
'#####################################################################'#010+
- '# LCL Rules'#010+
+ '# LCL Rules',#010+
'#####################################################################'#010+
#010+
'# LCL Platform'#010+
'ifndef LCL_PLATFORM'#010+
- 'ifneq ($(findstring $(OS_TARG','ET),win32 win64),)'#010+
+ 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+
'LCL_PLATFORM=win32'#010+
'else'#010+
'LCL_PLATFORM=gtk'#010+
@@ -2221,68 +2212,67 @@ const fpcmakeini : array[0..218,1..240] of char=(
'endif'#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+
+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'else'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
#010+
- '# Check if the default LCLDIR is correct'#010+
+ '# 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+
- 'override LCLDIR','=wrong'#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 $(wildcard'+
- ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
+ 'override LCLDIR=$(subst /unit','s/$(LCL_PLATFORM),,$(firstword $(wildca'+
+ 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'ifeq ($(LCLDIR),)'#010+
- 'override LC','LDIR=wrong'#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 $(wildcard'+
- ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
+ 'override LCLDIR=$(subst /unit','s/$(LCL_PLATFORM),,$(firstword $(wildca'+
+ 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+
- 'override ','LCLDIR=wrong'#010+
+ 'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
'# Generate dirs'#010+
- 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
- 'IR)/units)'#010+
+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM',') $(LC'+
+ 'LDIR)/units)'#010+
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
'nts $(LCLDIR)/components)'#010+
- 'export LCLDIR LCLUNIT','DIR LCLCOMPONENTDIR'#010+
+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
#010+
'# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
- 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
+ 'override C','OMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
#010+
'[lclinforules]'#010+
'#####################################################################'#010+
'# LCL Info rules'#010+
- '##','##################################################################'+
- '#'#010+
+ '#####################################################################'#010+
'override INFORULES+=lclinfo'#010+
#010+
- '.PHONY: lclinfo'#010+
+ '.PHONY:',' lclinfo'#010+
#010+
'lclinfo:'#010+
' @$(ECHO) == LCL info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
- ' @$(','ECHO) LCLDIR............... $(LCLDIR)'#010+
+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
- ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
+ ' @$(','ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
' @$(ECHO)'#010
);
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index b7a1000a4f..bd70519d22 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -1313,21 +1313,14 @@ endif
ifdef CREATESHARED
override FPCOPT+=-Cg
-
-ifeq ($(CPU_TARGET),i386)
-override FPCOPT+=-Aas
-endif
-
endif
# create always pic'ed code on x86_64
-ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
ifeq ($(CPU_TARGET),x86_64)
override FPCOPT+=-Cg
endif
endif
-endif
ifdef LINKSHARED
#!!! deactived for testing override FPCOPT+=-XD