|
@@ -794,18 +794,18 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[command_end]'#010+
|
|
'[command_end]'#010+
|
|
'# Smartlinking'#010+
|
|
'# Smartlinking'#010+
|
|
'ifdef LINKSMART'#010+
|
|
'ifdef LINKSMART'#010+
|
|
- 'override FPCOPT+=-CX'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-XX'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Smartlinking'#010+
|
|
|
|
|
|
+ '# Smartlinking creation'#010+
|
|
'ifdef CREATESMART'#010+
|
|
'ifdef CREATESMART'#010+
|
|
- 'override FPCOPT+=-XX'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-CX'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Debug'#010+
|
|
'# Debug'#010+
|
|
'ifdef DEBUG'#010+
|
|
'ifdef DEBUG'#010+
|
|
- 'override FPCOPT+=-g -dDEBUG'#010+
|
|
|
|
- 'en','dif'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-g -','dDEBUG'#010+
|
|
|
|
+ 'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
|
|
'# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
|
|
'# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+
|
|
'# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+
|
|
@@ -813,8 +813,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifeq ($(FPC_VERSION),0.99.12)'#010+
|
|
'ifeq ($(FPC_VERSION),0.99.12)'#010+
|
|
'override FPCOPT+=-Xs -OGp3 -n'#010+
|
|
'override FPCOPT+=-Xs -OGp3 -n'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- 'override FPCOPT+=-Xs -OG2p3 -n'#010+
|
|
|
|
- 'e','ndif'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-Xs -O','G2p3 -n'#010+
|
|
|
|
+ 'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Strip'#010+
|
|
'# Strip'#010+
|
|
@@ -833,8 +833,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Add commandline options'#010+
|
|
'# Add commandline options'#010+
|
|
- 'ifdef OPT'#010+
|
|
|
|
- 'ove','rride FPCOPT+=$(OPT)'#010+
|
|
|
|
|
|
+ 'ifde','f OPT'#010+
|
|
|
|
+ 'override FPCOPT+=$(OPT)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef UNITDIR'#010+
|
|
'ifdef UNITDIR'#010+
|
|
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
|
|
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
|
|
@@ -845,8 +845,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifdef OBJDIR'#010+
|
|
'ifdef OBJDIR'#010+
|
|
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
|
|
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'ifdef INCDIR'#010+
|
|
|
|
- 'override ','FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
|
|
|
|
|
|
+ 'ifdef INCDIR'#010,
|
|
|
|
+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Add defines from FPCOPTDEF to FPCOPT'#010+
|
|
'# Add defines from FPCOPTDEF to FPCOPT'#010+
|
|
@@ -859,8 +859,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'override FPCOPT+=-Fr$(ERRORFILE)'#010+
|
|
'override FPCOPT+=-Fr$(ERRORFILE)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Was a config file specified ?'#010+
|
|
|
|
- 'ifd','ef CFGFILE'#010+
|
|
|
|
|
|
+ '# Was a config file specif','ied ?'#010+
|
|
|
|
+ 'ifdef CFGFILE'#010+
|
|
'override FPCOPT+=@$(CFGFILE)'#010+
|
|
'override FPCOPT+=@$(CFGFILE)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -871,7 +871,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'FPCEXTFILE=fpcext.cmd'#010+
|
|
'FPCEXTFILE=fpcext.cmd'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifeq ($(OS_SOURCE),win32)'#010+
|
|
'ifeq ($(OS_SOURCE),win32)'#010+
|
|
- 'override TMPVAR:=$(shell "$(DEL) $(FPCE','XTFILE)")'#010+
|
|
|
|
|
|
+ 'override TMPVAR:=$(shell "$(DE','L) $(FPCEXTFILE)")'#010+
|
|
'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+
|
|
'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+
|
|
'PCEXTFILE)"))'#010+
|
|
'PCEXTFILE)"))'#010+
|
|
'override FPCOPT:=@$(FPCEXTFILE)'#010+
|
|
'override FPCOPT:=@$(FPCEXTFILE)'#010+
|
|
@@ -879,7 +879,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'[command_win32env]'#010+
|
|
'[command_win32env]'#010+
|
|
'# For win32 the options are passed using the environment FPCEXTCMD'#010+
|
|
'# For win32 the options are passed using the environment FPCEXTCMD'#010+
|
|
- 'ifeq ($(OS_SOURCE),wi','n32)'#010+
|
|
|
|
|
|
+ 'ifeq ($(OS_S','OURCE),win32)'#010+
|
|
'override FPCEXTCMD:=$(FPCOPT)'#010+
|
|
'override FPCEXTCMD:=$(FPCOPT)'#010+
|
|
'override FPCOPT:=!FPCEXTCMD'#010+
|
|
'override FPCOPT:=!FPCEXTCMD'#010+
|
|
'export FPCEXTCMD'#010+
|
|
'export FPCEXTCMD'#010+
|
|
@@ -890,7 +890,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
#010+
|
|
#010+
|
|
'# also call ppas if with command option -s'#010+
|
|
'# also call ppas if with command option -s'#010+
|
|
- 'ifeq (,$(findstring -s ,$(COMPI','LER)))'#010+
|
|
|
|
|
|
+ 'ifeq (,$(findstring -s',' ,$(COMPILER)))'#010+
|
|
'EXECPPAS='#010+
|
|
'EXECPPAS='#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'EXECPPAS:=@$(PPAS)'#010+
|
|
'EXECPPAS:=@$(PPAS)'#010+
|
|
@@ -902,14 +902,14 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'# Standard rules'#010+
|
|
'# Standard rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '[packagedependrul','es]'#010+
|
|
|
|
|
|
+ '[package','dependrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Package depends'#010+
|
|
'# Package depends'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[loaderrules]'#010+
|
|
'[loaderrules]'#010+
|
|
- '##############################################################','######'+
|
|
|
|
|
|
+ '#####################################################','###############'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Loaders'#010+
|
|
'# Loaders'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -920,8 +920,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' $(AS) -o $*$(OEXT) $<'#010+
|
|
' $(AS) -o $*$(OEXT) $<'#010+
|
|
#010+
|
|
#010+
|
|
'override ALLTARGET+=fpc_loaders'#010+
|
|
'override ALLTARGET+=fpc_loaders'#010+
|
|
- 'override CLEANTARGET+=fpc_loaders_clean'#010+
|
|
|
|
- 'ove','rride SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
|
|
|
|
|
|
+ 'override CLEANTARGET+=fpc_loaders_','clean'#010+
|
|
|
|
+ 'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
|
|
'override INSTALLTARGET+=fpc_loaders_install'#010+
|
|
'override INSTALLTARGET+=fpc_loaders_install'#010+
|
|
#010+
|
|
#010+
|
|
'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
|
|
'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
|
|
@@ -929,9 +929,9 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'fpc_loaders: $(LOADEROFILES)'#010+
|
|
'fpc_loaders: $(LOADEROFILES)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_loaders_clean:'#010+
|
|
'fpc_loaders_clean:'#010+
|
|
- ' -$(DEL) $(LOADEROFILES)'#010+
|
|
|
|
|
|
+ ' -$(DEL) $(LOADEROF','ILES)'#010+
|
|
#010+
|
|
#010+
|
|
- 'fp','c_loaders_showinstall:'#010+
|
|
|
|
|
|
+ 'fpc_loaders_showinstall:'#010+
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+
|
|
')'#010+
|
|
')'#010+
|
|
#010+
|
|
#010+
|
|
@@ -941,7 +941,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[unitrules]'#010+
|
|
'[unitrules]'#010+
|
|
- '#####################','###############################################'+
|
|
|
|
|
|
+ '############','########################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Units'#010+
|
|
'# Units'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -950,8 +950,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'override ALLTARGET+=fpc_units'#010+
|
|
'override ALLTARGET+=fpc_units'#010+
|
|
#010+
|
|
#010+
|
|
- 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+
|
|
|
|
- 'ov','erride INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
|
|
|
|
|
|
+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJ','ECTS))'#010+
|
|
|
|
+ 'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_units: $(UNITPPUFILES)'#010+
|
|
'fpc_units: $(UNITPPUFILES)'#010+
|
|
@@ -961,7 +961,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[exerules]'#010+
|
|
'[exerules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Exes'#010+
|
|
'# Exes'#010+
|
|
- '#########################################','###########################'+
|
|
|
|
|
|
+ '################################','####################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_exes'#010+
|
|
'.PHONY: fpc_exes'#010+
|
|
@@ -971,7 +971,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
|
|
'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
|
|
#010+
|
|
#010+
|
|
'override ALLTARGET+=fpc_exes'#010+
|
|
'override ALLTARGET+=fpc_exes'#010+
|
|
- 'override INSTALLEXEFILES+=$(EXEFILES',')'#010+
|
|
|
|
|
|
+ 'override INSTALLEXEFILES+=$','(EXEFILES)'#010+
|
|
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
|
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -981,7 +981,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[rstrules]'#010+
|
|
'[rstrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Resource strings'#010+
|
|
'# Resource strings'#010+
|
|
- '##########################################################','##########'+
|
|
|
|
|
|
+ '#################################################','###################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef RSTOBJECTS'#010+
|
|
'ifdef RSTOBJECTS'#010+
|
|
@@ -994,16 +994,16 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[examplerules]'#010+
|
|
'[examplerules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Examples'#010+
|
|
'# Examples'#010+
|
|
- '##############','######################################################'+
|
|
|
|
|
|
+ '#####','###############################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_examples fpc_test'#010+
|
|
'.PHONY: fpc_examples fpc_test'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef EXAMPLEOBJECTS'#010+
|
|
'ifdef EXAMPLEOBJECTS'#010+
|
|
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
|
|
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
|
|
- 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
|
|
|
|
|
|
+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJEC','TS))'#010+
|
|
#010+
|
|
#010+
|
|
- 'ove','rride CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
|
|
|
|
+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_examples: all $(EXAMPLEFILES)'#010+
|
|
'fpc_examples: all $(EXAMPLEFILES)'#010+
|
|
@@ -1014,7 +1014,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[compilerules]'#010+
|
|
'[compilerules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# General compile rules'#010+
|
|
'# General compile rules'#010+
|
|
- '##############','######################################################'+
|
|
|
|
|
|
+ '#####','###############################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_packages fpc_all fpc_debug'#010+
|
|
'.PHONY: fpc_packages fpc_all fpc_debug'#010+
|
|
@@ -1026,7 +1026,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'fpc_all: fpc_packages $(FPCMADE)'#010+
|
|
'fpc_all: fpc_packages $(FPCMADE)'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_debug:',#010+
|
|
|
|
|
|
+ 'f','pc_debug:'#010+
|
|
' $(MAKE) all DEBUG=1'#010+
|
|
' $(MAKE) all DEBUG=1'#010+
|
|
#010+
|
|
#010+
|
|
'# General compile rules, available for both possible PASEXT'#010+
|
|
'# General compile rules, available for both possible PASEXT'#010+
|
|
@@ -1038,7 +1038,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' $(EXECPPAS)'#010+
|
|
' $(EXECPPAS)'#010+
|
|
#010+
|
|
#010+
|
|
'%$(PPUEXT): %.pas'#010+
|
|
'%$(PPUEXT): %.pas'#010+
|
|
- ' $(CO','MPILER) $< $(REDIR)'#010+
|
|
|
|
|
|
+ ' ',' $(COMPILER) $< $(REDIR)'#010+
|
|
' $(EXECPPAS)'#010+
|
|
' $(EXECPPAS)'#010+
|
|
#010+
|
|
#010+
|
|
'%$(EXEEXT): %.pp'#010+
|
|
'%$(EXEEXT): %.pp'#010+
|
|
@@ -1051,7 +1051,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[libraryrules]'#010+
|
|
'[libraryrules]'#010+
|
|
- '##########################################','##########################'+
|
|
|
|
|
|
+ '#################################','###################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Library'#010+
|
|
'# Library'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1060,7 +1060,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# Default sharedlib units are all unit objects'#010+
|
|
'# Default sharedlib units are all unit objects'#010+
|
|
'ifndef SHAREDLIBUNITOBJECTS'#010+
|
|
'ifndef SHAREDLIBUNITOBJECTS'#010+
|
|
- 'SHAREDLIBUNITOBJECTS:=$(UN','ITOBJECTS)'#010+
|
|
|
|
|
|
+ 'SHAREDLIBUNITOBJE','CTS:=$(UNITOBJECTS)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_smart:'#010+
|
|
'fpc_smart:'#010+
|
|
@@ -1074,7 +1074,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
|
|
' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- ' @$(E','CHO) "Shared Libraries not supported"'#010+
|
|
|
|
|
|
+ ' ',' @$(ECHO) "Shared Libraries not supported"'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
@@ -1083,7 +1083,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'# Install rules'#010+
|
|
'# Install rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '.PHONY: fpc_showinstal','l fpc_install'#010+
|
|
|
|
|
|
+ '.PHONY: fpc_s','howinstall fpc_install'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef EXTRAINSTALLUNITS'#010+
|
|
'ifdef EXTRAINSTALLUNITS'#010+
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
|
|
@@ -1092,8 +1092,10 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'ifdef PPUFILES'#010+
|
|
'ifdef PPUFILES'#010+
|
|
'ifdef inlinux'#010+
|
|
'ifdef inlinux'#010+
|
|
- 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
|
|
|
|
- 'INSTAL','LPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
|
|
|
|
|
|
+ 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES','))'#010+
|
|
|
|
+ 'ifdef LIBNAME'#010+
|
|
|
|
+ 'INSTALLPPULIBFILES=$(LIBNAME)'#010+
|
|
|
|
+ 'endif'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
|
|
'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1103,7 +1105,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_showinstal','l: $(SHOWINSTALLTARGET)'#010+
|
|
|
|
|
|
+ 'fpc_showinstall: $','(SHOWINSTALLTARGET)'#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
' @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
|
|
' @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
|
|
'S))'#010+
|
|
'S))'#010+
|
|
@@ -1111,7 +1113,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
|
|
'ES))'#010+
|
|
'ES))'#010+
|
|
- 'ifneq ($(INSTALLP','PULINKFILES),)'#010+
|
|
|
|
|
|
+ 'ifneq ($(INSTALLPPULI','NKFILES),)'#010+
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
|
|
'KFILES))'#010+
|
|
'KFILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1120,7 +1122,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ILES))'#010+
|
|
'ILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'ifdef EXTRAINSTALLFI','LES'#010+
|
|
|
|
|
|
+ 'ifdef EXTRAINSTALLFILES'#010,
|
|
' @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
|
|
' @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
|
|
'ILES))'#010+
|
|
'ILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1130,7 +1132,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
' $(MKDIR) $(BININSTALLDIR)'#010+
|
|
' $(MKDIR) $(BININSTALLDIR)'#010+
|
|
'# Compress the exes if upx is defined'#010+
|
|
'# Compress the exes if upx is defined'#010+
|
|
- 'if','def UPXPROG'#010+
|
|
|
|
|
|
+ 'ifdef ','UPXPROG'#010+
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
|
|
@@ -1138,7 +1140,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
' $(MKDIR) $(UNITINSTALLDIR)'#010+
|
|
' $(MKDIR) $(UNITINSTALLDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
|
|
- 'ifneq ','($(INSTALLPPULINKFILES),)'#010+
|
|
|
|
|
|
+ 'ifneq ($(I','NSTALLPPULINKFILES),)'#010+
|
|
' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifneq ($(INSTALLPPULIBFILES),)'#010+
|
|
'ifneq ($(INSTALLPPULIBFILES),)'#010+
|
|
@@ -1146,7 +1148,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'ifdef EXTRAIN','STALLFILES'#010+
|
|
|
|
|
|
+ 'ifdef EXTRAINSTAL','LFILES'#010+
|
|
' $(MKDIR) $(DATAINSTALLDIR)'#010+
|
|
' $(MKDIR) $(DATAINSTALLDIR)'#010+
|
|
' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
|
|
' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1155,7 +1157,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[sourceinstallrules]'#010+
|
|
'[sourceinstallrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# SourceInstall rules'#010+
|
|
'# SourceInstall rules'#010+
|
|
- '###############','#####################################################'+
|
|
|
|
|
|
+ '###################','#################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_sourceinstall'#010+
|
|
'.PHONY: fpc_sourceinstall'#010+
|
|
@@ -1166,7 +1168,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'fpc_sourceinstall: clean'#010+
|
|
'fpc_sourceinstall: clean'#010+
|
|
' $(MKDIR) $(SOURCEINSTALLDIR)'#010+
|
|
' $(MKDIR) $(SOURCEINSTALLDIR)'#010+
|
|
- ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCE','INSTALLDIR)'#010+
|
|
|
|
|
|
+ ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINST','ALLDIR)'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[zipinstallrules]'#010+
|
|
'[zipinstallrules]'#010+
|
|
@@ -1177,7 +1179,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'.PHONY: fpc_zipinstall'#010+
|
|
'.PHONY: fpc_zipinstall'#010+
|
|
#010+
|
|
#010+
|
|
'# Create suffix to add'#010+
|
|
'# Create suffix to add'#010+
|
|
- 'ifndef PACKAGE','SUFFIX'#010+
|
|
|
|
|
|
+ 'ifndef PACKAGESUFF','IX'#010+
|
|
'PACKAGESUFFIX=$(OS_TARGET)'#010+
|
|
'PACKAGESUFFIX=$(OS_TARGET)'#010+
|
|
'ifeq ($(OS_TARGET),go32v2)'#010+
|
|
'ifeq ($(OS_TARGET),go32v2)'#010+
|
|
'PACKAGESUFFIX=go32'#010+
|
|
'PACKAGESUFFIX=go32'#010+
|
|
@@ -1192,7 +1194,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifndef inlinux'#010+
|
|
'ifndef inlinux'#010+
|
|
'PACKDIR=$(BASEDIR)/pack_tmp'#010+
|
|
'PACKDIR=$(BASEDIR)/pack_tmp'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- 'PA','CKDIR=/tmp/fpc-pack'#010+
|
|
|
|
|
|
+ 'PACKDI','R=/tmp/fpc-pack'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1205,8 +1207,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# Use tar by default under linux'#010+
|
|
'# Use tar by default under linux'#010+
|
|
'ifndef USEZIP'#010+
|
|
'ifndef USEZIP'#010+
|
|
- 'ifdef inlin','ux'#010+
|
|
|
|
- 'USETAR=1'#010+
|
|
|
|
|
|
+ 'ifdef inlinux'#010+
|
|
|
|
+ 'U','SETAR=1'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1218,12 +1220,12 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
|
|
' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
|
|
'ifdef USETAR'#010+
|
|
'ifdef USETAR'#010+
|
|
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
- ' ',' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
|
|
|
|
|
|
+ ' ',' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
|
|
'(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
|
|
'(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
|
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
|
' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
|
|
' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
|
|
- 'ME)$(ZIPEXT)',' * ; cd $(BASEDIR)'#010+
|
|
|
|
|
|
+ 'ME)$(ZIPEXT) * ;',' cd $(BASEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1238,7 +1240,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[cleanrules]'#010+
|
|
'[cleanrules]'#010+
|
|
- '############','########################################################'+
|
|
|
|
|
|
+ '################','####################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Clean rules'#010+
|
|
'# Clean rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1246,7 +1248,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef EXTRACLEANUNITS'#010+
|
|
'ifdef EXTRACLEANUNITS'#010+
|
|
- 'override CLEANPPUFILES+=$(add','suffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
|
|
|
|
|
|
+ 'override CLEANPPUFILES+=$(addsuff','ix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef CLEANPPUFILES'#010+
|
|
'ifdef CLEANPPUFILES'#010+
|
|
@@ -1258,7 +1260,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_clean: ','$(CLEANTARGET)'#010+
|
|
|
|
|
|
+ 'fpc_clean: $(CL','EANTARGET)'#010+
|
|
'ifdef CLEANEXEFILES'#010+
|
|
'ifdef CLEANEXEFILES'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1269,7 +1271,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef CLEANRSTFILES'#010+
|
|
'ifdef CLEANRSTFILES'#010+
|
|
- ' -$(DEL',') $(CLEANRSTFILES)'#010+
|
|
|
|
|
|
+ ' -$(DEL) $(','CLEANRSTFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef EXTRACLEANFILES'#010+
|
|
'ifdef EXTRACLEANFILES'#010+
|
|
' -$(DEL) $(EXTRACLEANFILES)'#010+
|
|
' -$(DEL) $(EXTRACLEANFILES)'#010+
|
|
@@ -1282,14 +1284,14 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'fpc_distclean: fpc_clean'#010+
|
|
'fpc_distclean: fpc_clean'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_cle','anall: $(CLEANTARGET)'#010+
|
|
|
|
|
|
+ 'fpc_cleanal','l: $(CLEANTARGET)'#010+
|
|
'ifdef CLEANEXEFILES'#010+
|
|
'ifdef CLEANEXEFILES'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
- ' -$(DEL) $(FPCMA','DE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+
|
|
|
|
|
|
+ ' -$(DEL) $(FPCMADE) ','$(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+
|
|
'E)'#010+
|
|
'E)'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
@@ -1299,8 +1301,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_depend'#010+
|
|
'.PHONY: fpc_depend'#010+
|
|
- #010,
|
|
|
|
- 'fpc_depend:'#010+
|
|
|
|
|
|
+ #010+
|
|
|
|
+ 'fpc_','depend:'#010+
|
|
' $(PPDEP) $(UNITOBJECTS)'#010+
|
|
' $(PPDEP) $(UNITOBJECTS)'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
@@ -1309,7 +1311,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'# Info rules'#010+
|
|
'# Info rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '.PHONY: fpc_info fpc_cfginfo',' fpc_objectinfo fpc_toolsinfo fpc_instal'+
|
|
|
|
|
|
+ '.PHONY: fpc_info fpc_cfginfo fpc','_objectinfo fpc_toolsinfo fpc_instal'+
|
|
'linfo \'#010+
|
|
'linfo \'#010+
|
|
' fpc_dirinfo'#010+
|
|
' fpc_dirinfo'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1321,7 +1323,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' @$(ECHO) == Configuration info =='#010+
|
|
' @$(ECHO) == Configuration info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) FPC....... $(FPC)'#010+
|
|
' @$(ECHO) FPC....... $(FPC)'#010+
|
|
- ' @','$(ECHO) Version... $(FPC_VERSION)'#010+
|
|
|
|
|
|
+ ' @$(EC','HO) Version... $(FPC_VERSION)'#010+
|
|
' @$(ECHO) CPU....... $(CPU_TARGET)'#010+
|
|
' @$(ECHO) CPU....... $(CPU_TARGET)'#010+
|
|
' @$(ECHO) Source.... $(OS_SOURCE)'#010+
|
|
' @$(ECHO) Source.... $(OS_SOURCE)'#010+
|
|
' @$(ECHO) Target.... $(OS_TARGET)'#010+
|
|
' @$(ECHO) Target.... $(OS_TARGET)'#010+
|
|
@@ -1331,7 +1333,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'fpc_infodirs:'#010+
|
|
'fpc_infodirs:'#010+
|
|
'ifdef inlinux'#010+
|
|
'ifdef inlinux'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' ',' @$(ECHO) == Directory info =='#010+
|
|
|
|
|
|
+ ' ',' @$(ECHO) == Directory info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
'ifdef NEEDGCCLIB'#010+
|
|
'ifdef NEEDGCCLIB'#010+
|
|
' @$(ECHO) GCC library is needed.'#010+
|
|
' @$(ECHO) GCC library is needed.'#010+
|
|
@@ -1340,7 +1342,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' @$(ECHO) Other library is needed.'#010+
|
|
' @$(ECHO) Other library is needed.'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
- ' @','$(ECHO)'#010+
|
|
|
|
|
|
+ ' @$(EC','HO)'#010+
|
|
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
@@ -1351,7 +1353,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Tools info =='#010+
|
|
' @$(ECHO) == Tools info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(EC','HO) Pwd....... $(PWD)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) ',' Pwd....... $(PWD)'#010+
|
|
' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
'ifdef PPDEP'#010+
|
|
'ifdef PPDEP'#010+
|
|
' @$(ECHO) PPDep..... $(PPDEP)'#010+
|
|
' @$(ECHO) PPDep..... $(PPDEP)'#010+
|
|
@@ -1362,7 +1364,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'ifdef PPUFILES'#010+
|
|
'ifdef PPUFILES'#010+
|
|
' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+
|
|
' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'if','def DATA2INC'#010+
|
|
|
|
|
|
+ 'ifdef ','DATA2INC'#010+
|
|
' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+
|
|
' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef SED'#010+
|
|
'ifdef SED'#010+
|
|
@@ -1375,7 +1377,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
' @$(ECHO) Diff...... $(DIFF)'#010+
|
|
' @$(ECHO) Diff...... $(DIFF)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef CMP'#010+
|
|
'ifdef CMP'#010+
|
|
- ' @$','(ECHO) Cmp....... $(CMP)'#010+
|
|
|
|
|
|
+ ' @$(ECH','O) Cmp....... $(CMP)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef UPXPROG'#010+
|
|
'ifdef UPXPROG'#010+
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
@@ -1388,20 +1390,20 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'[info_objects]'#010+
|
|
'[info_objects]'#010+
|
|
'fpc_infoobjects:'#010+
|
|
'fpc_infoobjects:'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) == ','Object info =='#010+
|
|
|
|
|
|
+ ' @$(ECHO) == Obje','ct info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+
|
|
' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+
|
|
' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+
|
|
' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+
|
|
' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+
|
|
' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) ExtraCleanUnits.','.. $(EXTRACLEANUNITS)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) ExtraCleanUnits... $','(EXTRACLEANUNITS)'#010+
|
|
' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
|
|
' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
|
|
' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
|
|
' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
|
|
' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
#010+
|
|
#010+
|
|
- '[info_insta','ll]'#010+
|
|
|
|
|
|
+ '[info_install]'#010,
|
|
'fpc_infoinstall:'#010+
|
|
'fpc_infoinstall:'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Install info =='#010+
|
|
' @$(ECHO) == Install info =='#010+
|
|
@@ -1411,33 +1413,33 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef PACKAGEPREFIX'#010+
|
|
'ifdef PACKAGEPREFIX'#010+
|
|
' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+
|
|
' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+
|
|
- 'end','if'#010+
|
|
|
|
- 'ifdef PACKAGENAME'#010+
|
|
|
|
|
|
+ 'endif'#010+
|
|
|
|
+ 'i','fdef PACKAGENAME'#010+
|
|
' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+
|
|
' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+
|
|
' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+
|
|
' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+
|
|
- ' @$(ECHO) BinInsta','llDir........ $(BININSTALLDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) BinInstallDi','r........ $(BININSTALLDIR)'#010+
|
|
' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+
|
|
' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+
|
|
' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+
|
|
' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+
|
|
' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
|
|
' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
|
|
- ' @$(ECHO) DocInstallDir...','..... $(DOCINSTALLDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) DocInstallDir.......','. $(DOCINSTALLDIR)'#010+
|
|
' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+
|
|
' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+
|
|
' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+
|
|
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
|
|
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
#010+
|
|
#010+
|
|
- '[directorytargets]'#010,
|
|
|
|
- '#####################################################################'#010+
|
|
|
|
|
|
+ '[directorytargets]'#010+
|
|
|
|
+ '####','################################################################'+
|
|
|
|
+ '#'#010+
|
|
'# Directories'#010+
|
|
'# Directories'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'[localmakefile]'#010+
|
|
'[localmakefile]'#010+
|
|
- '#####################################################################',
|
|
|
|
- #010+
|
|
|
|
- '# Local Makefile'#010+
|
|
|
|
|
|
+ '#####################################################################'#010+
|
|
|
|
+ '# L','ocal Makefile'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'ifneq ($(wildcard fpcmake.loc),)'#010+
|
|
'ifneq ($(wildcard fpcmake.loc),)'#010+
|
|
@@ -1446,7 +1448,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'[userrules]'#010+
|
|
'[userrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
- '# Users r','ules'#010+
|
|
|
|
|
|
+ '# Users rules',#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|