|
|
@@ -1369,7 +1369,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'# ','create always pic'#039'ed code on x86_64'#010+
|
|
|
'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+
|
|
|
- 'ifneq ($(findstring $(OS_TARGET),linux solaris),)'#010+
|
|
|
+ 'ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris)'+
|
|
|
+ ',)'#010+
|
|
|
'ifeq ($(CPU_TARGET),x86_64)'#010+
|
|
|
'override FPCOPT+=-Cg'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1377,7 +1378,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef LINKSHARED'#010+
|
|
|
- '#!!! deactived for testing ','override FPCOPT+=-XD'#010+
|
|
|
+ '#!!!',' deactived for testing override FPCOPT+=-XD'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
@@ -1392,7 +1393,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[command_end]'#010+
|
|
|
- '# Add commandline option','s last so they can override'#010+
|
|
|
+ '#',' Add commandline options last so they can override'#010+
|
|
|
'ifdef OPT'#010+
|
|
|
'override FPCOPT+=$(OPT)'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1403,8 +1404,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Was a config file specified ?'#010+
|
|
|
- 'ifdef CFGFILE'#010+
|
|
|
- 'override FPCOPT+=','@$(CFGFILE)'#010+
|
|
|
+ 'ifdef CF','GFILE'#010+
|
|
|
+ 'override FPCOPT+=@$(CFGFILE)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Use the environment to pass commandline options?'#010+
|
|
|
@@ -1415,7 +1416,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
|
|
|
- 'override AFULL_SOURCE=$(CP','U_SOURCE)-$(OS_SOURCE)'#010+
|
|
|
+ 'ove','rride AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
|
|
|
#010+
|
|
|
'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
|
|
|
'override ACROSSCOMPILE=1'#010+
|
|
|
@@ -1428,7 +1429,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'# Compiler commandline'#010+
|
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
|
#010+
|
|
|
- '# also call ppas if with com','mand option -s'#010+
|
|
|
+ '# als','o call ppas if with command option -s'#010+
|
|
|
'# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+
|
|
|
'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
|
|
|
'EXECPPAS='#010+
|
|
|
@@ -1437,9 +1438,9 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'ifdef RUNBATCH'#010+
|
|
|
'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
|
|
|
'else'#010+
|
|
|
- 'EXECPPAS:=@$(PPAS)'#010+
|
|
|
+ 'EXECP','PAS:=@$(PPAS)'#010+
|
|
|
+ 'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'end','if'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
@@ -1450,8 +1451,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_loaders'#010+
|
|
|
#010+
|
|
|
- 'ifneq ($(TARGET_LOADERS),)'#010+
|
|
|
- 'override ALLTARG','ET+=fpc_loaders'#010+
|
|
|
+ 'ifneq ($(TARGET_LOAD','ERS),)'#010+
|
|
|
+ 'override ALLTARGET+=fpc_loaders'#010+
|
|
|
'override CLEANTARGET+=fpc_loaders_clean'#010+
|
|
|
'override INSTALLTARGET+=fpc_loaders_install'#010+
|
|
|
#010+
|
|
|
@@ -1459,8 +1460,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'%$(OEXT): %$(LOADEREXT)'#010+
|
|
|
- 'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
- ' $(AS) -o ','$(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
|
|
|
+ 'ifdef COMPILER_UNITTARG','ETDIR'#010+
|
|
|
+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
|
|
|
'else'#010+
|
|
|
' $(AS) -o $*$(OEXT) $<'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1469,7 +1470,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_loaders_clean:'#010+
|
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
- ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,','$(LOADEROFILE'+
|
|
|
+ ' -$(DEL) $(addprefix $(CO','MPILER_UNITTARGETDIR)/,$(LOADEROFILE'+
|
|
|
'S))'#010+
|
|
|
'else'#010+
|
|
|
' -$(DEL) $(LOADEROFILES)'#010+
|
|
|
@@ -1478,8 +1479,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'fpc_loaders_install:'#010+
|
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
- ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
|
|
|
- 'ES)) $(INSTALL_UNITDIR)',#010+
|
|
|
+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL',
|
|
|
+ 'ES)) $(INSTALL_UNITDIR)'#010+
|
|
|
'else'#010+
|
|
|
' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1488,17 +1489,18 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'[unitrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Units'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '###########################################################','#########'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc','_units'#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 IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
|
|
|
- 'NITS))'#010+
|
|
|
- 'override INSTAL','LPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
|
+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICIT',
|
|
|
+ 'UNITS))'#010+
|
|
|
+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1506,7 +1508,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[exerules]'#010+
|
|
|
- '####################################################','################'+
|
|
|
+ '#############################','#######################################'+
|
|
|
'#'#010+
|
|
|
'# Exes'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1516,19 +1518,19 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'# Programs are not needed for a cross installation'#010+
|
|
|
'ifndef CROSSINSTALL'#010+
|
|
|
'ifneq ($(TARGET_PROGRAMS),)'#010+
|
|
|
- 'override EXEFILES=$(addsuff','ix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
+ 'over','ride EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
|
|
|
'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+
|
|
|
- '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET','_'+
|
|
|
+ '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $','(STATICLIBEXT),$(TARGET_'+
|
|
|
'PROGRAMS)))'#010+
|
|
|
#010+
|
|
|
'override ALLTARGET+=fpc_exes'#010+
|
|
|
'override INSTALLEXEFILES+=$(EXEFILES)'#010+
|
|
|
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
|
|
'ifeq ($(OS_TARGET),os2)'#010+
|
|
|
- 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAM','S))'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifeq ($(OS_TA','RGET),emx)'#010+
|
|
|
+ 'ifeq ($(OS_TARGET),emx)'#010+
|
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1538,7 +1540,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[rstrules]'#010+
|
|
|
- '############################################################','########'+
|
|
|
+ '#####################################','###############################'+
|
|
|
'#'#010+
|
|
|
'# Resource strings'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1547,12 +1549,11 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
|
|
|
#010+
|
|
|
'override CLEANRSTFILES+=$(RSTFILES)'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'endif'#010,
|
|
|
#010+
|
|
|
#010+
|
|
|
'[examplerules]'#010+
|
|
|
- '######','##############################################################'+
|
|
|
- '#'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'# Examples'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
@@ -1560,24 +1561,24 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'ifneq ($(TARGET_EXAMPLES),)'#010+
|
|
|
'HASEXAMPLES=1'#010+
|
|
|
- 'override EXAMPLESOURCEFILES:=$','(wildcard $(addsuffix .pp,$(TARGET_EXA'+
|
|
|
+ 'overrid','e EXAMPLESOURCEFILES:=$(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 EXAMPLEO','FILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
|
|
|
- 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
|
|
|
- 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+
|
|
|
- 'GET_EXAMPLES)))'#010+
|
|
|
+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMP','LES))'#010+
|
|
|
+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
|
|
|
+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+
|
|
|
+ '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGE'+
|
|
|
+ 'T_EXAMPLES)))'#010+
|
|
|
#010+
|
|
|
- 'override CLEANEXEFILES+=$(EXAMPL','EFILES) $(EXAMPLEOFILES)'#010+
|
|
|
+ 'override ','CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
|
'ifeq ($(OS_TARGET),os2)'#010+
|
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
|
|
'endif'#010+
|
|
|
'ifeq ($(OS_TARGET),emx)'#010+
|
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
|
|
+ 'endi','f'#010+
|
|
|
'endif'#010+
|
|
|
- 'endif'#010+
|
|
|
- 'ifneq ($(TARGET','_EXAMPLEDIRS),)'#010+
|
|
|
+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+
|
|
|
'HASEXAMPLES=1'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1587,19 +1588,18 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'[compilerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
- '# General compile rules'#010+
|
|
|
- '##################','##################################################'+
|
|
|
- '#'#010+
|
|
|
+ '# General compile r','ules'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
|
|
|
#010+
|
|
|
'$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
|
|
|
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
|
|
|
#010+
|
|
|
- 'fpc_all: $(FPCMADE)'#010+
|
|
|
+ 'fpc_all: $(FPCM','ADE)'#010+
|
|
|
#010+
|
|
|
'fpc_smart:'#010+
|
|
|
- ' ',' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
|
|
|
+ ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
|
|
|
#010+
|
|
|
'fpc_debug:'#010+
|
|
|
' $(MAKE) all DEBUG=1'#010+
|
|
|
@@ -1610,7 +1610,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'# 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+
|
|
|
+ '.SUFFIXES: $(E','XEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+
|
|
|
#010+
|
|
|
'$(COMPILER_UNITTARGETDIR):'#010+
|
|
|
' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
|
|
|
@@ -1620,9 +1620,9 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'%$(PPUEXT): %.pp'#010+
|
|
|
' $(COMPILER) $<'#010+
|
|
|
- ' $(EXECPPAS)'#010+
|
|
|
+ ' ',' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
- '%$(PPU','EXT): %.pas'#010+
|
|
|
+ '%$(PPUEXT): %.pas'#010+
|
|
|
' $(COMPILER) $<'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
@@ -1635,8 +1635,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(EXEEXT): %.lpr'#010+
|
|
|
- ' $(COMPILER) $<'#010+
|
|
|
- ' $(EXECPPAS)'#010,
|
|
|
+ ' $(COMPILER) ','$<'#010+
|
|
|
+ ' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(EXEEXT): %.dpr'#010+
|
|
|
' $(COMPILER) $<'#010+
|
|
|
@@ -1647,12 +1647,12 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
|
|
|
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
|
- 'vpath %.pas $(COMPILER_SOURCEDIR)',' $(COMPILER_INCLUDEDIR)'#010+
|
|
|
+ 'vpath %.pa','s $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
|
'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
|
'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
|
'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+
|
|
|
'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
|
|
- 'vpath %$(PPUEXT) $(COMPILE','R_UNITTARGETDIR)'#010+
|
|
|
+ 'vpa','th %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
|
|
#010+
|
|
|
'[sharedrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1661,7 +1661,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_shared'#010+
|
|
|
#010+
|
|
|
- 'override INSTALLTARGET+=fpc_shared_in','stall'#010+
|
|
|
+ 'override INSTA','LLTARGET+=fpc_shared_install'#010+
|
|
|
#010+
|
|
|
'ifndef SHARED_LIBVERSION'#010+
|
|
|
'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
|
|
|
@@ -1672,33 +1672,33 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifndef SHARED_FULLNAME'#010+
|
|
|
- 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+
|
|
|
- 'N)$(SHAREDLIBEX','T)'#010+
|
|
|
+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_L','IBVERS'+
|
|
|
+ 'ION)$(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 $(INSTALL_BUILDUNIT),$(SHARED_L'+
|
|
|
- 'IBUNITS))'#010+
|
|
|
+ 'IBUNITS))'#010,
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_shared:'#010+
|
|
|
- 'ifde','f HASSHAREDLIB'#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+
|
|
|
+ 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETD','IR)'#010+
|
|
|
'endif'#010+
|
|
|
'else'#010+
|
|
|
- ' ','@$(ECHO) Shared Libraries not supported'#010+
|
|
|
+ ' @$(ECHO) Shared Libraries not supported'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_shared_install:'#010+
|
|
|
'ifneq ($(SHARED_BUILD),n)'#010+
|
|
|
'ifneq ($(SHARED_LIBUNITS),)'#010+
|
|
|
'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
|
|
|
- ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED','_FULLNAME) $(IN'+
|
|
|
+ ' $(INSTALL) $(COMPILER_','UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+
|
|
|
'STALL_SHAREDDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1707,29 +1707,30 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'[installrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Install rules'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '#################################################################','###'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_insta','ll fpc_sourceinstall fpc_exampleinstall'#010+
|
|
|
+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALL_UNITS'#010+
|
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALL_BUILDUNIT'#010+
|
|
|
- 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
|
|
|
- '(INSTALLPPUF','ILES))'#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)'+
|
|
|
- ',$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(P','PUEX'+
|
|
|
+ ',$(INSTALLPPUFILES))) $(addprefix $(IMPOR','TLIBPREFIX),$(subst $(PPUEX'+
|
|
|
'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
|
|
|
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
|
|
|
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
|
|
|
'$(INSTALLPPUFILES)))'#010+
|
|
|
- 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
|
- 'EFI','X),$(notdir $(INSTALLPPULINKFILES))))'#010+
|
|
|
+ 'override INSTALLPPULINKFILES:=$(wildcard $(addpref','ix $(UNITTARGETDIR'+
|
|
|
+ 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
|
|
|
'endif'#010+
|
|
|
'# Implicitly install Package.fpc'#010+
|
|
|
'override INSTALL_CREATEPACKAGEFPC=1'#010+
|
|
|
@@ -1737,8 +1738,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
|
'ifneq ($(TARGETDIRPREFIX),)'#010+
|
|
|
- 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN',
|
|
|
- 'STALLEXEFILES)))'#010+
|
|
|
+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETD','IRPREFIX),$(notdir $('+
|
|
|
+ 'INSTALLEXEFILES)))'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1748,16 +1749,16 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'# Compress the exes if upx is defined'#010+
|
|
|
'ifdef UPXPROG'#010+
|
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
|
- 'endif'#010+
|
|
|
- ' $(INSTALLEXE) ','$(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
|
+ 'endif',#010+
|
|
|
+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
|
|
|
'ifdef FPCMAKE'#010+
|
|
|
'# If the fpcpackage variable is set then create and install Package.fp'+
|
|
|
'c,'#010+
|
|
|
'# a safety check is done if Makefile.fpc is available'#010+
|
|
|
- 'ifdef PACKAGE_VERSION'#010+
|
|
|
- 'ifn','eq ($(wildcard Makefile.fpc),)'#010+
|
|
|
+ 'if','def PACKAGE_VERSION'#010+
|
|
|
+ 'ifneq ($(wildcard Makefile.fpc),)'#010+
|
|
|
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
|
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
|
|
@@ -1765,14 +1766,14 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef INSTALLPPUFILES'#010+
|
|
|
- ' $(MKD','IR) $(INSTALL_UNITDIR)'#010+
|
|
|
+ 'ifdef INSTAL','LPPUFILES'#010+
|
|
|
+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
|
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
|
- ' $(MKDIR) $(INSTA','LL_LIBDIR)'#010+
|
|
|
+ ' ',' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
|
|
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
|
|
@@ -1781,23 +1782,23 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'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_SOURCEDIR)'#010+
|
|
|
#010+
|
|
|
- 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
|
|
- 'ifdef HASEXAMPLES'#010,
|
|
|
+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDI','RS))'#010+
|
|
|
+ 'ifdef HASEXAMPLES'#010+
|
|
|
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#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_EXAMPLEDIRS)',') $(INSTALL_'+
|
|
|
+ 'EXAMPLEDIR)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'[distinstallrules]'#010+
|
|
|
@@ -1807,7 +1808,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_distinstall'#010+
|
|
|
#010+
|
|
|
- 'fpc_distinstall: install example','install'#010+
|
|
|
+ 'fpc_disti','nstall: install exampleinstall'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[zipinstallrules]'#010+
|
|
|
@@ -1815,7 +1816,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'# Zip'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall',#010+
|
|
|
+ '.PHONY: fpc_zipinstall fpc_zipsourceinstal','l 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+
|
|
|
@@ -1824,10 +1825,10 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
|
|
|
'else'#010+
|
|
|
'PACKDIR=/tmp/fpc-pack'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'end','if'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Maybe creat','e default zipname from packagename'#010+
|
|
|
+ '# Maybe create default zipname from packagename'#010+
|
|
|
'ifndef ZIPNAME'#010+
|
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
|
@@ -1837,11 +1838,11 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifndef FULLZIPNAME'#010+
|
|
|
- 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
|
|
|
+ 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)',#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# ZipTarget'#010+
|
|
|
- 'ifn','def ZIPTARGET'#010+
|
|
|
+ 'ifndef ZIPTARGET'#010+
|
|
|
'ifdef DIST_ZIPTARGET'#010+
|
|
|
'ZIPTARGET=DIST_ZIPTARGET'#010+
|
|
|
'else'#010+
|
|
|
@@ -1856,9 +1857,9 @@ const fpcmakeini : array[0..217,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 O','s/2'#010+
|
|
|
'ifndef inUnix'#010+
|
|
|
- 'USEZI','PWRAPPER=1'#010+
|
|
|
+ 'USEZIPWRAPPER=1'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# We need to be able to run in the current OS so fix'#010+
|
|
|
@@ -1867,15 +1868,15 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
|
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
|
|
|
'else'#010+
|
|
|
- 'ZIPPATHSEP=/'#010+
|
|
|
+ 'ZIPPATHS','EP=/'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Create co','mmands 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+
|
|
|
'ifdef USETAR'#010+
|
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
|
|
|
- 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT',')f $(ZIPDESTFILE) *'#010+
|
|
|
+ 'ZIPCMD_ZI','P:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
|
|
|
'else'#010+
|
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
|
|
|
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
|
|
@@ -1883,21 +1884,21 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_zipinstall:'#010+
|
|
|
- ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPIN','STALL=1'#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','P'+
|
|
|
- 'ER)'#010+
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCM','D_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) >> $(ZIPWRAP','PER)'#010+
|
|
|
+ ' echo $(Z','IPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
@@ -1909,9 +1910,9 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
' $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- ' $(DEL) $(ZIPWRAPPER)'#010+
|
|
|
+ ' $(DEL) $(ZIPWRA','PPER)'#010+
|
|
|
'else'#010+
|
|
|
- ' $(ZI','PCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
|
|
+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
|
|
'endif'#010+
|
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
|
#010+
|
|
|
@@ -1920,9 +1921,9 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'SOURCESUFFIX)'#010+
|
|
|
#010+
|
|
|
'fpc_zipexampleinstall:'#010+
|
|
|
- 'ifdef HASEXAMPLES'#010+
|
|
|
- ' ',' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+
|
|
|
- 'ZIPEXAMPLESUFFIX)'#010+
|
|
|
+ 'if','def HASEXAMPLES'#010+
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
|
|
|
+ 'PEXAMPLESUFFIX)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_zipdistinstall:'#010+
|
|
|
@@ -1930,7 +1931,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[cleanrules]'#010+
|
|
|
- '##################################################################','##'+
|
|
|
+ '###########################################','#########################'+
|
|
|
'#'#010+
|
|
|
'# Clean rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1938,11 +1939,11 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
|
#010+
|
|
|
'ifdef EXEFILES'#010+
|
|
|
- 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
|
|
|
- '))'#010+
|
|
|
+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFI','L'+
|
|
|
+ 'ES))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'ifdef CLEA','N_PROGRAMS'#010+
|
|
|
+ 'ifdef CLEAN_PROGRAMS'#010+
|
|
|
'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
|
|
|
'XEEXT), $(CLEAN_PROGRAMS)))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1951,19 +1952,19 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'ifdef CLEANPPUFILES'#010+
|
|
|
- 'override CLEANPPU','LINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
|
|
|
- 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
|
|
|
- '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
|
|
|
- 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+
|
|
|
- 'ifdef DEBUGSYMEXT',#010+
|
|
|
+ 'ifdef CLEANPPU','FILES'#010+
|
|
|
+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
|
|
+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
|
|
|
+ 'LEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA'+
|
|
|
+ 'TICLIBEXT),$(CLEANPPUFIL','ES)))'#010+
|
|
|
+ 'ifdef DEBUGSYMEXT'#010+
|
|
|
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
|
|
|
'UFILES))'#010+
|
|
|
'endif'#010+
|
|
|
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
|
|
'ILES))'#010+
|
|
|
- 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
|
|
- 'IX),$(C','LEANPPULINKFILES)))'#010+
|
|
|
+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(U','NITTARGETDIRPR'+
|
|
|
+ 'EFIX),$(CLEANPPULINKFILES)))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_clean: $(CLEANTARGET)'#010+
|
|
|
@@ -1974,8 +1975,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
|
- ' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
- 'en','dif'#010+
|
|
|
+ ' -$(DEL) ','$(CLEANPPULINKFILES)'#010+
|
|
|
+ 'endif'#010+
|
|
|
'ifdef CLEANRSTFILES'#010+
|
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1984,44 +1985,44 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'ifdef LIB_NAME'#010+
|
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
|
- 'endif'#010+
|
|
|
- ' -$(DEL) $(FPC','MADE) Package.fpc $(PPAS) script.res link.res $'+
|
|
|
- '(FPCEXTFILE) $(REDIRFILE)'#010+
|
|
|
+ 'endi','f'#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+
|
|
|
- 'ifde','f CLEANPPUFILES'#010+
|
|
|
+ 'ifdef COMP','ILER_UNITTARGETDIR'#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+
|
|
|
+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010,
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef CLEAN','_FILES'#010+
|
|
|
+ 'ifdef CLEAN_FILES'#010+
|
|
|
' -$(DEL) $(CLEAN_FILES)'#010+
|
|
|
'endif'#010+
|
|
|
' -$(DELTREE) units'#010+
|
|
|
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
|
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
|
'ifneq ($(PPUEXT),.ppu)'#010+
|
|
|
- ' -$(DEL) *.o *.ppu *.a'#010+
|
|
|
+ ' -$(DEL) *.o *','.ppu *.a'#010+
|
|
|
'endif'#010+
|
|
|
- ' ','-$(DELTREE) *$(SMARTEXT)'#010+
|
|
|
+ ' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
|
' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
|
|
|
'CEXTFILE) $(REDIRFILE)'#010+
|
|
|
' -$(DEL) *_ppas$(BATCHEXT)'#010+
|
|
|
'ifdef AOUTEXT'#010+
|
|
|
' -$(DEL) *$(AOUTEXT)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef DEBUGSYMEXT'#010+
|
|
|
- ' -$(DEL) *$(DEB','UGSYMEXT)'#010+
|
|
|
+ 'ifdef DEBUGSYMEXT',#010+
|
|
|
+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_distclean: cleanall'#010+
|
|
|
@@ -2030,10 +2031,10 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'[baseinforules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Base info rules'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '#####################################################################'#010,
|
|
|
#010+
|
|
|
'.PHONY: fpc_baseinfo'#010+
|
|
|
- #010,
|
|
|
+ #010+
|
|
|
'override INFORULES+=fpc_baseinfo'#010+
|
|
|
#010+
|
|
|
'fpc_baseinfo:'#010+
|
|
|
@@ -2041,94 +2042,94 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
' @$(ECHO) == Package info =='#010+
|
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
|
- ' @$(ECHO)'#010+
|
|
|
- ' @$(ECH','O) == Configuration info =='#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) Target CPU... $(CPU_TARGET)'#010+
|
|
|
- ' @$(ECHO)',' Source OS.... $(OS_SOURCE)'#010+
|
|
|
+ ' @$(ECHO) Target CPU... $(CPU_T','ARGET)'#010+
|
|
|
+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
|
|
|
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
|
|
' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+
|
|
|
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
|
|
|
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
|
|
|
- ' @$(ECHO) Target','Suffix. $(TARGETSUFFIX)'#010+
|
|
|
+ ' ',' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
|
|
|
' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Directory info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) Basedir.','........ $(BASEDIR)'#010+
|
|
|
+ ' ',' @$(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)'#010+
|
|
|
+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Tools info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) As........ $(AS)'#010+
|
|
|
- ' @$(ECHO) Ld........ $(LD)'#010+
|
|
|
- ' @$(ECH','O) Ar........ $(AR)'#010+
|
|
|
+ ' @$(ECHO) Ld......','.. $(LD)'#010+
|
|
|
+ ' @$(ECHO) Ar........ $(AR)'#010+
|
|
|
' @$(ECHO) Rc........ $(RC)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Mv........ $(MVPROG)'#010+
|
|
|
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
|
- ' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
|
- ' @','$(ECHO) Echo...... $(ECHO)'#010+
|
|
|
+ ' @$(ECHO) GInstall.','. $(GINSTALL)'#010+
|
|
|
+ ' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
|
' @$(ECHO) Shell..... $(SHELL)'#010+
|
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
|
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
|
- ' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
|
- ' @$(ECHO) ',' Zip....... $(ZIPPROG)'#010+
|
|
|
+ ' @$(ECHO) Upx....... $(UPX','PROG)'#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 Implic','it Units. $(TARGET_IMPLICITUNITS)'#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 Examp','leDirs.... $(TARGET_EXAMPLEDIRS)'#010+
|
|
|
+ ' ',' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
|
|
|
' @$(ECHO)'#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) Install Units....... $(I','NSTALL_UNITS)'#010+
|
|
|
+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Install info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
|
- ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
|
|
|
- ' @$(ECHO) Zi','pPrefix............ $(ZIPPREFIX)'#010+
|
|
|
+ ' @$(ECHO) ZipName.............. $(ZIPNAM','E)'#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) ','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 u','nits dir.... $(INSTALL_UNITDIR)'#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 d','ata dir..... $(INSTALL_DATADIR)'#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+
|
|
|
#010+
|
|
|
'[inforules]'#010+
|
|
|
- '#################################################','###################'+
|
|
|
+ '##########################','##########################################'+
|
|
|
'#'#010+
|
|
|
'# Info rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2138,8 +2139,9 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'fpc_info: $(INFORULES)'#010+
|
|
|
#010+
|
|
|
'[makefilerules]'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
- '# Rebui','ld Makefile'#010+
|
|
|
+ '######################################################','##############'+
|
|
|
+ '#'#010+
|
|
|
+ '# Rebuild Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
|
|
|
@@ -2147,7 +2149,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
' fpc_makefile_dirs'#010+
|
|
|
#010+
|
|
|
'fpc_makefile:'#010+
|
|
|
- ' $(FPCMAKE) -w -T$(OS_TARGET) Makefi','le.fpc'#010+
|
|
|
+ ' $(FPCMAKE) -','w -T$(OS_TARGET) Makefile.fpc'#010+
|
|
|
#010+
|
|
|
'fpc_makefile_sub1:'#010+
|
|
|
'ifdef TARGET_DIRS'#010+
|
|
|
@@ -2155,8 +2157,8 @@ const fpcmakeini : array[0..217,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_'+
|
|
|
@@ -2167,7 +2169,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
|
|
|
#010+
|
|
|
'[localmakefile]'#010+
|
|
|
- '############################','########################################'+
|
|
|
+ '#####','###############################################################'+
|
|
|
'#'#010+
|
|
|
'# Local Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2178,7 +2180,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[userrules]'#010+
|
|
|
- '#####################################','###############################'+
|
|
|
+ '##############','######################################################'+
|
|
|
'#'#010+
|
|
|
'# Users rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2186,7 +2188,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'[lclrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# LCL Rules'#010+
|
|
|
- '#############################','#######################################'+
|
|
|
+ '######','##############################################################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'# LCL Platform'#010+
|
|
|
@@ -2199,7 +2201,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'export LCL_PLATFORM'#010+
|
|
|
#010+
|
|
|
- '# Check if the specified LCLDIR is correc','t'#010+
|
|
|
+ '# Check if the spe','cified LCLDIR is correct'#010+
|
|
|
'ifdef LCLDIR'#010+
|
|
|
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
|
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
|
@@ -2210,8 +2212,8 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Check if the default LCLDIR is correct'#010+
|
|
|
- 'ifdef DEFAULT_LCLDIR'#010+
|
|
|
- 'override ','LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
|
|
+ 'ifdef D','EFAULT_LCLDIR'#010+
|
|
|
+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2219,7 +2221,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'# Check for development version'#010+
|
|
|
'ifeq ($(LCLDIR),wrong)'#010+
|
|
|
- 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword',' $(wildca'+
|
|
|
+ 'override LCLDIR=$(subst /units/$(LCL','_PLATFORM),,$(firstword $(wildca'+
|
|
|
'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
@@ -2228,7 +2230,7 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
#010+
|
|
|
'# Check for release version'#010+
|
|
|
'ifeq ($(LCLDIR),wrong)'#010+
|
|
|
- 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword',' $(wildca'+
|
|
|
+ 'override LCLDIR=$(subst /units/$(LCL','_PLATFORM),,$(firstword $(wildca'+
|
|
|
'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
|
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
@@ -2236,15 +2238,15 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Generate dirs'#010+
|
|
|
- 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
|
|
|
- 'IR)/units)'#010+
|
|
|
- 'override LC','LCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+
|
|
|
- 'nents $(LCLDIR)/components)'#010+
|
|
|
+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL',
|
|
|
+ 'DIR)/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 COMPILER','_UNITDIR+=$(LCLUNITDIR)'#010+
|
|
|
#010+
|
|
|
'[lclinforules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2252,14 +2254,14 @@ const fpcmakeini : array[0..217,1..240] of char=(
|
|
|
'#####################################################################'#010+
|
|
|
'override INFORULES+=lclinfo'#010+
|
|
|
#010+
|
|
|
- '.PHONY: lclinfo'#010+
|
|
|
+ '.PHONY: lclinf','o'#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.... $','(LCLCOMPONENTDIR)'#010+
|
|
|
+ ' @$(ECHO) ','LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
|
|
|
' @$(ECHO)'#010
|
|
|
);
|
pierre