|
|
@@ -724,14 +724,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifeq ($(COMPILER_UNITTARGETDIR)',',.)'#010+
|
|
|
'override UNITTARGETDIRPREFIX='#010+
|
|
|
'else'#010+
|
|
|
- 'override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
|
|
|
+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
|
|
|
'endif'#010+
|
|
|
'else'#010+
|
|
|
'ifdef COMPILER_TARGETDIR'#010+
|
|
|
'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
|
|
|
'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
|
|
|
'endif'#010+
|
|
|
- 'endif',#010+
|
|
|
+ 'e','ndif'#010+
|
|
|
#010+
|
|
|
'[command_libc]'#010+
|
|
|
'# Add GCC lib path if asked'#010+
|
|
|
@@ -744,7 +744,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[command_end]'#010+
|
|
|
- '# Add commandline options last so they can override',#010+
|
|
|
+ '# Add commandline options last so they can over','ride'#010+
|
|
|
'ifdef OPT'#010+
|
|
|
'override FPCOPT+=$(OPT)'#010+
|
|
|
'endif'#010+
|
|
|
@@ -759,7 +759,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'override FPCOPT+=@$(CFGFILE)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- '# Use th','e environment to pass commandline options?'#010+
|
|
|
+ '# Us','e the environment to pass commandline options?'#010+
|
|
|
'ifdef USEENV'#010+
|
|
|
'override FPCEXTCMD:=$(FPCOPT)'#010+
|
|
|
'override FPCOPT:=!FPCEXTCMD'#010+
|
|
|
@@ -769,7 +769,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'# Compiler commandline'#010+
|
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
|
#010+
|
|
|
- '# also call ppas if with command option -s',#010+
|
|
|
+ '# also call ppas if with command optio','n -s'#010+
|
|
|
'# but only if the OS_SOURCE and OS_TARGET are equal'#010+
|
|
|
'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
|
|
|
'EXECPPAS='#010+
|
|
|
@@ -781,7 +781,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[loaderrules]'#010+
|
|
|
- '######################################################','##############'+
|
|
|
+ '##################################################','##################'+
|
|
|
'#'#010+
|
|
|
'# Loaders'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -791,7 +791,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifdef TARGET_LOADERS'#010+
|
|
|
'override ALLTARGET+=fpc_loaders'#010+
|
|
|
'override CLEANTARGET+=fpc_loaders_clean'#010+
|
|
|
- 'override INSTALLTARGET+=fpc_l','oaders_install'#010+
|
|
|
+ 'override INSTALLTARGET+=f','pc_loaders_install'#010+
|
|
|
#010+
|
|
|
'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
|
|
|
'endif'#010+
|
|
|
@@ -804,7 +804,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'fpc_loaders_clean:'#010+
|
|
|
' -$(DEL) $(LOADEROFILES)'#010+
|
|
|
#010+
|
|
|
- 'fpc_loaders_instal','l:'#010+
|
|
|
+ 'fpc_loaders_in','stall:'#010+
|
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
#010+
|
|
|
@@ -812,7 +812,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'[unitrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Units'#010+
|
|
|
- '#######################################################','#############'+
|
|
|
+ '###################################################','#################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_units'#010+
|
|
|
@@ -825,7 +825,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'fpc_u','nits: $(UNITPPUFILES)'#010+
|
|
|
+ 'f','pc_units: $(UNITPPUFILES)'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[exerules]'#010+
|
|
|
@@ -836,12 +836,12 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'.PHONY: fpc_exes'#010+
|
|
|
#010+
|
|
|
'ifdef TARGET_PROGRAMS'#010+
|
|
|
- 'override EXEFILES','=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
+ 'override EXEF','ILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
|
|
|
'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
|
|
|
#010+
|
|
|
'override ALLTARGET+=fpc_exes'#010+
|
|
|
- 'override INSTALLEXEFILES+=$','(EXEFILES)'#010+
|
|
|
+ 'override INSTALLEXEFILE','S+=$(EXEFILES)'#010+
|
|
|
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
|
|
'ifeq ($(OS_TARGET),os2)'#010+
|
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
|
|
@@ -852,7 +852,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
#010+
|
|
|
'[rstrules]'#010+
|
|
|
- '#########################################','###########################'+
|
|
|
+ '#####################################','###############################'+
|
|
|
'#'#010+
|
|
|
'# Resource strings'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -861,10 +861,10 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
|
|
|
#010+
|
|
|
'override CLEANRSTFILES+=$(RSTFILES)'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'endif'#010,
|
|
|
#010+
|
|
|
#010+
|
|
|
- '[e','xamplerules]'#010+
|
|
|
+ '[examplerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Examples'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -873,11 +873,11 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'ifdef TARGET_EXAMPLES'#010+
|
|
|
'HASEXAMPLES=1'#010+
|
|
|
- 'override EXAMPLES','OURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+
|
|
|
+ 'override EXAM','PLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+
|
|
|
'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+
|
|
|
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
|
|
|
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
|
|
|
- 'refix $(','STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
|
|
|
+ 'refi','x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
|
|
|
'ES)))'#010+
|
|
|
#010+
|
|
|
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
|
@@ -885,7 +885,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
- 'ifdef TARGET_','EXAMPLEDIRS'#010+
|
|
|
+ 'ifdef TAR','GET_EXAMPLEDIRS'#010+
|
|
|
'HASEXAMPLES=1'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -896,7 +896,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'[compilerules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# General compile rules'#010+
|
|
|
- '######################','##############################################'+
|
|
|
+ '##################','##################################################'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_packages fpc_all fpc_smart fpc_debug'#010+
|
|
|
@@ -906,9 +906,9 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_packages: $(COMPILEPACKAGES)'#010+
|
|
|
#010+
|
|
|
- 'fpc_all: fpc_packages $(FPCMADE)'#010+
|
|
|
+ 'fpc_all: fpc_packages $(FPCMADE)'#010,
|
|
|
#010+
|
|
|
- 'fpc','_smart:'#010+
|
|
|
+ 'fpc_smart:'#010+
|
|
|
' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
|
|
|
#010+
|
|
|
'fpc_debug:'#010+
|
|
|
@@ -919,8 +919,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
|
|
|
#010+
|
|
|
- '%$(PPUEXT): %.pp'#010+
|
|
|
- ' ',' $(COMPILER) $<'#010+
|
|
|
+ '%$(PPUEXT): %.','pp'#010+
|
|
|
+ ' $(COMPILER) $<'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
'%$(PPUEXT): %.pas'#010+
|
|
|
@@ -935,14 +935,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
' $(COMPILER) $<'#010+
|
|
|
' $(EXECPPAS)'#010+
|
|
|
#010+
|
|
|
- '# Search pat','hs for .ppu and .pp and .pas'#010+
|
|
|
+ '# Search',' paths for .ppu and .pp and .pas'#010+
|
|
|
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
|
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
|
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
'[libraryrules]'#010+
|
|
|
- '######################################','##############################'+
|
|
|
+ '##################################','##################################'+
|
|
|
'#'#010+
|
|
|
'# Library'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -953,7 +953,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifdef LIB_VERSION'#010+
|
|
|
'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+
|
|
|
'else'#010+
|
|
|
- 'LIB_FULLNAME=$(LIB_NAME)',#010+
|
|
|
+ 'LIB_FULLNAME=$(LIB_N','AME)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -966,7 +966,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifdef HASSHAREDLIB'#010+
|
|
|
' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
|
|
|
'else'#010+
|
|
|
- ' @$(ECHO) Sha','red Libraries not supported'#010+
|
|
|
+ ' @$(ECHO)',' Shared Libraries not supported'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
@@ -975,7 +975,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'# Install rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- '.PHONY: fpc_install fpc_sourcein','stall fpc_exampleinstall'#010+
|
|
|
+ '.PHONY: fpc_install fpc_sour','ceinstall fpc_exampleinstall'#010+
|
|
|
#010+
|
|
|
'ifdef INSTALL_UNITS'#010+
|
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
|
|
@@ -983,12 +983,12 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
|
- 'LES)) $(addprefix $(STATICLIB','PREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
|
|
|
+ 'LES)) $(addprefix $(STATI','CLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
|
|
|
'T),$(INSTALLPPUFILES)))'#010+
|
|
|
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
|
|
|
'PPUFILES))'#010+
|
|
|
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
|
- 'EFIX),$(INSTALLPPULINKFILE','S)))'#010+
|
|
|
+ 'EFIX),$(INSTALLPPULINK','FILES)))'#010+
|
|
|
'# Implicitly install Package.fpc'#010+
|
|
|
'override INSTALL_CREATEPACKAGEFPC=1'#010+
|
|
|
'endif'#010+
|
|
|
@@ -999,8 +999,8 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_install: $(INSTALLTARGET)'#010+
|
|
|
- 'ifdef INSTALLEXEFILES'#010+
|
|
|
- ' ',' $(MKDIR) $(INSTALL_BINDIR)'#010+
|
|
|
+ 'ifdef INSTALLEXEFIL','ES'#010+
|
|
|
+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+
|
|
|
'# Compress the exes if upx is defined'#010+
|
|
|
'ifdef UPXPROG'#010+
|
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
|
@@ -1008,14 +1008,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
|
|
|
- 'ifdef FPCMAKE',#010+
|
|
|
+ 'ifdef FPC','MAKE'#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+
|
|
|
- ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+
|
|
|
- ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
+ ' $(FPCMAKE) -p Makefile.fpc'#010+
|
|
|
+ ' $(MKDIR) ','$(INSTALL_UNITDIR)'#010+
|
|
|
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1024,14 +1024,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
- 'ifneq ($(INSTALLPPULI','NKFILES),)'#010+
|
|
|
+ 'ifneq ($(INSTALLPPULINKFILES),)'#010,
|
|
|
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
|
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
|
|
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
- ' ln -sf $(LIB_FUL','LNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
|
|
+ ' ln -sf $(LIB_FULLNAME) $(IN','STALL_LIBDIR)/$(LIB_NAME)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1041,15 +1041,15 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'fpc_sourceinstall: distclean'#010+
|
|
|
- ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010,
|
|
|
- ' $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
|
+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
|
+ ' $(C','OPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
|
|
|
#010+
|
|
|
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
|
|
'ifdef HASEXAMPLES'#010+
|
|
|
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef EXAMPLESOURCEFILES'#010+
|
|
|
- ' $(COPY) $(EXAMPLESOURCEFI','LES) $(INSTALL_EXAMPLEDIR)'#010+
|
|
|
+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INST','ALL_EXAMPLEDIR)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
|
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
|
|
|
@@ -1058,8 +1058,9 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'[distinstallrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
- '# Dist',' Install'#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '# Dist Install'#010+
|
|
|
+ '##','##################################################################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_distinstall'#010+
|
|
|
#010+
|
|
|
@@ -1068,13 +1069,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'[zipinstallrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
- '# Zip',#010+
|
|
|
- '#####################################################################'#010+
|
|
|
+ '# Zip'#010+
|
|
|
+ '##########','##########################################################'+
|
|
|
+ '#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
|
|
|
#010+
|
|
|
'# Temporary path to pack a file, can only use a single deep'#010+
|
|
|
- '# subdir, because the deltree can'#039't see t','he whole tree to remove'+
|
|
|
+ '# subdir, because the deltree can'#039't see the whole tr','ee to remove'+
|
|
|
#010+
|
|
|
'ifndef PACKDIR'#010+
|
|
|
'ifndef inUnix'#010+
|
|
|
@@ -1089,7 +1091,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
|
'else'#010+
|
|
|
- 'ZIPNA','ME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
|
|
|
+ 'ZIPNAME=$(ZIPPRE','FIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
|
|
|
'endif'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1106,10 +1108,10 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifndef USEZIP'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
'USETAR=1'#010+
|
|
|
- 'endi','f'#010+
|
|
|
+ '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+
|
|
|
'USEZIPWRAPPER=1'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1118,7 +1120,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'# the path separator'#010+
|
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
|
- 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(D','IST_DESTDIR)/fpczip$(BATCHEXT))'#010+
|
|
|
+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR',')/fpczip$(BATCHEXT))'#010+
|
|
|
'else'#010+
|
|
|
'ZIPPATHSEP=/'#010+
|
|
|
'endif'#010+
|
|
|
@@ -1127,7 +1129,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
|
|
|
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
|
|
|
'ifdef USETAR'#010+
|
|
|
- 'ZIPDESTFILE:=$(DI','ST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
|
+ 'ZIPDESTFILE:=$(DIST_DESTDIR)','/$(ZIPNAME)$(TAREXT)'#010+
|
|
|
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
|
|
'else'#010+
|
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
|
|
@@ -1135,13 +1137,13 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'TFILE) *'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
- 'fpc_zipinstall:'#010,
|
|
|
- ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
|
+ 'fpc_zipinstall:'#010+
|
|
|
+ ' $(M','AKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
|
' $(DEL) $(ZIPDESTFILE)'#010+
|
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
|
'# Handle gecho separate as we need to espace \ with \\'#010+
|
|
|
'ifneq ($(ECHOREDIR),echo)'#010+
|
|
|
- ' $(ECHOREDIR) -e "$(subst \,\\,$(Z','IPCMD_CDPACK))" > $(ZIPWRAP'+
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPAC','K))" > $(ZIPWRAP'+
|
|
|
'PER)'#010+
|
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
|
|
|
#010+
|
|
|
@@ -1149,7 +1151,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ER)'#010+
|
|
|
'else'#010+
|
|
|
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
|
|
|
- ' echo',' $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
|
+ ' echo $(ZIPCMD_Z','IP) >> $(ZIPWRAPPER)'#010+
|
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef inUnix'#010+
|
|
|
@@ -1159,7 +1161,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
' $(DEL) $(ZIPWRAPPER)'#010+
|
|
|
'else'#010+
|
|
|
- ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(','ZIPCMD_CDBASE)'#010+
|
|
|
+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBA','SE)'#010+
|
|
|
'endif'#010+
|
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
|
#010+
|
|
|
@@ -1168,7 +1170,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_zipexampleinstall:'#010+
|
|
|
'ifdef HASEXAMPLES'#010+
|
|
|
- ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall',' ZIPSUFFIX=ex'+
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=','ex'+
|
|
|
'm'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
@@ -1179,7 +1181,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'[cleanrules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Clean rules'#010+
|
|
|
- '##############################################','######################'+
|
|
|
+ '#########################################################','###########'+
|
|
|
'#'#010+
|
|
|
#010+
|
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
|
@@ -1190,14 +1192,14 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
'ifdef CLEAN_UNITS'#010+
|
|
|
- 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UN','ITS))'#010+
|
|
|
- 'endif'#010+
|
|
|
+ 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
|
|
|
+ 'endif',#010+
|
|
|
#010+
|
|
|
'ifdef CLEANPPUFILES'#010+
|
|
|
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
|
|
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
|
|
|
'LEANPPUFILES)))'#010+
|
|
|
- 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIR','PREFIX),$(CLEANPP'+
|
|
|
+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(C','LEANPP'+
|
|
|
'UFILES))'#010+
|
|
|
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
|
|
'IX),$(CLEANPPULINKFILES)))'#010+
|
|
|
@@ -1208,7 +1210,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef CLEANPPUFILES'#010+
|
|
|
- ' ',' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
|
+ ' -$(DEL) ','$(CLEANPPUFILES)'#010+
|
|
|
'endif'#010+
|
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
|
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
|
|
@@ -1217,7 +1219,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
|
'endif'#010+
|
|
|
'ifdef CLEAN_FILES'#010+
|
|
|
- ' -$(DEL) $(CL','EAN_FILES)'#010+
|
|
|
+ ' -$(DEL) $(CLEAN_FILES)'#010,
|
|
|
'endif'#010+
|
|
|
'ifdef LIB_NAME'#010+
|
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
|
@@ -1227,7 +1229,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_distclean: clean'#010+
|
|
|
#010+
|
|
|
- '# Also run clean first if targetdir is set. Unittarg','etdir is always'#010+
|
|
|
+ '# Also run clean first if targetdir is set. Unittargetdir is al','ways'#010+
|
|
|
'# set if targetdir or unittargetdir is specified'#010+
|
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
|
'TARGETDIRCLEAN=fpc_clean'#010+
|
|
|
@@ -1237,17 +1239,17 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'ifdef CLEANEXEFILES'#010+
|
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
|
'endif'#010+
|
|
|
- ' ','-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+
|
|
|
+ ' -$(DEL) *$(','OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+
|
|
|
'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
|
' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
|
|
|
#010+
|
|
|
'ifdef AOUTEXT'#010+
|
|
|
- ' -$(DEL) *$(AOUTEXT)',#010+
|
|
|
+ ' -$(DEL) *$(AOUTEXT)'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
|
|
#010+
|
|
|
- '[inforules]'#010+
|
|
|
+ '[i','nforules]'#010+
|
|
|
'#####################################################################'#010+
|
|
|
'# Info rules'#010+
|
|
|
'#####################################################################'#010+
|
|
|
@@ -1256,76 +1258,76 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
#010+
|
|
|
'fpc_info:'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) ==',' Package info =='#010+
|
|
|
+ ' @$(ECHO) == Package in','fo =='#010+
|
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Configuration info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) FPC.......... $(FPC)'#010,
|
|
|
- ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
|
|
+ ' @$(ECHO) FPC.......... $(FPC)'#010+
|
|
|
+ ' @$(','ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
|
|
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
|
|
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
|
|
|
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
|
|
|
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
|
|
- ' @$(','ECHO)'#010+
|
|
|
- ' @$(ECHO) == Directory info =='#010+
|
|
|
+ ' @$(ECHO)'#010+
|
|
|
+ ' ',' @$(ECHO) == Directory info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
|
|
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
|
|
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
|
|
- ' @$(ECHO) PackagesDir..... $(PAC','KAGESDIR)'#010+
|
|
|
- ' @$(ECHO)'#010+
|
|
|
+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
|
|
+ ' ',' @$(ECHO)'#010+
|
|
|
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
|
|
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Tools info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Pwd....... $(PWD)'#010+
|
|
|
- ' @$','(ECHO) Mv........ $(MVPROG)'#010+
|
|
|
+ ' @$(ECHO) Mv.','....... $(MVPROG)'#010+
|
|
|
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
|
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
|
' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
|
- ' @$(ECHO) ','FPCMake... $(FPCMAKE)'#010+
|
|
|
+ ' @$(ECHO) FPCMake... ','$(FPCMAKE)'#010+
|
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
|
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Object info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) Target Loa','ders...... $(TARGET_LOADERS)'#010+
|
|
|
+ ' @$(ECHO) Target Loaders...... ','$(TARGET_LOADERS)'#010+
|
|
|
' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+
|
|
|
' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+
|
|
|
' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+
|
|
|
- ' @$(ECHO) Target Examples..... $(TAR','GET_EXAMPLES)'#010+
|
|
|
+ ' @$(ECHO) Target Examples..... $(TARGET_EXAMPLE','S)'#010+
|
|
|
' @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
|
|
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
- ' @$(ECHO) Insta','ll Units....... $(INSTALL_UNITS)'#010+
|
|
|
+ ' @$(ECHO) Install Units...','.... $(INSTALL_UNITS)'#010+
|
|
|
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) == Install info =='#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
|
- ' @$(ECHO) ZipPrefix..','.......... $(ZIPPREFIX)'#010+
|
|
|
+ ' @$(ECHO) ZipPrefix............ ','$(ZIPPREFIX)'#010+
|
|
|
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
|
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
|
|
|
- ' @$(ECHO) Install',' binary dir... $(INSTALL_BINDIR)'#010+
|
|
|
+ ' @$(ECHO) Install binary dir','... $(INSTALL_BINDIR)'#010+
|
|
|
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
|
|
|
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
|
|
|
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
|
|
|
- ' @$(ECHO) Install doc',' dir...... $(INSTALL_DOCDIR)'#010+
|
|
|
+ ' @$(ECHO) Install doc dir...... ','$(INSTALL_DOCDIR)'#010+
|
|
|
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
|
|
|
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
|
|
- ' @$(ECHO) ',' Dist zip name........ $(DIST_ZIPNAME)'#010+
|
|
|
+ ' @$(ECHO) Dist zip n','ame........ $(DIST_ZIPNAME)'#010+
|
|
|
' @$(ECHO)'#010+
|
|
|
#010+
|
|
|
'[localmakefile]'#010+
|
|
|
@@ -1333,7 +1335,7 @@ const fpcmakeini : array[0..125,1..240] of char=(
|
|
|
'# Local Makefile'#010+
|
|
|
'#####################################################################'#010+
|
|
|
#010+
|
|
|
- 'ifneq ($(','wildcard fpcmake.loc),)'#010+
|
|
|
+ 'ifneq ($(wildcard fp','cmake.loc),)'#010+
|
|
|
'include fpcmake.loc'#010+
|
|
|
'endif'#010+
|
|
|
#010+
|
peter