|
@@ -1,7 +1,7 @@
|
|
|
{$ifdef Delphi}
|
|
|
-const fpcmakeini : array[0..120] of string[240]=(
|
|
|
+const fpcmakeini : array[0..121] of string[240]=(
|
|
|
{$else Delphi}
|
|
|
-const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
+const fpcmakeini : array[0..121,1..240] of char=(
|
|
|
{$endif Delphi}
|
|
|
';'#010+
|
|
|
'; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
|
|
@@ -966,12 +966,14 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
'.PHONY: fpc_exes'#010+
|
|
|
#010+
|
|
|
+ 'ifdef EXEOBJECTS'#010+
|
|
|
'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))'#010+
|
|
|
'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
|
|
|
#010+
|
|
|
'override ALLTARGET+=fpc_exes'#010+
|
|
|
- 'override INSTALLEXEFILES+=$(EXEFILES)'#010+
|
|
|
- 'override CLEANE','XEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
|
|
+ 'override INSTALLEXEFILES+=$(EXEFILES',')'#010+
|
|
|
+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
|
|
+ 'endif'#010+
|
|
|
#010+
|
|
|
'fpc_exes: $(EXEFILES)'#010+
|
|
|
#010+
|
|
@@ -979,27 +981,32 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'[rstrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Resource strings'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '##########################################################','##########'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- 'override R','STFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+
|
|
|
+ 'ifdef RSTOBJECTS'#010+
|
|
|
+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+
|
|
|
#010+
|
|
|
'override CLEANRSTFILES+=$(RSTFILES)'#010+
|
|
|
+ 'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[examplerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Examples'#010+
|
|
|
- '############################################################','########'+
|
|
|
+ '##############','######################################################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_examples fpc_test'#010+
|
|
|
#010+
|
|
|
+ 'ifdef EXAMPLEOBJECTS'#010+
|
|
|
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
|
|
|
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
|
|
|
#010+
|
|
|
- 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
|
+ 'ove','rride CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
|
+ 'endif'#010+
|
|
|
#010+
|
|
|
- 'fpc_examples',': all $(EXAMPLEFILES)'#010+
|
|
|
+ 'fpc_examples: all $(EXAMPLEFILES)'#010+
|
|
|
#010+
|
|
|
'fpc_test: examples'#010+
|
|
|
#010+
|
|
@@ -1007,9 +1014,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'[compilerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# General compile rules'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '##############','######################################################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_pack','ages fpc_all fpc_debug'#010+
|
|
|
+ '.PHONY: fpc_packages fpc_all fpc_debug'#010+
|
|
|
#010+
|
|
|
'$(FPCMADE): $(ALLTARGET)'#010+
|
|
|
' @$(ECHO) Compiled > $(FPCMADE)'#010+
|
|
@@ -1018,10 +1026,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_all: fpc_packages $(FPCMADE)'#010+
|
|
|
#010+
|
|
|
- 'fpc_debug:'#010+
|
|
|
+ 'fpc_debug:',#010+
|
|
|
' $(MAKE) all DEBUG=1'#010+
|
|
|
#010+
|
|
|
- '# General compile rules, available for both',' possible PASEXT'#010+
|
|
|
+ '# General compile rules, available for both possible PASEXT'#010+
|
|
|
#010+
|
|
|
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
|
|
|
#010+
|
|
@@ -1030,11 +1038,11 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(PPUEXT): %.pas'#010+
|
|
|
- ' $(COMPILER) $< $(REDIR)'#010+
|
|
|
+ ' $(CO','MPILER) $< $(REDIR)'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(EXEEXT): %.pp'#010+
|
|
|
- ' $(COMPI','LER) $< $(REDIR)'#010+
|
|
|
+ ' $(COMPILER) $< $(REDIR)'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(EXEEXT): %.pas'#010+
|
|
@@ -1043,20 +1051,20 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[libraryrules]'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
- '# Library'#010+
|
|
|
- '###################################','#################################'+
|
|
|
+ '##########################################','##########################'+
|
|
|
'#'#010+
|
|
|
+ '# Library'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_smart fpc_shared'#010+
|
|
|
#010+
|
|
|
'# Default sharedlib units are all unit objects'#010+
|
|
|
'ifndef SHAREDLIBUNITOBJECTS'#010+
|
|
|
- 'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+
|
|
|
+ 'SHAREDLIBUNITOBJECTS:=$(UN','ITOBJECTS)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_smart:'#010+
|
|
|
- ' $(MAKE) all LINKSMART=1 CREATESMART=','1'#010+
|
|
|
+ ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
|
|
|
#010+
|
|
|
'fpc_shared: all'#010+
|
|
|
'ifdef inlinux'#010+
|
|
@@ -1066,30 +1074,28 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
|
|
|
'endif'#010+
|
|
|
'else'#010+
|
|
|
- ' @$(ECHO) "Shared Libraries not supported"'#010+
|
|
|
+ ' @$(E','CHO) "Shared Libraries not supported"'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[installrules]'#010+
|
|
|
- '############','########################################################'+
|
|
|
- '#'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'# Install rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_showinstall fpc_install'#010+
|
|
|
+ '.PHONY: fpc_showinstal','l fpc_install'#010+
|
|
|
#010+
|
|
|
'ifdef EXTRAINSTALLUNITS'#010+
|
|
|
- 'override INSTALLPPUFILES+=$(addsuf','fix $(PPUEXT),$(EXTRAINSTALLUNITS)'+
|
|
|
- ')'#010+
|
|
|
+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
|
'ifdef PPUFILES'#010+
|
|
|
'ifdef inlinux'#010+
|
|
|
'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
|
|
|
- 'INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
|
|
|
+ 'INSTAL','LPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
|
|
|
'else'#010+
|
|
|
- 'INSTALLPPUL','INKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
|
|
|
+ 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
|
|
|
'endif'#010+
|
|
|
'else'#010+
|
|
|
'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
|
|
@@ -1097,26 +1103,26 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+
|
|
|
+ 'fpc_showinstal','l: $(SHOWINSTALLTARGET)'#010+
|
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
|
- ' @$(ECHO) -e $(addpr','efix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFI'+
|
|
|
- 'LES))'#010+
|
|
|
+ ' @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
|
|
|
+ 'S))'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
|
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
|
|
|
'ES))'#010+
|
|
|
- 'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
|
- ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(I','NSTALLPPUL'+
|
|
|
- 'INKFILES))'#010+
|
|
|
+ 'ifneq ($(INSTALLP','PULINKFILES),)'#010+
|
|
|
+ ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
|
|
|
+ 'KFILES))'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(INSTALLPPULIBFILES),)'#010+
|
|
|
' @$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBF'+
|
|
|
'ILES))'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef EXTRAINSTALLFILES'#010+
|
|
|
- ' @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALL',
|
|
|
- 'FILES))'#010+
|
|
|
+ 'ifdef EXTRAINSTALLFI','LES'#010+
|
|
|
+ ' @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
|
|
|
+ 'ILES))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_install: $(INSTALLTARGET)'#010+
|
|
@@ -1124,34 +1130,35 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
|
' $(MKDIR) $(BININSTALLDIR)'#010+
|
|
|
'# Compress the exes if upx is defined'#010+
|
|
|
- 'ifdef UPXPROG'#010+
|
|
|
+ 'if','def UPXPROG'#010+
|
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
|
'endif'#010+
|
|
|
- ' $(INSTAL','LEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
|
|
|
+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
|
' $(MKDIR) $(UNITINSTALLDIR)'#010+
|
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
|
|
|
- 'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
|
- ' $(INSTALL) $(INSTALLPPULINKFILES) $(UNI','TINSTALLDIR)'#010+
|
|
|
+ 'ifneq ','($(INSTALLPPULINKFILES),)'#010+
|
|
|
+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(INSTALLPPULIBFILES),)'#010+
|
|
|
' $(MKDIR) $(LIBINSTALLDIR)'#010+
|
|
|
' $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef EXTRAINSTALLFILES'#010+
|
|
|
+ 'ifdef EXTRAIN','STALLFILES'#010+
|
|
|
' $(MKDIR) $(DATAINSTALLDIR)'#010+
|
|
|
- ' $(INSTALL) $(EXTRAI','NSTALLFILES) $(DATAINSTALLDIR)'#010+
|
|
|
+ ' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[sourceinstallrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# SourceInstall rules'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '###############','#####################################################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_sourc','einstall'#010+
|
|
|
+ '.PHONY: fpc_sourceinstall'#010+
|
|
|
#010+
|
|
|
'ifndef SOURCETOPDIR'#010+
|
|
|
'SOURCETOPDIR=$(BASEDIR)'#010+
|
|
@@ -1159,22 +1166,21 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_sourceinstall: clean'#010+
|
|
|
' $(MKDIR) $(SOURCEINSTALLDIR)'#010+
|
|
|
- ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+
|
|
|
+ ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCE','INSTALLDIR)'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[zipinstallrules]'#010+
|
|
|
- '#########################################','###########################'+
|
|
|
- '#'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'# Zip'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_zipinstall'#010+
|
|
|
#010+
|
|
|
'# Create suffix to add'#010+
|
|
|
- 'ifndef PACKAGESUFFIX'#010+
|
|
|
+ 'ifndef PACKAGE','SUFFIX'#010+
|
|
|
'PACKAGESUFFIX=$(OS_TARGET)'#010+
|
|
|
'ifeq ($(OS_TARGET),go32v2)'#010+
|
|
|
- 'PACKAGESUFFI','X=go32'#010+
|
|
|
+ 'PACKAGESUFFIX=go32'#010+
|
|
|
'endif'#010+
|
|
|
'ifeq ($(OS_TARGET),win32)'#010+
|
|
|
'PACKAGESUFFIX=w32'#010+
|
|
@@ -1186,11 +1192,11 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'ifndef inlinux'#010+
|
|
|
'PACKDIR=$(BASEDIR)/pack_tmp'#010+
|
|
|
'else'#010+
|
|
|
- 'PACKDIR=/tmp/fpc-pack'#010+
|
|
|
+ 'PA','CKDIR=/tmp/fpc-pack'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Maybe create default zipname from pack','agename'#010+
|
|
|
+ '# Maybe create default zipname from packagename'#010+
|
|
|
'ifndef ZIPNAME'#010+
|
|
|
'ifdef PACKAGENAME'#010+
|
|
|
'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)'#010+
|
|
@@ -1199,31 +1205,31 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
'# Use tar by default under linux'#010+
|
|
|
'ifndef USEZIP'#010+
|
|
|
- 'ifdef inlinux'#010+
|
|
|
+ 'ifdef inlin','ux'#010+
|
|
|
'USETAR=1'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_zipinstall:'#010+
|
|
|
'ifndef ZIPNAME'#010+
|
|
|
- ' @$(ECHO) ','"Please specify ZIPNAME!"'#010+
|
|
|
+ ' @$(ECHO) "Please specify ZIPNAME!"'#010+
|
|
|
' @exit 1'#010+
|
|
|
'else'#010+
|
|
|
' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
|
|
|
'ifdef USETAR'#010+
|
|
|
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
|
- ' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+
|
|
|
- 'IPNA','ME)$(TAREXT) * ; cd $(BASEDIR)'#010+
|
|
|
+ ' ',' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
|
|
|
+ '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
|
|
|
'else'#010+
|
|
|
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
|
|
' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
|
|
|
- 'ME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+
|
|
|
+ 'ME)$(ZIPEXT)',' * ; cd $(BASEDIR)'#010+
|
|
|
'endif'#010+
|
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
- '[zipsource','installrules]'#010+
|
|
|
+ '[zipsourceinstallrules]'#010+
|
|
|
'.PHONY: fpc_zipsourceinstall'#010+
|
|
|
#010+
|
|
|
'fpc_zipsourceinstall:'#010+
|
|
@@ -1232,19 +1238,19 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[cleanrules]'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
- '# Clean rules'#010+
|
|
|
- '#','###################################################################'+
|
|
|
+ '############','########################################################'+
|
|
|
'#'#010+
|
|
|
+ '# Clean rules'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
|
#010+
|
|
|
'ifdef EXTRACLEANUNITS'#010+
|
|
|
- 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
|
|
|
+ 'override CLEANPPUFILES+=$(add','suffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef CLEANPPUFILES'#010+
|
|
|
- 'ifdef PPU','FILES'#010+
|
|
|
+ 'ifdef PPUFILES'#010+
|
|
|
'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
|
|
|
'else'#010+
|
|
|
'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
|
|
@@ -1252,10 +1258,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'fpc_clean: $(CLEANTARGET)'#010+
|
|
|
+ 'fpc_clean: ','$(CLEANTARGET)'#010+
|
|
|
'ifdef CLEANEXEFILES'#010+
|
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
- 'endif',#010+
|
|
|
+ 'endif'#010+
|
|
|
'ifdef CLEANPPUFILES'#010+
|
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
@@ -1263,10 +1269,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef CLEANRSTFILES'#010+
|
|
|
- ' -$(DEL) $(CLEANRSTFILES)'#010+
|
|
|
+ ' -$(DEL',') $(CLEANRSTFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef EXTRACLEANFILES'#010+
|
|
|
- ' -$(DEL) $(EXTRACLE','ANFILES)'#010+
|
|
|
+ ' -$(DEL) $(EXTRACLEANFILES)'#010+
|
|
|
'endif'#010+
|
|
|
' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
|
|
|
#010+
|
|
@@ -1275,18 +1281,17 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_cleanall: $(CLEANTARGET)'#010+
|
|
|
'ifdef CLEANEXEFILES'#010+
|
|
|
- ' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
+ ' ',' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
'endif'#010+
|
|
|
- ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(','RSTEXT) *$(ASMEXT) *$(STATICL'+
|
|
|
- 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
|
+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
|
+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
|
- ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
|
|
|
+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)',
|
|
|
#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[dependrules]'#010+
|
|
|
- '########################################################','############'+
|
|
|
- '#'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'# Depend rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
@@ -1296,27 +1301,26 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' $(PPDEP) $(UNITOBJECTS)'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
- '[inforules]'#010+
|
|
|
- '##############################################################','######'+
|
|
|
- '#'#010+
|
|
|
+ '[','inforules]'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
'# Info rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+
|
|
|
- 'nfo \'#010+
|
|
|
+ 'nfo \',#010+
|
|
|
' fpc_dirinfo'#010+
|
|
|
#010+
|
|
|
'fpc_info: $(INFOTARGET)'#010+
|
|
|
#010+
|
|
|
'[info_cfg]'#010+
|
|
|
'fpc_infocfg:'#010+
|
|
|
- ' ',' @$(ECHO)'#010+
|
|
|
+ ' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Configuration info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) FPC....... $(FPC)'#010+
|
|
|
' @$(ECHO) Version... $(FPC_VERSION)'#010+
|
|
|
- ' @$(ECHO) CPU....... $(CPU_TARGET)'#010+
|
|
|
- ' @$(ECHO) Source.... $(OS_SOURCE)'#010,
|
|
|
+ ' @$(E','CHO) CPU....... $(CPU_TARGET)'#010+
|
|
|
+ ' @$(ECHO) Source.... $(OS_SOURCE)'#010+
|
|
|
' @$(ECHO) Target.... $(OS_TARGET)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
@@ -1325,18 +1329,18 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
'ifdef inlinux'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Directory info =='#010+
|
|
|
- ' @$(ECHO)'#010+
|
|
|
+ ' @$(','ECHO)'#010+
|
|
|
'ifdef NEEDGCCLIB'#010+
|
|
|
' @$(ECHO) GCC library is needed.'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifd','ef NEEDOTHERLIB'#010+
|
|
|
+ 'ifdef NEEDOTHERLIB'#010+
|
|
|
' @$(ECHO) Other library is needed.'#010+
|
|
|
'endif'#010+
|
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
|
+ ' @$(ECHO) GCC library..... $(GC','CLIBDIR)'#010+
|
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
|
- ' @$(ECH','O)'#010+
|
|
|
+ ' @$(ECHO)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'[info_tools]'#010+
|
|
@@ -1345,23 +1349,23 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' @$(ECHO) == Tools info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Pwd....... $(PWD)'#010+
|
|
|
- ' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
|
+ ' @$(ECHO) Echo..','.... $(ECHO)'#010+
|
|
|
'ifdef PPDEP'#010+
|
|
|
' @$(ECHO) PPDep..... $(PPDEP)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifde','f PPUMOVE'#010+
|
|
|
+ 'ifdef PPUMOVE'#010+
|
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef PPUFILES'#010+
|
|
|
' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef DATA2INC'#010+
|
|
|
- ' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+
|
|
|
+ ' @$(ECHO) Data2Inc.. $(DAT','A2INC)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef SED'#010+
|
|
|
' @$(ECHO) Sed....... $(SED)'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef DA','TE'#010+
|
|
|
+ 'ifdef DATE'#010+
|
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef DIFF'#010+
|
|
@@ -1371,10 +1375,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' @$(ECHO) Cmp....... $(CMP)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef UPXPROG'#010+
|
|
|
- ' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
|
+ ' ',' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef ZIPPROG'#010+
|
|
|
- ' @$(ECH','O) Zip....... $(ZIPPROG)'#010+
|
|
|
+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
|
|
|
'endif'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
@@ -1383,64 +1387,66 @@ const fpcmakeini : array[0..120,1..240] of char=(
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Object info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+
|
|
|
- ' @$(ECHO) UnitObjects.....','.. $(UNITOBJECTS)'#010+
|
|
|
+ ' @$(ECHO',') LoaderObjects..... $(LOADEROBJECTS)'#010+
|
|
|
+ ' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+
|
|
|
' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+
|
|
|
- ' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
|
|
|
+ ' @$(ECHO) ExtraCl','eanFiles... $(EXTRACLEANFILES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) ExtraIn','stallUnits. $(EXTRAINSTALLUNITS)'#010+
|
|
|
+ ' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
|
|
|
' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
|
'[info_install]'#010+
|
|
|
'fpc_infoinstall:'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) == Install info =='#010+
|
|
|
+ ' @','$(ECHO) == Install info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
'ifdef DATE'#010+
|
|
|
- ' @$(ECHO) ',' DateStr.............. $(DATESTR)'#010+
|
|
|
+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef PACKAGEPREFIX'#010+
|
|
|
' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef PACKAGENAME'#010+
|
|
|
- ' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+
|
|
|
+ ' @$(ECHO) PackageN','ame.......... $(PACKAGENAME)'#010+
|
|
|
'endif'#010+
|
|
|
- ' @$(ECHO) PackageSuffix.......','. $(PACKAGESUFFIX)'#010+
|
|
|
+ ' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+
|
|
|
' @$(ECHO) BinInstallDir........ $(BININSTALLDIR)'#010+
|
|
|
- ' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+
|
|
|
- ' @$(ECHO) UnitInstallDir','....... $(UNITINSTALLDIR)'#010+
|
|
|
+ ' @$(ECHO)',' LibInstallDir........ $(LIBINSTALLDIR)'#010+
|
|
|
+ ' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+
|
|
|
' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
|
|
|
' @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)'#010+
|
|
|
- ' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+
|
|
|
+ ' @$(ECHO) DataIn','stallDir....... $(DATAINSTALLDIR)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) Dest','ZipDir........... $(DESTZIPDIR)'#010+
|
|
|
+ ' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+
|
|
|
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
|
'[directorytargets]'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
- '# Directories'#010+
|
|
|
- '####################################','################################'+
|
|
|
+ '###############################################','#####################'+
|
|
|
'#'#010+
|
|
|
+ '# Directories'#010+
|
|
|
+ '#####################################################################'#010+
|
|
|
#010+
|
|
|
'[localmakefile]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Local Makefile'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '#############################','#######################################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
- 'ifneq ($(wildcard fpcmake.loc),',')'#010+
|
|
|
+ 'ifneq ($(wildcard fpcmake.loc),)'#010+
|
|
|
'include fpcmake.loc'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'[userrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Users rules'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '##########################################','##########################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[end]'#010
|