|
@@ -842,12 +842,12 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# MacOS'#010+
|
|
'# MacOS'#010+
|
|
'ifeq ($(OS_TARGET),macos)'#010+
|
|
'ifeq ($(OS_TARGET),macos)'#010+
|
|
- 'PPUEXT=.pput'#010+
|
|
|
|
|
|
+ 'PPUEXT=.ppu'#010+
|
|
'ASMEXT=.s'#010+
|
|
'ASMEXT=.s'#010+
|
|
'OEXT=.o'#010+
|
|
'OEXT=.o'#010+
|
|
'SMARTEXT=.sl'#010+
|
|
'SMARTEXT=.sl'#010+
|
|
'STATICLIBEXT=.a'#010+
|
|
'STATICLIBEXT=.a'#010+
|
|
- 'EX','EEXT='#010+
|
|
|
|
|
|
+ 'EXE','EXT='#010+
|
|
'FPCMADE=fpcmade.mcc'#010+
|
|
'FPCMADE=fpcmade.mcc'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -857,7 +857,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'# Names of the binutils tools'#010+
|
|
'# Names of the binutils tools'#010+
|
|
- 'ASNAM','E=as'#010+
|
|
|
|
|
|
+ 'ASNAME','=as'#010+
|
|
'LDNAME=ld'#010+
|
|
'LDNAME=ld'#010+
|
|
'ARNAME=ar'#010+
|
|
'ARNAME=ar'#010+
|
|
'RCNAME=rc'#010+
|
|
'RCNAME=rc'#010+
|
|
@@ -872,7 +872,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'ifdef CROSSBINDIR'#010+
|
|
'ifdef CROSSBINDIR'#010+
|
|
'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+
|
|
'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- 'ASPROG=$(ASNAM','E)'#010+
|
|
|
|
|
|
+ 'ASPROG=$(ASNAME',')'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -888,7 +888,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Resource compiler'#010+
|
|
'# Resource compiler'#010+
|
|
'ifndef RCPROG'#010+
|
|
'ifndef RCPROG'#010+
|
|
'ifdef CROSSBINDIR'#010+
|
|
'ifdef CROSSBINDIR'#010+
|
|
- 'RCPROG=$(CROSSBINDIR)/$(RCNAM','E)$(SRCEXEEXT)'#010+
|
|
|
|
|
|
+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME',')$(SRCEXEEXT)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'RCPROG=$(RCNAME)'#010+
|
|
'RCPROG=$(RCNAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -907,7 +907,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'AS=$(ASPROG)'#010+
|
|
'AS=$(ASPROG)'#010+
|
|
'LD=$(LDPROG)'#010+
|
|
'LD=$(LDPROG)'#010+
|
|
'RC=$(RCPROG)'#010+
|
|
'RC=$(RCPROG)'#010+
|
|
- 'AR=$(ARPR','OG)'#010+
|
|
|
|
|
|
+ 'AR=$(ARPRO','G)'#010+
|
|
#010+
|
|
#010+
|
|
'# ppas.bat / ppas.sh'#010+
|
|
'# ppas.bat / ppas.sh'#010+
|
|
'PPAS=ppas$(BATCHEXT)'#010+
|
|
'PPAS=ppas$(BATCHEXT)'#010+
|
|
@@ -925,7 +925,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'DATESTR='#010+
|
|
'DATESTR='#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Look if UPX is found for go32v2 and win','32. We can'#039't use $UPX b'+
|
|
|
|
|
|
+ '# Look if UPX is found for go32v2 and win3','2. We can'#039't use $UPX b'+
|
|
'ecuase'#010+
|
|
'ecuase'#010+
|
|
'# upx uses that one itself (PFV)'#010+
|
|
'# upx uses that one itself (PFV)'#010+
|
|
'ifndef UPXPROG'#010+
|
|
'ifndef UPXPROG'#010+
|
|
@@ -936,7 +936,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'UPXPROG:=1'#010+
|
|
'UPXPROG:=1'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef UPXPROG'#010+
|
|
'ifdef UPXPROG'#010+
|
|
- 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SE','ARCHPAT'+
|
|
|
|
|
|
+ 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEA','RCHPAT'+
|
|
'H))))'#010+
|
|
'H))))'#010+
|
|
'ifeq ($(UPXPROG),)'#010+
|
|
'ifeq ($(UPXPROG),)'#010+
|
|
'UPXPROG='#010+
|
|
'UPXPROG='#010+
|
|
@@ -958,8 +958,8 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'TAROPT=vI'#010+
|
|
'TAROPT=vI'#010+
|
|
'TAREXT=.tar.bz2'#010+
|
|
'TAREXT=.tar.bz2'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- 'TAROPT=vz'#010,
|
|
|
|
- 'TAREXT=.tar.gz'#010+
|
|
|
|
|
|
+ 'TAROPT=vz'#010+
|
|
|
|
+ 'T','AREXT=.tar.gz'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
@@ -968,7 +968,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Compiler Command Line'#010+
|
|
'# Compiler Command Line'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '# Load commandline OPTDEF and add FP','C_CPU define, for compiling the'#010+
|
|
|
|
|
|
+ '# Load commandline OPTDEF and add FPC','_CPU define, for compiling the'#010+
|
|
'# compiler this needs to be turned off'#010+
|
|
'# compiler this needs to be turned off'#010+
|
|
'ifndef NOCPUDEF'#010+
|
|
'ifndef NOCPUDEF'#010+
|
|
'override FPCOPTDEF=$(CPU_TARGET)'#010+
|
|
'override FPCOPTDEF=$(CPU_TARGET)'#010+
|
|
@@ -976,7 +976,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# Load commandline OPT and add target and unit dir to be sure'#010+
|
|
'# Load commandline OPT and add target and unit dir to be sure'#010+
|
|
'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
|
|
'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
|
|
- 'override FPCOPT+=','-T$(OS_TARGET)'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-','T$(OS_TARGET)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'ifeq ($(OS_SOURCE),openbsd)'#010+
|
|
'ifeq ($(OS_SOURCE),openbsd)'#010+
|
|
@@ -988,7 +988,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
|
|
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef LIBDIR'#010+
|
|
'ifdef LIBDIR'#010+
|
|
- 'overrid','e FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
|
|
|
|
|
|
+ 'override',' FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef OBJDIR'#010+
|
|
'ifdef OBJDIR'#010+
|
|
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
|
|
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
|
|
@@ -1002,7 +1002,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'override FPCOPT+=-XX'#010+
|
|
'override FPCOPT+=-XX'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Smartlink','ing creation'#010+
|
|
|
|
|
|
+ '# Smartlinki','ng creation'#010+
|
|
'ifdef CREATESMART'#010+
|
|
'ifdef CREATESMART'#010+
|
|
'override FPCOPT+=-CX'#010+
|
|
'override FPCOPT+=-CX'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1016,7 +1016,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Release mode (strip, optimize and don'#039't load fpc.cfg)'#010+
|
|
'# Release mode (strip, optimize and don'#039't load fpc.cfg)'#010+
|
|
'ifdef RELEASE'#010+
|
|
'ifdef RELEASE'#010+
|
|
'ifeq ($(CPU_TARGET),i386)'#010+
|
|
'ifeq ($(CPU_TARGET),i386)'#010+
|
|
- 'FPCCPUOPT:=','-OG2p3'#010+
|
|
|
|
|
|
+ 'FPCCPUOPT:=-','OG2p3'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'FPCCPUOPT:='#010+
|
|
'FPCCPUOPT:='#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1032,7 +1032,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Optimizer (i386 only for now)'#010+
|
|
'# Optimizer (i386 only for now)'#010+
|
|
'ifdef OPTIMIZE'#010+
|
|
'ifdef OPTIMIZE'#010+
|
|
'ifeq ($(CPU_TARGET),i386)'#010+
|
|
'ifeq ($(CPU_TARGET),i386)'#010+
|
|
- 'override FPCOPT+=','-OG2p3'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-','OG2p3'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1046,7 +1046,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
|
|
'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef COMPILER_UNITDIR'#010+
|
|
'ifdef COMPILER_UNITDIR'#010+
|
|
- 'override FPCOPT+=$(add','prefix -Fu,$(COMPILER_UNITDIR))'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=$(addp','refix -Fu,$(COMPILER_UNITDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef COMPILER_LIBRARYDIR'#010+
|
|
'ifdef COMPILER_LIBRARYDIR'#010+
|
|
'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
|
|
'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
|
|
@@ -1054,8 +1054,8 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'ifdef COMPILER_OBJECTDIR'#010+
|
|
'ifdef COMPILER_OBJECTDIR'#010+
|
|
'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
|
|
'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'ifdef COMPILER_INCLUDEDIR'#010,
|
|
|
|
- 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
|
|
|
|
|
|
+ 'ifdef COMPILER_INCLUDEDIR'#010+
|
|
|
|
+ 'o','verride FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Cross compiler utils'#010+
|
|
'# Cross compiler utils'#010+
|
|
@@ -1065,7 +1065,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# Target dirs and the prefix to use for clean/install'#010+
|
|
'# Target dirs and the prefix to use for clean/install'#010+
|
|
'ifdef COMPILER_TARGETDIR'#010+
|
|
'ifdef COMPILER_TARGETDIR'#010+
|
|
- 'override FPCOP','T+=-FE$(COMPILER_TARGETDIR)'#010+
|
|
|
|
|
|
+ 'override FPCOPT','+=-FE$(COMPILER_TARGETDIR)'#010+
|
|
'ifeq ($(COMPILER_TARGETDIR),.)'#010+
|
|
'ifeq ($(COMPILER_TARGETDIR),.)'#010+
|
|
'override TARGETDIRPREFIX='#010+
|
|
'override TARGETDIRPREFIX='#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
@@ -1075,7 +1075,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# Unit target dir'#010+
|
|
'# Unit target dir'#010+
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
'ifdef COMPILER_UNITTARGETDIR'#010+
|
|
- 'override FPCOPT+=-FU$(COMPILER_UNITTARGETD','IR)'#010+
|
|
|
|
|
|
+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDI','R)'#010+
|
|
'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
|
|
'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
|
|
'override UNITTARGETDIRPREFIX='#010+
|
|
'override UNITTARGETDIRPREFIX='#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
@@ -1084,7 +1084,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'else'#010+
|
|
'else'#010+
|
|
'ifdef COMPILER_TARGETDIR'#010+
|
|
'ifdef COMPILER_TARGETDIR'#010+
|
|
'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
|
|
'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
|
|
- 'override UNITTARGETD','IRPREFIX=$(TARGETDIRPREFIX)'#010+
|
|
|
|
|
|
+ 'override UNITTARGETDI','RPREFIX=$(TARGETDIRPREFIX)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1099,7 +1099,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[command_end]'#010+
|
|
'[command_end]'#010+
|
|
- '# Add comman','dline options last so they can override'#010+
|
|
|
|
|
|
+ '# Add command','line options last so they can override'#010+
|
|
'ifdef OPT'#010+
|
|
'ifdef OPT'#010+
|
|
'override FPCOPT+=$(OPT)'#010+
|
|
'override FPCOPT+=$(OPT)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1111,7 +1111,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'# Was a config file specified ?'#010+
|
|
'# Was a config file specified ?'#010+
|
|
'ifdef CFGFILE'#010+
|
|
'ifdef CFGFILE'#010+
|
|
- 'overr','ide FPCOPT+=@$(CFGFILE)'#010+
|
|
|
|
|
|
+ 'overri','de FPCOPT+=@$(CFGFILE)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Use the environment to pass commandline options?'#010+
|
|
'# Use the environment to pass commandline options?'#010+
|
|
@@ -1124,7 +1124,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Compiler commandline'#010+
|
|
'# Compiler commandline'#010+
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
'override COMPILER:=$(FPC) $(FPCOPT)'#010+
|
|
#010+
|
|
#010+
|
|
- '# a','lso call ppas if with command option -s'#010+
|
|
|
|
|
|
+ '# al','so call ppas if with command option -s'#010+
|
|
'# but only if the OS_SOURCE and OS_TARGET are equal'#010+
|
|
'# but only if the OS_SOURCE and OS_TARGET are equal'#010+
|
|
'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
|
|
'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
|
|
'EXECPPAS='#010+
|
|
'EXECPPAS='#010+
|
|
@@ -1136,7 +1136,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[loaderrules]'#010+
|
|
'[loaderrules]'#010+
|
|
- '###############','#####################################################'+
|
|
|
|
|
|
+ '################','####################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Loaders'#010+
|
|
'# Loaders'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1145,7 +1145,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'ifdef TARGET_LOADERS'#010+
|
|
'ifdef TARGET_LOADERS'#010+
|
|
'override ALLTARGET+=fpc_loaders'#010+
|
|
'override ALLTARGET+=fpc_loaders'#010+
|
|
- 'override CLEANTARGET+=fpc_load','ers_clean'#010+
|
|
|
|
|
|
+ 'override CLEANTARGET+=fpc_loade','rs_clean'#010+
|
|
'override INSTALLTARGET+=fpc_loaders_install'#010+
|
|
'override INSTALLTARGET+=fpc_loaders_install'#010+
|
|
#010+
|
|
#010+
|
|
'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
|
|
'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
|
|
@@ -1157,7 +1157,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'fpc_loaders: $(LOADEROFILES)'#010+
|
|
'fpc_loaders: $(LOADEROFILES)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_loaders_clean:'#010+
|
|
'fpc_loaders_clean:'#010+
|
|
- ' -$(D','EL) $(LOADEROFILES)'#010+
|
|
|
|
|
|
+ ' -$(DE','L) $(LOADEROFILES)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_loaders_install:'#010+
|
|
'fpc_loaders_install:'#010+
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
@@ -1167,7 +1167,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'[unitrules]'#010+
|
|
'[unitrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Units'#010+
|
|
'# Units'#010+
|
|
- '################','####################################################'+
|
|
|
|
|
|
+ '#################','###################################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_units'#010+
|
|
'.PHONY: fpc_units'#010+
|
|
@@ -1176,7 +1176,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'override ALLTARGET+=fpc_units'#010+
|
|
'override ALLTARGET+=fpc_units'#010+
|
|
#010+
|
|
#010+
|
|
'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
|
|
'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
|
|
- 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(T','ARGET_IMPLICI'+
|
|
|
|
|
|
+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TA','RGET_IMPLICI'+
|
|
'TUNITS))'#010+
|
|
'TUNITS))'#010+
|
|
'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
|
|
@@ -1186,7 +1186,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[exerules]'#010+
|
|
'[exerules]'#010+
|
|
- '#########################################','###########################'+
|
|
|
|
|
|
+ '##########################################','##########################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Exes'#010+
|
|
'# Exes'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1195,14 +1195,14 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'ifdef TARGET_PROGRAMS'#010+
|
|
'ifdef TARGET_PROGRAMS'#010+
|
|
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
|
- 'override EXEOFILES:=$(addsuffix $','(OEXT),$(TARGET_PROGRAMS)) $(addpre'+
|
|
|
|
|
|
+ 'override EXEOFILES:=$(addsuffix $(','OEXT),$(TARGET_PROGRAMS)) $(addpre'+
|
|
'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
|
|
'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
|
|
')'#010+
|
|
')'#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+
|
|
- 'ifeq ($(OS_TARGE','T),os2)'#010+
|
|
|
|
|
|
+ 'ifeq ($(OS_TARGET','),os2)'#010+
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1213,7 +1213,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'[rstrules]'#010+
|
|
'[rstrules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Resource strings'#010+
|
|
'# Resource strings'#010+
|
|
- '############################','########################################'+
|
|
|
|
|
|
+ '#############################','#######################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef TARGET_RSTS'#010+
|
|
'ifdef TARGET_RSTS'#010+
|
|
@@ -1224,7 +1224,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[examplerules]'#010+
|
|
'[examplerules]'#010+
|
|
- '###############################################################','#####'+
|
|
|
|
|
|
+ '################################################################','####'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Examples'#010+
|
|
'# Examples'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1234,13 +1234,13 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'ifdef TARGET_EXAMPLES'#010+
|
|
'ifdef TARGET_EXAMPLES'#010+
|
|
'HASEXAMPLES=1'#010+
|
|
'HASEXAMPLES=1'#010+
|
|
'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
|
|
'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
|
|
- 'LES)) $(addsuffix .pas,','$(TARGET_EXAMPLES)))'#010+
|
|
|
|
|
|
+ 'LES)) $(addsuffix .pas,$','(TARGET_EXAMPLES)))'#010+
|
|
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
|
|
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
|
|
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
|
|
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
|
|
'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+
|
|
'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+
|
|
')))'#010+
|
|
')))'#010+
|
|
#010+
|
|
#010+
|
|
- 'override ','CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
|
|
|
|
+ 'override C','LEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
|
'ifeq ($(OS_TARGET),os2)'#010+
|
|
'ifeq ($(OS_TARGET),os2)'#010+
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
|
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1249,7 +1249,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'HASEXAMPLES=1'#010+
|
|
'HASEXAMPLES=1'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_examples: all $(EXAMPLEFILES) $(addsuff','ix _all,$(TARGET_EXAMPLED'+
|
|
|
|
|
|
+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffi','x _all,$(TARGET_EXAMPLED'+
|
|
'IRS))'#010+
|
|
'IRS))'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
@@ -1258,7 +1258,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# General compile rules'#010+
|
|
'# General compile rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '.PHONY: fpc_all fpc_smart f','pc_debug fpc_release'#010+
|
|
|
|
|
|
+ '.PHONY: fpc_all fpc_smart fp','c_debug fpc_release'#010+
|
|
#010+
|
|
#010+
|
|
'$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
|
|
'$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
|
|
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
|
|
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
|
|
@@ -1271,7 +1271,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'fpc_debug:'#010+
|
|
'fpc_debug:'#010+
|
|
' $(MAKE) all DEBUG=1'#010+
|
|
' $(MAKE) all DEBUG=1'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_releas','e:'#010+
|
|
|
|
|
|
+ 'fpc_release',':'#010+
|
|
' $(MAKE) all RELEASE=1'#010+
|
|
' $(MAKE) all RELEASE=1'#010+
|
|
#010+
|
|
#010+
|
|
'# General compile rules, available for both possible .pp and .pas exte'+
|
|
'# General compile rules, available for both possible .pp and .pas exte'+
|
|
@@ -1283,7 +1283,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' $(COMPILER) $<'#010+
|
|
' $(COMPILER) $<'#010+
|
|
' $(EXECPPAS)'#010+
|
|
' $(EXECPPAS)'#010+
|
|
#010+
|
|
#010+
|
|
- '%$(PPUEXT','): %.pas'#010+
|
|
|
|
|
|
+ '%$(PPUEXT)',': %.pas'#010+
|
|
' $(COMPILER) $<'#010+
|
|
' $(COMPILER) $<'#010+
|
|
' $(EXECPPAS)'#010+
|
|
' $(EXECPPAS)'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1298,14 +1298,14 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'%.res: %.rc'#010+
|
|
'%.res: %.rc'#010+
|
|
' windres -i $< -o $@'#010+
|
|
' windres -i $< -o $@'#010+
|
|
#010+
|
|
#010+
|
|
- '# Search paths for .ppu',' and .pp and .pas'#010+
|
|
|
|
|
|
+ '# Search paths for .ppu ','and .pp and .pas'#010+
|
|
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
|
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
|
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[libraryrules]'#010+
|
|
'[libraryrules]'#010+
|
|
- '#################################################','###################'+
|
|
|
|
|
|
+ '##################################################','##################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Library'#010+
|
|
'# Library'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1318,7 +1318,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'else'#010+
|
|
'else'#010+
|
|
'LIB_FULLNAME=$(LIB_NAME)'#010+
|
|
'LIB_FULLNAME=$(LIB_NAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'endi','f'#010+
|
|
|
|
|
|
+ 'endif',#010+
|
|
#010+
|
|
#010+
|
|
'# Default sharedlib units are all unit objects'#010+
|
|
'# Default sharedlib units are all unit objects'#010+
|
|
'ifndef LIB_SHAREDUNITS'#010+
|
|
'ifndef LIB_SHAREDUNITS'#010+
|
|
@@ -1329,7 +1329,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'ifdef HASSHAREDLIB'#010+
|
|
'ifdef HASSHAREDLIB'#010+
|
|
' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
|
|
' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- ' @$(ECHO) Shared Librari','es not supported'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Shared Librarie','s not supported'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
@@ -1338,7 +1338,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Install rules'#010+
|
|
'# Install rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '.PHONY: fpc_install fpc_sourceinstall fpc_e','xampleinstall'#010+
|
|
|
|
|
|
+ '.PHONY: fpc_install fpc_sourceinstall fpc_ex','ampleinstall'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef INSTALL_UNITS'#010+
|
|
'ifdef INSTALL_UNITS'#010+
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
|
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
|
@@ -1349,11 +1349,11 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'(INSTALLPPUFILES))'#010+
|
|
'(INSTALLPPUFILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- 'ifdef INSTAL','LPPUFILES'#010+
|
|
|
|
|
|
+ 'ifdef INSTALL','PPUFILES'#010+
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
|
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
|
|
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
|
|
',$(INSTALLPPUFILES)))'#010+
|
|
',$(INSTALLPPUFILES)))'#010+
|
|
- 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTA','L'+
|
|
|
|
|
|
+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTAL',
|
|
'LPPUFILES))'#010+
|
|
'LPPUFILES))'#010+
|
|
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
|
'EFIX),$(INSTALLPPULINKFILES)))'#010+
|
|
'EFIX),$(INSTALLPPULINKFILES)))'#010+
|
|
@@ -1362,7 +1362,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
'ifdef INSTALLEXEFILES'#010+
|
|
- 'override INSTALLEXEFILES:=$(','addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+
|
|
|
|
|
|
+ 'override INSTALLEXEFILES:=$(a','ddprefix $(TARGETDIRPREFIX),$(INSTALLEX'+
|
|
'EFILES))'#010+
|
|
'EFILES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1372,14 +1372,14 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Compress the exes if upx is defined'#010+
|
|
'# Compress the exes if upx is defined'#010+
|
|
'ifdef UPXPROG'#010+
|
|
'ifdef UPXPROG'#010+
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
|
|
- 'en','dif'#010+
|
|
|
|
|
|
+ 'end','if'#010+
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
|
|
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
|
|
'ifdef FPCMAKE'#010+
|
|
'ifdef FPCMAKE'#010+
|
|
'# If the fpcpackage variable is set then create and install Package.fp'+
|
|
'# If the fpcpackage variable is set then create and install Package.fp'+
|
|
'c,'#010+
|
|
'c,'#010+
|
|
- '# a safety check is done if Makefile.fpc is available',#010+
|
|
|
|
|
|
+ '# a safety check is done if Makefile.fpc is available'#010,
|
|
'ifdef PACKAGE_VERSION'#010+
|
|
'ifdef PACKAGE_VERSION'#010+
|
|
'ifneq ($(wildcard Makefile.fpc),)'#010+
|
|
'ifneq ($(wildcard Makefile.fpc),)'#010+
|
|
' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+
|
|
' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+
|
|
@@ -1390,13 +1390,13 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
'ifdef INSTALLPPUFILES'#010+
|
|
- ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
|
|
|
|
+ ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
|
'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
|
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
|
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
|
- ' $(MK','DIR) $(INSTALL_LIBDIR)'#010+
|
|
|
|
|
|
+ ' $(MKD','IR) $(INSTALL_LIBDIR)'#010+
|
|
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
|
'ifdef inUnix'#010+
|
|
'ifdef inUnix'#010+
|
|
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
|
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
|
@@ -1405,7 +1405,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef INSTALL_FILES'#010+
|
|
'ifdef INSTALL_FILES'#010+
|
|
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
|
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
|
- ' $(INSTAL','L) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
|
|
|
|
|
|
+ ' $(INSTALL',') $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_sourceinstall: distclean'#010+
|
|
'fpc_sourceinstall: distclean'#010+
|
|
@@ -1413,15 +1413,15 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
|
|
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
|
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
|
|
- 'ifdef ','HASEXAMPLES'#010+
|
|
|
|
|
|
+ 'ifdef H','ASEXAMPLES'#010+
|
|
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
|
|
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef EXAMPLESOURCEFILES'#010+
|
|
'ifdef EXAMPLESOURCEFILES'#010+
|
|
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
|
|
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
- ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL','_'+
|
|
|
|
- 'EXAMPLEDIR)'#010+
|
|
|
|
|
|
+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_','E'+
|
|
|
|
+ 'XAMPLEDIR)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'[distinstallrules]'#010+
|
|
'[distinstallrules]'#010+
|
|
@@ -1431,7 +1431,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_distinstall'#010+
|
|
'.PHONY: fpc_distinstall'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_distinstall: ins','tall exampleinstall'#010+
|
|
|
|
|
|
+ 'fpc_distinstall: inst','all exampleinstall'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[zipinstallrules]'#010+
|
|
'[zipinstallrules]'#010+
|
|
@@ -1439,7 +1439,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# Zip'#010+
|
|
'# Zip'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipex','ampleinstall'#010+
|
|
|
|
|
|
+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexa','mpleinstall'#010+
|
|
#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+
|
|
'# subdir, because the deltree can'#039't see the whole tree to remove'#010+
|
|
@@ -1451,7 +1451,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '#',' Maybe create default zipname from packagename'#010+
|
|
|
|
|
|
+ '# ','Maybe create default zipname from packagename'#010+
|
|
'ifndef ZIPNAME'#010+
|
|
'ifndef ZIPNAME'#010+
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
'ifdef DIST_ZIPNAME'#010+
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
'ZIPNAME=$(DIST_ZIPNAME)'#010+
|
|
@@ -1463,7 +1463,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'# ZipTarget'#010+
|
|
'# ZipTarget'#010+
|
|
'ifndef ZIPTARGET'#010+
|
|
'ifndef ZIPTARGET'#010+
|
|
'ifdef DIST_ZIPTARGET'#010+
|
|
'ifdef DIST_ZIPTARGET'#010+
|
|
- 'ZIPTARGET=DIST_ZIPT','ARGET'#010+
|
|
|
|
|
|
+ 'ZIPTARGET=DIST_ZIPTA','RGET'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
'ZIPTARGET=install'#010+
|
|
'ZIPTARGET=install'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1481,7 +1481,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'USEZIPWRAPPER=1'#010+
|
|
'USEZIPWRAPPER=1'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# We need to be able to run in the c','urrent OS so fix'#010+
|
|
|
|
|
|
+ '# We need to be able to run in the cu','rrent OS so fix'#010+
|
|
'# the path separator'#010+
|
|
'# the path separator'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
'ZIPPATHSEP=$(PATHSEP)'#010+
|
|
@@ -1491,13 +1491,13 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Create commands to create the zip/tar file'#010+
|
|
'# Create commands to create the zip/tar file'#010+
|
|
- 'ZIPCMD_CDPACK:=cd $(sub','st /,$(ZIPPATHSEP),$(PACKDIR))'#010+
|
|
|
|
|
|
+ 'ZIPCMD_CDPACK:=cd $(subs','t /,$(ZIPPATHSEP),$(PACKDIR))'#010+
|
|
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
|
|
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
|
|
'ifdef USETAR'#010+
|
|
'ifdef USETAR'#010+
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
|
|
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
|
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
- 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNA','ME)$(ZIPEXT)'#010+
|
|
|
|
|
|
+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAM','E)$(ZIPEXT)'#010+
|
|
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
|
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
|
'TFILE) *'#010+
|
|
'TFILE) *'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
@@ -1505,13 +1505,13 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'fpc_zipinstall:'#010+
|
|
'fpc_zipinstall:'#010+
|
|
' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
|
' $(MKDIR) $(DIST_DESTDIR)'#010+
|
|
' $(MKDIR) $(DIST_DESTDIR)'#010+
|
|
- ' $(DEL) $(ZIPDEST','FILE)'#010+
|
|
|
|
|
|
+ ' $(DEL) $(ZIPDESTF','ILE)'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'ifdef USEZIPWRAPPER'#010+
|
|
'# Handle gecho separate as we need to espace \ with \\'#010+
|
|
'# Handle gecho separate as we need to espace \ with \\'#010+
|
|
'ifneq ($(ECHOREDIR),echo)'#010+
|
|
'ifneq ($(ECHOREDIR),echo)'#010+
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
|
|
'R)'#010+
|
|
'R)'#010+
|
|
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(Z','IPWRAPPE'+
|
|
|
|
|
|
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZI','PWRAPPE'+
|
|
'R)'#010+
|
|
'R)'#010+
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
|
|
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
|
|
'ER)'#010+
|
|
'ER)'#010+
|
|
@@ -1520,7 +1520,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'ifdef i','nUnix'#010+
|
|
|
|
|
|
+ 'ifdef in','Unix'#010+
|
|
' /bin/sh $(ZIPWRAPPER)'#010+
|
|
' /bin/sh $(ZIPWRAPPER)'#010+
|
|
'else'#010+
|
|
'else'#010+
|
|
' $(ZIPWRAPPER)'#010+
|
|
' $(ZIPWRAPPER)'#010+
|
|
@@ -1532,7 +1532,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
' $(DELTREE) $(PACKDIR)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_zipsourceinstall:'#010+
|
|
'fpc_zipsourceinstall:'#010+
|
|
- ' $(MAKE) fp','c_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'+
|
|
|
|
|
|
+ ' $(MAKE) fpc','_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'fpc_zipexampleinstall:'#010+
|
|
'fpc_zipexampleinstall:'#010+
|
|
@@ -1541,7 +1541,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_zipdistinstall:'#010+
|
|
'fpc_zipdistinstall:'#010+
|
|
- ' $(MAKE) fpc_zipinstall ZIPTARGET=distinsta','ll'#010+
|
|
|
|
|
|
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstal','l'#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[cleanrules]'#010+
|
|
'[cleanrules]'#010+
|
|
@@ -1552,7 +1552,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef EXEFILES'#010+
|
|
'ifdef EXEFILES'#010+
|
|
- 'overri','de CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
|
|
|
|
|
|
+ 'overrid','e CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
|
|
'ES))'#010+
|
|
'ES))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1561,12 +1561,12 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'ifdef CLEANPPUFILES'#010+
|
|
'ifdef CLEANPPUFILES'#010+
|
|
- 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLE','ANPPUFILE'+
|
|
|
|
|
|
+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEA','NPPUFILE'+
|
|
'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
|
|
'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
|
|
'(CLEANPPUFILES)))'#010+
|
|
'(CLEANPPUFILES)))'#010+
|
|
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
|
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
|
'ILES))'#010+
|
|
'ILES))'#010+
|
|
- 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIR','PR'+
|
|
|
|
|
|
+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRP','R'+
|
|
'EFIX),$(CLEANPPULINKFILES)))'#010+
|
|
'EFIX),$(CLEANPPULINKFILES)))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1578,7 +1578,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
' -$(DEL) $(CLEANPPUFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
|
- ' -$(DEL) $(CLEANPPULI','NKFILES)'#010+
|
|
|
|
|
|
+ ' -$(DEL) $(CLEANPPULIN','KFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef CLEANRSTFILES'#010+
|
|
'ifdef CLEANRSTFILES'#010+
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
|
@@ -1589,14 +1589,14 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'ifdef LIB_NAME'#010+
|
|
'ifdef LIB_NAME'#010+
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- ' -$','(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $'+
|
|
|
|
|
|
+ ' -$(','DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $'+
|
|
'(FPCEXTFILE) $(REDIRFILE)'#010+
|
|
'(FPCEXTFILE) $(REDIRFILE)'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_distclean: clean'#010+
|
|
'fpc_distclean: clean'#010+
|
|
#010+
|
|
#010+
|
|
'# Also run clean first if targetdir is set. Unittargetdir is always'#010+
|
|
'# Also run clean first if targetdir is set. Unittargetdir is always'#010+
|
|
'# set if targetdir or unittargetdir is specified'#010+
|
|
'# set if targetdir or unittargetdir is specified'#010+
|
|
- 'ifdef COMPILER_U','NITTARGETDIR'#010+
|
|
|
|
|
|
+ 'ifdef COMPILER_UN','ITTARGETDIR'#010+
|
|
'TARGETDIRCLEAN=fpc_clean'#010+
|
|
'TARGETDIRCLEAN=fpc_clean'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1605,7 +1605,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
' -$(DEL) $(CLEANEXEFILES)'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
|
- 'EXT) *$(SHAREDLIBEX','T) *$(PPLEXT)'#010+
|
|
|
|
|
|
+ 'EXT) *$(SHAREDLIBEXT',') *$(PPLEXT)'#010+
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
' -$(DELTREE) *$(SMARTEXT)'#010+
|
|
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
|
|
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
|
|
'PCEXTFILE) $(REDIRFILE)'#010+
|
|
'PCEXTFILE) $(REDIRFILE)'#010+
|
|
@@ -1615,7 +1615,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
#010+
|
|
#010+
|
|
'[baseinforules]'#010+
|
|
'[baseinforules]'#010+
|
|
- '#################################','###################################'+
|
|
|
|
|
|
+ '##################################','##################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# Base info rules'#010+
|
|
'# Base info rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1626,87 +1626,87 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'fpc_baseinfo:'#010+
|
|
'fpc_baseinfo:'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) == Packag','e info =='#010+
|
|
|
|
|
|
+ ' @$(ECHO) == Package',' info =='#010+
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Configuration info =='#010+
|
|
' @$(ECHO) == Configuration info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) FPC.......... $(FPC)'#010+
|
|
' @$(ECHO) FPC.......... $(FPC)'#010+
|
|
- ' ',' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
|
|
|
|
|
+ ' ','@$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
|
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
|
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
|
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
|
|
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
|
|
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
|
|
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
|
|
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
|
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
|
- ' @$(ECHO) ','Full Source.. $(FULL_SOURCE)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) F','ull Source.. $(FULL_SOURCE)'#010+
|
|
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
|
|
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Directory info =='#010+
|
|
' @$(ECHO) == Directory info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
|
|
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
- ' @$(ECHO) B','asedir......... $(BASEDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Ba','sedir......... $(BASEDIR)'#010+
|
|
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
|
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
|
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
|
|
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
|
|
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
|
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
|
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
|
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#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+
|
|
' @$(ECHO) == Tools info =='#010+
|
|
' @$(ECHO) == Tools info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) As........ $(AS)'#010+
|
|
' @$(ECHO) As........ $(AS)'#010+
|
|
' @$(ECHO) Ld........ $(LD)'#010+
|
|
' @$(ECHO) Ld........ $(LD)'#010+
|
|
- ' ',' @$(ECHO) Ar........ $(AR)'#010+
|
|
|
|
|
|
+ ' ','@$(ECHO) Ar........ $(AR)'#010+
|
|
' @$(ECHO) Rc........ $(RC)'#010+
|
|
' @$(ECHO) Rc........ $(RC)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Mv........ $(MVPROG)'#010+
|
|
' @$(ECHO) Mv........ $(MVPROG)'#010+
|
|
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
|
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
|
- ' ',' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
|
|
|
|
+ ' ',' @$(ECHO) Echo...... $(ECHO)'#010+
|
|
' @$(ECHO) Shell..... $(SHELL)'#010+
|
|
' @$(ECHO) Shell..... $(SHELL)'#010+
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
' @$(ECHO) Date...... $(DATE)'#010+
|
|
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
|
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
|
- ' @$','(ECHO) Zip....... $(ZIPPROG)'#010+
|
|
|
|
|
|
+ ' @$(','ECHO) Zip....... $(ZIPPROG)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Object info =='#010+
|
|
' @$(ECHO) == Object info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
|
|
' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
|
|
' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#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 Programs....... $(TARGET_PROGRAMS)'#010+
|
|
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
|
|
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
|
|
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
|
|
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
|
|
- ' @$(ECHO) Targe','t ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Target',' ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
|
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
|
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
|
|
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
|
|
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
|
|
- ' ',' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
|
|
|
|
+ ' ',' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) == Install info =='#010+
|
|
' @$(ECHO) == Install info =='#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
|
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
|
|
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
|
|
- ' @$(','ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
|
|
|
|
+ ' @$(E','CHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
|
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
|
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#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 library dir.. $(INSTALL_LIBDIR)'#010+
|
|
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
|
|
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
|
|
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#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 example dir.. $(INSTALL_EXAMPLEDIR)'#010+
|
|
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
|
|
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
|
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
|
- ' @$(ECHO) Dist zip name........ $(DIST_ZIPNA','ME)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAM','E)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
#010+
|
|
#010+
|
|
'[inforules]'#010+
|
|
'[inforules]'#010+
|
|
@@ -1718,14 +1718,14 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'fpc_info: $(INFORULES)'#010+
|
|
'fpc_info: $(INFORULES)'#010+
|
|
#010+
|
|
#010+
|
|
- '[makefiler','ules]'#010+
|
|
|
|
|
|
+ '[makefileru','les]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Rebuild Makefile'#010+
|
|
'# Rebuild Makefile'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
|
|
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
|
|
' \'#010+
|
|
' \'#010+
|
|
- ' ',' fpc_makefile_dirs'#010+
|
|
|
|
|
|
+ ' ',' fpc_makefile_dirs'#010+
|
|
#010+
|
|
#010+
|
|
'fpc_makefile:'#010+
|
|
'fpc_makefile:'#010+
|
|
' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
|
|
' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
|
|
@@ -1736,7 +1736,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'T_DIRS))'#010+
|
|
'T_DIRS))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
'ifdef TARGET_EXAMPLEDIRS'#010+
|
|
- ' ',' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+
|
|
|
|
|
|
+ ' ',' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+
|
|
'GET_EXAMPLEDIRS))'#010+
|
|
'GET_EXAMPLEDIRS))'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1745,14 +1745,14 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
#010+
|
|
#010+
|
|
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
|
|
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
|
|
#010+
|
|
#010+
|
|
- 'fpc_make','files: fpc_makefile fpc_makefile_dirs'#010+
|
|
|
|
|
|
+ 'fpc_makef','iles: fpc_makefile fpc_makefile_dirs'#010+
|
|
#010+
|
|
#010+
|
|
'[localmakefile]'#010+
|
|
'[localmakefile]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# Local Makefile'#010+
|
|
'# Local Makefile'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
- 'ifneq ($(wildcard fpcmake.l','oc),)'#010+
|
|
|
|
|
|
+ 'ifneq ($(wildcard fpcmake.lo','c),)'#010+
|
|
'include fpcmake.loc'#010+
|
|
'include fpcmake.loc'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1763,7 +1763,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
#010+
|
|
#010+
|
|
'[lclrules]'#010+
|
|
'[lclrules]'#010+
|
|
- '############################','########################################'+
|
|
|
|
|
|
+ '#############################','#######################################'+
|
|
'#'#010+
|
|
'#'#010+
|
|
'# LCL Rules'#010+
|
|
'# LCL Rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
@@ -1776,7 +1776,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'LCL_PLATFORM=gtk'#010+
|
|
'LCL_PLATFORM=gtk'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
- 'e','xport LCL_PLATFORM'#010+
|
|
|
|
|
|
+ 'ex','port LCL_PLATFORM'#010+
|
|
#010+
|
|
#010+
|
|
'# Check if the specified LCLDIR is correct'#010+
|
|
'# Check if the specified LCLDIR is correct'#010+
|
|
'ifdef LCLDIR'#010+
|
|
'ifdef LCLDIR'#010+
|
|
@@ -1788,7 +1788,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'override LCLDIR=wrong'#010+
|
|
'override LCLDIR=wrong'#010+
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
- '# Check if',' the default LCLDIR is correct'#010+
|
|
|
|
|
|
+ '# Check if ','the default LCLDIR is correct'#010+
|
|
'ifdef DEFAULT_LCLDIR'#010+
|
|
'ifdef DEFAULT_LCLDIR'#010+
|
|
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
|
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
|
|
@@ -1797,7 +1797,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Check for development version'#010+
|
|
'# Check for development version'#010+
|
|
- 'ifeq ($(LCLDIR),wrong',')'#010+
|
|
|
|
|
|
+ 'ifeq ($(LCLDIR),wrong)',#010+
|
|
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
|
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
|
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
|
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
@@ -1806,7 +1806,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Check for release version'#010+
|
|
'# Check for release version'#010+
|
|
- 'ifeq ($(LCLDIR),wrong',')'#010+
|
|
|
|
|
|
+ 'ifeq ($(LCLDIR),wrong)',#010+
|
|
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
|
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
|
|
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
|
|
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
'ifeq ($(LCLDIR),)'#010+
|
|
@@ -1815,21 +1815,21 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
'endif'#010+
|
|
'endif'#010+
|
|
#010+
|
|
#010+
|
|
'# Generate dirs'#010+
|
|
'# Generate dirs'#010+
|
|
- 'override LCLUNITDIR:=$(wildcard',' $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+
|
|
|
|
|
|
+ 'override LCLUNITDIR:=$(wildcard ','$(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+
|
|
'LDIR)/units)'#010+
|
|
'LDIR)/units)'#010+
|
|
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
|
|
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
|
|
'nts $(LCLDIR)/components)'#010+
|
|
'nts $(LCLDIR)/components)'#010+
|
|
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
|
|
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
|
|
#010+
|
|
#010+
|
|
'# Add LCL dirs to paths'#010+
|
|
'# Add LCL dirs to paths'#010+
|
|
- 'override REQUIRE_PACKAGESDIR','+=$(LCLCOMPONENTDIR)'#010+
|
|
|
|
|
|
+ 'override REQUIRE_PACKAGESDIR+','=$(LCLCOMPONENTDIR)'#010+
|
|
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
|
|
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
|
|
#010+
|
|
#010+
|
|
'[lclinforules]'#010+
|
|
'[lclinforules]'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
'# LCL Info rules'#010+
|
|
'# LCL Info rules'#010+
|
|
'#####################################################################'#010+
|
|
'#####################################################################'#010+
|
|
- 'overr','ide INFORULES+=lclinfo'#010+
|
|
|
|
|
|
+ 'overri','de INFORULES+=lclinfo'#010+
|
|
#010+
|
|
#010+
|
|
'.PHONY: lclinfo'#010+
|
|
'.PHONY: lclinfo'#010+
|
|
#010+
|
|
#010+
|
|
@@ -1838,7 +1838,7 @@ const fpcmakeini : array[0..173,1..240] of char=(
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO)'#010+
|
|
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
|
|
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
|
|
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
|
|
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
|
|
- ' @$(ECHO) LCL Unit dir....','..... $(LCLUNITDIR)'#010+
|
|
|
|
|
|
+ ' @$(ECHO) LCL Unit dir.....','.... $(LCLUNITDIR)'#010+
|
|
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
|
|
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
|
|
' @$(ECHO)'#010
|
|
' @$(ECHO)'#010
|
|
);
|
|
);
|