|
|
@@ -1563,7 +1563,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'# create always pic'#039'ed code on x86_64'#010+
|
|
|
'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+
|
|
|
- 'ifeq ($(OS_TARGET),linux)'#010+
|
|
|
+ 'ifneq ($(findstring $(OS_TARGET),linux solaris),)'#010+
|
|
|
'ifeq ($(CPU_TARGET),x86_64)'#010+
|
|
|
'override FPCOPT+=-Cg'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1571,7 +1571,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef LINKSHARED'#010+
|
|
|
- '#!!! deactived for testing ove','rride FPCOPT+=-XD'#010+
|
|
|
+ '#!!! d','eactived for testing override FPCOPT+=-XD'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
@@ -1586,7 +1586,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[command_end]'#010+
|
|
|
- '# Add commandline options l','ast so they can override'#010+
|
|
|
+ '# A','dd commandline options last so they can override'#010+
|
|
|
'ifdef OPT'#010+
|
|
|
'override FPCOPT+=$(OPT)'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1597,8 +1597,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Was a config file specified ?'#010+
|
|
|
- 'ifdef CFGFILE'#010+
|
|
|
- 'override FPCOPT+=@$(','CFGFILE)'#010+
|
|
|
+ 'ifdef CFGF','ILE'#010+
|
|
|
+ 'override FPCOPT+=@$(CFGFILE)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Use the environment to pass commandline options?'#010+
|
|
|
@@ -1609,7 +1609,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
|
|
|
- 'override AFULL_SOURCE=$(CPU_S','OURCE)-$(OS_SOURCE)'#010+
|
|
|
+ 'overr','ide AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
|
|
|
#010+
|
|
|
'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
|
|
|
'override ACROSSCOMPILE=1'#010+
|
|
|
@@ -1622,7 +1622,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'# Compiler commandline'#010+
|
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
|
#010+
|
|
|
- '# also call ppas if with comman','d option -s'#010+
|
|
|
+ '# also ','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+
|
|
|
@@ -1631,9 +1631,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'ifdef RUNBATCH'#010+
|
|
|
'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
|
|
|
'else'#010+
|
|
|
- 'EXECPPAS:=@$(PPAS)'#010+
|
|
|
+ 'EXECPPA','S:=@$(PPAS)'#010+
|
|
|
+ 'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'endif'#010,
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
@@ -1644,8 +1644,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_loaders'#010+
|
|
|
#010+
|
|
|
- 'ifneq ($(TARGET_LOADERS),)'#010+
|
|
|
- 'override ALLTARGET+','=fpc_loaders'#010+
|
|
|
+ 'ifneq ($(TARGET_LOADER','S),)'#010+
|
|
|
+ 'override ALLTARGET+=fpc_loaders'#010+
|
|
|
'override CLEANTARGET+=fpc_loaders_clean'#010+
|
|
|
'override INSTALLTARGET+=fpc_loaders_install'#010+
|
|
|
#010+
|
|
|
@@ -1653,8 +1653,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'%$(OEXT): %$(LOADEREXT)'#010+
|
|
|
- 'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
- ' $(AS) -o $(C','OMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
|
|
|
+ 'ifdef COMPILER_UNITTARGET','DIR'#010+
|
|
|
+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
|
|
|
'else'#010+
|
|
|
' $(AS) -o $*$(OEXT) $<'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1663,7 +1663,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_loaders_clean:'#010+
|
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
- ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(L','OADEROFILE'+
|
|
|
+ ' -$(DEL) $(addprefix $(COMP','ILER_UNITTARGETDIR)/,$(LOADEROFILE'+
|
|
|
'S))'#010+
|
|
|
'else'#010+
|
|
|
' -$(DEL) $(LOADEROFILES)'#010+
|
|
|
@@ -1673,8 +1673,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
|
|
|
- 'ES)) $(INSTALL_UNITDIR)'#010+
|
|
|
- 'el','se'#010+
|
|
|
+ 'ES',')) $(INSTALL_UNITDIR)'#010+
|
|
|
+ 'else'#010+
|
|
|
' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1682,17 +1682,18 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'[unitrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Units'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '#############################################################','#######'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_un','its'#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 INSTALLPP','UFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
|
+ 'N','ITS))'#010+
|
|
|
+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1700,7 +1701,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[exerules]'#010+
|
|
|
- '#######################################################','#############'+
|
|
|
+ '###############################','#####################################'+
|
|
|
'#'#010+
|
|
|
'# Exes'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1710,19 +1711,19 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'# Programs are not needed for a cross installation'#010+
|
|
|
'ifndef CROSSINSTALL'#010+
|
|
|
'ifneq ($(TARGET_PROGRAMS),)'#010+
|
|
|
- 'override EXEFILES=$(addsuffix ','$(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
+ 'overri','de EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
|
|
|
'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+
|
|
|
- '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PR',
|
|
|
- 'OGRAMS)))'#010+
|
|
|
+ '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(S','TATICLIBEXT),$(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_PROGRAMS)',')'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifeq ($(OS_TARGE','T),emx)'#010+
|
|
|
+ 'ifeq ($(OS_TARGET),emx)'#010+
|
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1732,7 +1733,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[rstrules]'#010+
|
|
|
- '###############################################################','#####'+
|
|
|
+ '#######################################','#############################'+
|
|
|
'#'#010+
|
|
|
'# Resource strings'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1743,10 +1744,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'override CLEANRSTFILES+=$(RSTFILES)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- #010+
|
|
|
+ #010,
|
|
|
'[examplerules]'#010+
|
|
|
- '#########','###########################################################'+
|
|
|
- '#'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'# Examples'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
@@ -1754,24 +1754,24 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'ifneq ($(TARGET_EXAMPLES),)'#010+
|
|
|
'HASEXAMPLES=1'#010+
|
|
|
- 'override EXAMPLESOURCEFILES:=$(wi','ldcard $(addsuffix .pp,$(TARGET_EXA'+
|
|
|
+ 'override ','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 EXAMPLEOFIL','ES:=$(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_EXAMPLE','S))'#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+=$(EXAMPLEFI','LES) $(EXAMPLEOFILES)'#010+
|
|
|
+ 'override CL','EANEXEFILES+=$(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+
|
|
|
+ 'endif'#010,
|
|
|
'endif'#010+
|
|
|
- 'endif'#010+
|
|
|
- 'ifneq ($(TARGET_EX','AMPLEDIRS),)'#010+
|
|
|
+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+
|
|
|
'HASEXAMPLES=1'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1781,19 +1781,18 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'[compilerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
- '# General compile rules'#010+
|
|
|
- '#####################','###############################################'+
|
|
|
- '#'#010+
|
|
|
+ '# General compile rul','es'#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: $(FPCMAD','E)'#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+
|
|
|
@@ -1804,7 +1803,7 @@ const fpcmakeini : array[0..227,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: $(EXE','EXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+
|
|
|
#010+
|
|
|
'$(COMPILER_UNITTARGETDIR):'#010+
|
|
|
' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
|
|
|
@@ -1814,9 +1813,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'%$(PPUEXT): %.pp'#010+
|
|
|
' $(COMPILER) $<'#010+
|
|
|
- ' $(EXECPPAS)'#010+
|
|
|
+ ' ',' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
- '%$(PPUEXT','): %.pas'#010+
|
|
|
+ '%$(PPUEXT): %.pas'#010+
|
|
|
' $(COMPILER) $<'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
@@ -1829,10 +1828,10 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(EXEEXT): %.lpr'#010+
|
|
|
- ' $(COMPILER) $<'#010+
|
|
|
+ ' $(COMPILER) $<',#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
- '%$','(EXEEXT): %.dpr'#010+
|
|
|
+ '%$(EXEEXT): %.dpr'#010+
|
|
|
' $(COMPILER) $<'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
@@ -1841,12 +1840,12 @@ const fpcmakeini : array[0..227,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 %.pas ','$(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) $(COMPILER_U','NITTARGETDIR)'#010+
|
|
|
+ 'vpath',' %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
|
|
#010+
|
|
|
'[sharedrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1855,7 +1854,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_shared'#010+
|
|
|
#010+
|
|
|
- 'override INSTALLTARGET+=fpc_shared_insta','ll'#010+
|
|
|
+ 'override INSTALL','TARGET+=fpc_shared_install'#010+
|
|
|
#010+
|
|
|
'ifndef SHARED_LIBVERSION'#010+
|
|
|
'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
|
|
|
@@ -1866,8 +1865,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifndef SHARED_FULLNAME'#010+
|
|
|
- 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+
|
|
|
- 'N)$(SHAREDLIBEXT)'#010,
|
|
|
+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIB','VERS'+
|
|
|
+ 'ION)$(SHAREDLIBEXT)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Default sharedlib units are all unit objects'#010+
|
|
|
@@ -1875,24 +1874,24 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
|
|
|
'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
|
|
|
'IBUNITS))'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'en','dif'#010+
|
|
|
#010+
|
|
|
'fpc_shared:'#010+
|
|
|
- 'ifdef H','ASSHAREDLIB'#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_UNITTARGETDIR',')'#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_FU','LLNAME) $(IN'+
|
|
|
+ ' $(INSTALL) $(COMPILER_UN','ITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+
|
|
|
'STALL_SHAREDDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1901,29 +1900,30 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'[installrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Install rules'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '###################################################################','#'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_install ','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),$'+
|
|
|
- '(INSTALLPPUFILE','S))'#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 $(PPUE','X'+
|
|
|
+ ',$(INSTALLPPUFILES))) $(addprefix $(IMPORTL','IBPREFIX),$(subst $(PPUEX'+
|
|
|
'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
|
|
|
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
|
|
|
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
|
|
|
'$(INSTALLPPUFILES)))'#010+
|
|
|
- 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
|
- 'EFIX),','$(notdir $(INSTALLPPULINKFILES))))'#010+
|
|
|
+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix',' $(UNITTARGETDIR'+
|
|
|
+ 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
|
|
|
'endif'#010+
|
|
|
'# Implicitly install Package.fpc'#010+
|
|
|
'override INSTALL_CREATEPACKAGEFPC=1'#010+
|
|
|
@@ -1931,8 +1931,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
|
'ifneq ($(TARGETDIRPREFIX),)'#010+
|
|
|
- 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
|
|
|
- 'STA','LLEXEFILES)))'#010+
|
|
|
+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIR','PREFIX),$(notdir $('+
|
|
|
+ 'INSTALLEXEFILES)))'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1943,15 +1943,15 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'ifdef UPXPROG'#010+
|
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
|
'endif'#010+
|
|
|
- ' $(INSTALLEXE) $(I','NSTALLEXEFILES) $(INSTALL_BINDIR)'#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+
|
|
|
- 'ifneq ','($(wildcard Makefile.fpc),)'#010+
|
|
|
+ 'ifde','f 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+
|
|
|
@@ -1959,14 +1959,14 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef INSTALLPPUFILES'#010+
|
|
|
- ' $(MKDIR)',' $(INSTALL_UNITDIR)'#010+
|
|
|
+ 'ifdef INSTALLP','PUFILES'#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) $(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+
|
|
|
@@ -1975,24 +1975,24 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'ifdef INSTALL_FILES'#010+
|
|
|
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
|
|
- ' $(INSTALL) $(INSTALL_FI','LES) $(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+
|
|
|
+ '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 TARGET_EXAMPLEDIRS'#010+
|
|
|
- ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
|
|
|
- 'AMPLEDIR)'#010+
|
|
|
- 'en','dif'#010+
|
|
|
+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) ','$(INSTALL_'+
|
|
|
+ 'EXAMPLEDIR)'#010+
|
|
|
+ 'endif'#010+
|
|
|
#010+
|
|
|
'[distinstallrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2001,7 +2001,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_distinstall'#010+
|
|
|
#010+
|
|
|
- 'fpc_distinstall: install exampleins','tall'#010+
|
|
|
+ 'fpc_distins','tall: install exampleinstall'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[zipinstallrules]'#010+
|
|
|
@@ -2009,19 +2009,19 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'# Zip'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
|
|
|
+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall ','fpc_zipexampleinstall'#010+
|
|
|
#010+
|
|
|
- '#',' Temporary path to pack a file, can only use a single deep'#010+
|
|
|
+ '# Temporary path to pack a file, can only use a single deep'#010+
|
|
|
'# subdir, because the deltree can'#039't see the whole tree to remove'#010+
|
|
|
'ifndef PACKDIR'#010+
|
|
|
'ifndef inUnix'#010+
|
|
|
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
|
|
|
'else'#010+
|
|
|
'PACKDIR=/tmp/fpc-pack'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'endif',#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Maybe create d','efault zipname from packagename'#010+
|
|
|
+ '# Maybe create default zipname from packagename'#010+
|
|
|
'ifndef ZIPNAME'#010+
|
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
|
@@ -2032,10 +2032,10 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'ifndef FULLZIPNAME'#010+
|
|
|
'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'e','ndif'#010+
|
|
|
#010+
|
|
|
'# ZipTarget'#010+
|
|
|
- 'ifndef',' ZIPTARGET'#010+
|
|
|
+ 'ifndef ZIPTARGET'#010+
|
|
|
'ifdef DIST_ZIPTARGET'#010+
|
|
|
'ZIPTARGET=DIST_ZIPTARGET'#010+
|
|
|
'else'#010+
|
|
|
@@ -2050,9 +2050,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Use a wrapper script by default for Os/2'#010+
|
|
|
+ '# Use a wrapper script by default for Os/','2'#010+
|
|
|
'ifndef inUnix'#010+
|
|
|
- 'USEZIPWR','APPER=1'#010+
|
|
|
+ 'USEZIPWRAPPER=1'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# We need to be able to run in the current OS so fix'#010+
|
|
|
@@ -2061,15 +2061,15 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
|
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
|
|
|
'else'#010+
|
|
|
- 'ZIPPATHSEP=/'#010+
|
|
|
+ 'ZIPPATHSEP','=/'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Create comma','nds 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_ZIP:','=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
|
|
|
'else'#010+
|
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
|
|
|
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
|
|
@@ -2077,21 +2077,21 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_zipinstall:'#010+
|
|
|
- ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTA','LL=1'#010+
|
|
|
+ ' $(MAKE) $(ZIPTARGET) INSTALL_PR','EFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
|
' $(MKDIR) $(DIST_DESTDIR)'#010+
|
|
|
' $(DEL) $(ZIPDESTFILE)'#010+
|
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
|
'# Handle gecho separate as we need to espace \ with \\'#010+
|
|
|
'ifneq ($(ECHOREDIR),echo)'#010+
|
|
|
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
|
|
|
- 'R',')'#010+
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_','CDPACK))" > $(ZIPWRAP'+
|
|
|
+ 'PER)'#010+
|
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
|
|
|
#010+
|
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
|
|
|
'ER)'#010+
|
|
|
'else'#010+
|
|
|
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
|
|
|
- ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER',')'#010+
|
|
|
+ ' echo $(ZIP','CMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
@@ -2103,9 +2103,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
' $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- ' $(DEL) $(ZIPWRAPPER)'#010+
|
|
|
+ ' $(DEL) $(ZIPWRAPP','ER)'#010+
|
|
|
'else'#010+
|
|
|
- ' $(ZIPCM','D_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
|
|
+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
|
|
'endif'#010+
|
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
|
#010+
|
|
|
@@ -2114,9 +2114,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'SOURCESUFFIX)'#010+
|
|
|
#010+
|
|
|
'fpc_zipexampleinstall:'#010+
|
|
|
- 'ifdef HASEXAMPLES'#010+
|
|
|
- ' $(','MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+
|
|
|
- 'ZIPEXAMPLESUFFIX)'#010+
|
|
|
+ 'ifde','f HASEXAMPLES'#010+
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
|
|
|
+ 'PEXAMPLESUFFIX)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_zipdistinstall:'#010+
|
|
|
@@ -2124,19 +2124,19 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[cleanrules]'#010+
|
|
|
- '#####################################################################',
|
|
|
- #010+
|
|
|
+ '#############################################','#######################'+
|
|
|
+ '#'#010+
|
|
|
'# Clean rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
|
#010+
|
|
|
'ifdef EXEFILES'#010+
|
|
|
- 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
|
|
|
- '))'#010+
|
|
|
+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILE',
|
|
|
+ 'S))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'ifdef CLEAN_P','ROGRAMS'#010+
|
|
|
+ 'ifdef CLEAN_PROGRAMS'#010+
|
|
|
'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
|
|
|
'XEEXT), $(CLEAN_PROGRAMS)))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2145,19 +2145,19 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'ifdef CLEANPPUFILES'#010+
|
|
|
- 'override CLEANPPULIN','KFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
|
|
|
- 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
|
|
|
- '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
|
|
|
- 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+
|
|
|
+ 'ifdef CLEANPPUFI','LES'#010+
|
|
|
+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
|
|
+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
|
|
|
+ 'LEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA'+
|
|
|
+ 'TICLIBEXT),$(CLEANPPUFILES',')))'#010+
|
|
|
'ifdef DEBUGSYMEXT'#010+
|
|
|
- 'ov','erride CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+
|
|
|
- 'PPUFILES))'#010+
|
|
|
+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
|
|
|
+ 'UFILES))'#010+
|
|
|
'endif'#010+
|
|
|
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
|
|
'ILES))'#010+
|
|
|
- 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
|
|
- 'IX),$(CLEA','NPPULINKFILES)))'#010+
|
|
|
+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNI','TTARGETDIRPR'+
|
|
|
+ 'EFIX),$(CLEANPPULINKFILES)))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_clean: $(CLEANTARGET)'#010+
|
|
|
@@ -2168,8 +2168,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
|
- ' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
- 'endif',#010+
|
|
|
+ ' -$(DEL) $(','CLEANPPULINKFILES)'#010+
|
|
|
+ 'endif'#010+
|
|
|
'ifdef CLEANRSTFILES'#010+
|
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2178,17 +2178,17 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'ifdef LIB_NAME'#010+
|
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
|
- 'endif'#010+
|
|
|
- ' -$(DEL) $(FPCMAD','E) Package.fpc $(PPAS) script.res link.res $'+
|
|
|
- '(FPCEXTFILE) $(REDIRFILE)'#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 C','LEANPPUFILES'#010+
|
|
|
+ 'ifdef COMPIL','ER_UNITTARGETDIR'#010+
|
|
|
+ 'ifdef CLEANPPUFILES'#010+
|
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
|
@@ -2196,18 +2196,18 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'ifdef CLEANRSTFILES'#010+
|
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
|
+ 'en','dif'#010+
|
|
|
'endif'#010+
|
|
|
- 'endif'#010+
|
|
|
- 'ifdef CLEAN_FI','LES'#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 *.p','pu *.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+
|
|
|
@@ -2215,7 +2215,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
' -$(DEL) *$(AOUTEXT)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef DEBUGSYMEXT'#010+
|
|
|
- ' -$(DEL) *$(DEBUGS','YMEXT)'#010+
|
|
|
+ ' ',' -$(DEL) *$(DEBUGSYMEXT)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_distclean: cleanall'#010+
|
|
|
@@ -2226,103 +2226,103 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'# Base info rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_baseinfo'#010+
|
|
|
+ '.','PHONY: fpc_baseinfo'#010+
|
|
|
#010+
|
|
|
- 'ove','rride INFORULES+=fpc_baseinfo'#010+
|
|
|
+ 'override INFORULES+=fpc_baseinfo'#010+
|
|
|
#010+
|
|
|
'fpc_baseinfo:'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Package info =='#010+
|
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
|
- ' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) ',' == 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) S','ource OS.... $(OS_SOURCE)'#010+
|
|
|
+ ' @$(ECHO) Target CPU... $(CPU_TAR','GET)'#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) TargetSuf','fix. $(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+
|
|
|
- ' @$(ECH','O) 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+
|
|
|
- ' @$(ECHO) ',' 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+
|
|
|
- ' @$(E','CHO) 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) Zi','p....... $(ZIPPROG)'#010+
|
|
|
+ ' @$(ECHO) Upx....... $(UPXPR','OG)'#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 Implicit ','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 ExampleD','irs.... $(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+
|
|
|
- ' @$(E','CHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
|
+ ' @$(ECHO) Install Units....... $(INS','TALL_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) ZipPr','efix............ $(ZIPPREFIX)'#010+
|
|
|
+ ' @$(ECHO) ZipName.............. $(ZIPNAME)',#010+
|
|
|
+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
|
|
|
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
|
|
|
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
|
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
|
|
|
- ' @$(ECHO) Install FPC Package.. $(IN','STALL_FPCPACKAGE)'#010+
|
|
|
+ ' @$(ECHO) In','stall 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 unit','s 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 data',' 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+
|
|
|
@@ -2332,8 +2332,9 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'fpc_info: $(INFORULES)'#010+
|
|
|
#010+
|
|
|
'[makefilerules]'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
- '# Rebuild ','Makefile'#010+
|
|
|
+ '########################################################','############'+
|
|
|
+ '#'#010+
|
|
|
+ '# Rebuild Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
|
|
|
@@ -2341,7 +2342,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
' fpc_makefile_dirs'#010+
|
|
|
#010+
|
|
|
'fpc_makefile:'#010+
|
|
|
- ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.','fpc'#010+
|
|
|
+ ' $(FPCMAKE) -w ','-T$(OS_TARGET) Makefile.fpc'#010+
|
|
|
#010+
|
|
|
'fpc_makefile_sub1:'#010+
|
|
|
'ifdef TARGET_DIRS'#010+
|
|
|
@@ -2349,9 +2350,9 @@ const fpcmakeini : array[0..227,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+
|
|
|
- 'en','dif'#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_'+
|
|
|
'EXAMPLEDIRS))'#010+
|
|
|
@@ -2361,7 +2362,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
|
|
|
#010+
|
|
|
'[localmakefile]'#010+
|
|
|
- '###############################','#####################################'+
|
|
|
+ '#######','#############################################################'+
|
|
|
'#'#010+
|
|
|
'# Local Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2372,7 +2373,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[userrules]'#010+
|
|
|
- '########################################','############################'+
|
|
|
+ '################','####################################################'+
|
|
|
'#'#010+
|
|
|
'# Users rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -2380,7 +2381,7 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'[lclrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# LCL Rules'#010+
|
|
|
- '################################','####################################'+
|
|
|
+ '########','############################################################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'# LCL Platform'#010+
|
|
|
@@ -2393,8 +2394,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'export LCL_PLATFORM'#010+
|
|
|
#010+
|
|
|
- '# Check if the specified LCLDIR is correct'#010+
|
|
|
- 'i','fdef LCLDIR'#010+
|
|
|
+ '# Check if the speci','fied LCLDIR is correct'#010+
|
|
|
+ 'ifdef LCLDIR'#010+
|
|
|
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
|
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
@@ -2404,8 +2405,8 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'# Check if the default LCLDIR is correct'#010+
|
|
|
- 'ifdef DEFAULT_LCLDIR'#010+
|
|
|
- 'override LCL','DIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
|
|
+ 'ifdef DEF','AULT_LCLDIR'#010+
|
|
|
+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
'endif'#010+
|
|
|
@@ -2413,7 +2414,7 @@ const fpcmakeini : array[0..227,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_P','LATFORM),,$(firstword $(wildca'+
|
|
|
'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
@@ -2422,7 +2423,7 @@ const fpcmakeini : array[0..227,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_P','LATFORM),,$(firstword $(wildca'+
|
|
|
'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
|
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
|
'override LCLDIR=wrong'#010+
|
|
|
@@ -2431,29 +2432,29 @@ const fpcmakeini : array[0..227,1..240] of char=(
|
|
|
#010+
|
|
|
'# Generate dirs'#010+
|
|
|
'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
|
|
|
- 'IR)/units)'#010+
|
|
|
- 'override LCLCO','MPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+
|
|
|
- 'nents $(LCLDIR)/components)'#010+
|
|
|
+ 'I','R)/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_U','NITDIR+=$(LCLUNITDIR)'#010+
|
|
|
#010+
|
|
|
- '[','lclinforules]'#010+
|
|
|
+ '[lclinforules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# LCL Info rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'override INFORULES+=lclinfo'#010+
|
|
|
#010+
|
|
|
- '.PHONY: lclinfo'#010+
|
|
|
+ '.PHONY: lclinfo'#010,
|
|
|
#010+
|
|
|
'lclinfo:'#010+
|
|
|
- ' @$(ECH','O) == 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.... $(LC','LCOMPONENTDIR)'#010+
|
|
|
+ ' @$(ECHO) LC','L Component dir.... $(LCLCOMPONENTDIR)'#010+
|
|
|
' @$(ECHO)'#010
|
|
|
);
|
pierre