* reinserted lost diff of rev 1.30

  * distclean target

utils/fpcmake.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..119] of string[240]=(
+const fpcmakeini : array[0..120] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..119,1..240] of char=(
+const fpcmakeini : array[0..120,1..240] of char=(
 {$endif Delphi}
   ';'#010+
   '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@@ -706,8 +706,6 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '# Redirection'#010+
   '#####################################################################'#010+
   #010,
-  '# Release ? Then force OPT and don'#039't use extra opts via commandlin'+
-  'e'#010+
   'ifndef REDIRFILE'#010+
   'REDIRFILE=log'#010+
   'endif'#010+
@@ -718,18 +716,19 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'endif'#010+
   '# set the verbosity to max'#010+
   'override FPCOPT+=-va'#010+
-  'override REDIR:= >> $(R','EDIRFILE)'#010+
+  'override REDIR:= >> $(REDIRFILE)'#010+
   'endif'#010+
   #010+
   '[command_begin]'#010+
-  '#####################################################################'#010+
+  '###################################','#################################'+
+  '#'#010+
   '# Compiler Command Line'#010+
   '#####################################################################'#010+
   #010+
-  '# Load commandline OPTDEF and add FPC_CPU ','define'#010+
+  '# Load commandline OPTDEF and add FPC_CPU define'#010+
   'override FPCOPTDEF:=-d$(CPU_TARGET)'#010+
   #010+
-  '# Load commandline OPT and add target and unit dir to be sure'#010+
+  '# Load commandline OPT a','nd add target and unit dir to be sure'#010+
   'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
   'override FPCOPT+=-T$(OS_TARGET)'#010+
   'endif'#010+
@@ -737,12 +736,12 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '[command_needopt]'#010+
   'ifdef NEEDOPT'#010+
   'override FPCOPT+=$(NEEDOPT)'#010+
-  'e','ndif'#010+
+  'endif'#010+
   #010+
   #010+
   '[command_needunit]'#010+
   'ifdef NEEDUNITDIR'#010+
-  'override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))'#010+
+  'override FPCOPT+=$(addpr','efix -Fu,$(NEEDUNITDIR))'#010+
   'endif'#010+
   #010+
   #010+
@@ -754,13 +753,13 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   '[command_needlib]'#010+
   'ifdef NEEDLIBDIR'#010+
-  'override FPCOPT+=$(addprefix -','Fl,$(NEEDLIBDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fl,$(NEEDLIBDIR))'#010+
   'endif'#010+
   #010+
   #010+
   '[command_needobj]'#010+
   'ifdef NEEDOBJDIR'#010+
-  'override FPCOPT+=$(addprefix -Fo,$(NEEDOBJDIR))'#010+
+  'overrid','e FPCOPT+=$(addprefix -Fo,$(NEEDOBJDIR))'#010+
   'endif'#010+
   #010+
   #010+
@@ -770,11 +769,11 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'endif'#010+
   #010+
   '[command_gcclib]'#010+
-  '# Add GCC lib pa','th if asked'#010+
+  '# Add GCC lib path if asked'#010+
   'ifdef GCCLIBDIR'#010+
   'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
   'endif'#010+
-  #010+
+  #010,
   '[command_otherlib]'#010+
   '# Add Other dirs path if asked'#010+
   'ifdef OTHERLIBDIR'#010+
@@ -784,11 +783,11 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '[command_target]'#010+
   '# Target dirs'#010+
   'ifdef TARGETDIR'#010+
-  'o','verride FPCOPT+=-FE$(TARGETDIR)'#010+
+  'override FPCOPT+=-FE$(TARGETDIR)'#010+
   'endif'#010+
   #010+
   '[command_unittarget]'#010+
-  'ifdef UNITTARGETDIR'#010+
+  'ifdef UN','ITTARGETDIR'#010+
   'override FPCOPT+=-FU$(UNITTARGETDIR)'#010+
   'endif'#010+
   #010+
@@ -800,22 +799,27 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   '# Smartlinking'#010+
   'ifdef CREATESMART'#010+
-  'override F','PCOPT+=-XX'#010+
+  'override FPCOPT+=-XX'#010+
   'endif'#010+
   #010+
   '# Debug'#010+
   'ifdef DEBUG'#010+
   'override FPCOPT+=-g -dDEBUG'#010+
-  'endif'#010+
+  'en','dif'#010+
   #010+
   '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
+  '# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+
   'ifdef RELEASE'#010+
+  'ifeq ($(FPC_VERSION),0.99.12)'#010+
+  'override FPCOPT+=-Xs -OGp3 -n'#010+
+  'else'#010+
   'override FPCOPT+=-Xs -OG2p3 -n'#010+
+  'e','ndif'#010+
   'endif'#010+
   #010+
   '# Verbose settings (warning,note,info)'#010+
   'ifdef VERBOSE'#010+
-  'ove','rride FPCOPT+=-vwni'#010+
+  'override FPCOPT+=-vwni'#010+
   'endif'#010+
   #010+
   '# Add commandline options'#010+
@@ -826,10 +830,10 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
   'endif'#010+
   'ifdef LIBDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
+  'o','verride FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
   'endif'#010+
   'ifdef OBJDIR'#010+
-  'overri','de FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
   'endif'#010+
   'ifdef INCDIR'#010+
   'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
@@ -837,12 +841,12 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   '# Add defines from FPCOPTDEF to FPCOPT'#010+
   'ifdef FPCOPTDEF'#010+
-  'override FPCOPT+=$(FPCOPTDEF)'#010+
+  'override ','FPCOPT+=$(FPCOPTDEF)'#010+
   'endif'#010+
   #010+
   '# Error file ?'#010+
   'ifdef ERRORFILE'#010+
-  'override ','FPCOPT+=-Fr$(ERRORFILE)'#010+
+  'override FPCOPT+=-Fr$(ERRORFILE)'#010+
   'endif'#010+
   #010+
   '# Was a config file specified ?'#010+
@@ -852,30 +856,30 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   #010+
   '[command_win32file]'#010+
-  '# For win32 the options are passed using the file fpcext.cmd'#010+
+  '# For win32 the options are passed usi','ng the file fpcext.cmd'#010+
   'ifndef FPCEXTFILE'#010+
   'FPCEXTFILE=fpcext.cmd'#010+
-  'endif',#010+
+  'endif'#010+
   'ifeq ($(OS_SOURCE),win32)'#010+
   'override TMPVAR:=$(shell "$(DEL) $(FPCEXTFILE)")'#010+
   'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+
   'PCEXTFILE)"))'#010+
-  'override FPCOPT:=@$(FPCEXTFILE)'#010+
+  'override FPC','OPT:=@$(FPCEXTFILE)'#010+
   'endif'#010+
   #010+
   '[command_win32env]'#010+
-  '# For win32 the option','s are passed using the environment FPCEXTCMD'#010+
+  '# For win32 the options are passed using the environment FPCEXTCMD'#010+
   'ifeq ($(OS_SOURCE),win32)'#010+
   'override FPCEXTCMD:=$(FPCOPT)'#010+
   'override FPCOPT:=!FPCEXTCMD'#010+
   'export FPCEXTCMD'#010+
   'endif'#010+
   #010+
-  '[command_compiler]'#010+
+  '[command_compiler]'#010,
   '# Compiler commandline'#010+
   'override COMPILER:=$(FPC) $(FPCOPT)'#010+
   #010+
-  '# also c','all ppas if with command option -s'#010+
+  '# also call ppas if with command option -s'#010+
   'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
   'EXECPPAS='#010+
   'else'#010+
@@ -884,35 +888,36 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   #010+
   '[standardrules]'#010+
-  '#####################################################################'#010+
-  '# Standard rules'#010+
-  '######################','##############################################'+
+  '#########################################','###########################'+
   '#'#010+
+  '# Standard rules'#010+
+  '#####################################################################'#010+
   #010+
   '[packagedependrules]'#010+
   '#####################################################################'#010+
   '# Package depends'#010+
-  '#####################################################################'#010+
+  '##############','######################################################'+
+  '#'#010+
   #010+
   #010+
-  '[loaderrul','es]'#010+
+  '[loaderrules]'#010+
   '#####################################################################'#010+
   '# Loaders'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_loaders'#010+
+  '.PHONY: fpc_loade','rs'#010+
   #010+
   '%$(OEXT): %$(LOADEREXT)'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
   #010+
-  'override ','ALLTARGET+=fpc_loaders'#010+
+  'override ALLTARGET+=fpc_loaders'#010+
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
-  'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
+  'override LOA','DEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
   #010+
-  'fpc_loaders: $(LOA','DEROFILES)'#010+
+  'fpc_loaders: $(LOADEROFILES)'#010+
   #010+
   'fpc_loaders_clean:'#010+
   '        -$(DEL) $(LOADEROFILES)'#010+
@@ -921,40 +926,40 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+
   ')'#010+
   #010+
-  'fpc_loaders_install:'#010+
+  'fpc_loader','s_install:'#010+
   '        $(MKDIR) $(UNITINSTALLDIR)'#010+
-  '        $(INSTALL) $(L','OADEROFILES) $(UNITINSTALLDIR)'#010+
+  '        $(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)'#010+
   #010+
   #010+
   '[unitrules]'#010+
   '#####################################################################'#010+
   '# Units'#010+
-  '#####################################################################'#010+
+  '#################################################','###################'+
+  '#'#010+
   #010+
   '.PHONY: fpc_units'#010+
   #010+
-  'override ALLTARGET+=fpc_uni','ts'#010+
+  'override ALLTARGET+=fpc_units'#010+
   #010+
   'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+
   'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
   #010+
-  'fpc_units: $(UNITPPUFILES)'#010+
+  'fpc_units: $(UNITPPUFILES',')'#010+
   #010+
   #010+
   #010+
   '[exerules]'#010+
-  '####################################################','################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Exes'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_exes'#010+
   #010+
   'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))'#010+
-  'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
+  'ove','rride EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
   #010+
-  'override ALLTARG','ET+=fpc_exes'#010+
+  'override ALLTARGET+=fpc_exes'#010+
   'override INSTALLEXEFILES+=$(EXEFILES)'#010+
   'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
   #010+
@@ -962,10 +967,10 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   #010+
   '[rstrules]'#010+
-  '#####################################################################'#010+
-  '# Resource strings'#010+
-  '###############','#####################################################'+
+  '####################################','################################'+
   '#'#010+
+  '# Resource strings'#010+
+  '#####################################################################'#010+
   #010+
   'override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+
   #010+
@@ -973,16 +978,17 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   #010+
   '[examplerules]'#010+
-  '#####################################################################'#010+
-  '# Exa','mples'#010+
+  '#######','#############################################################'+
+  '#'#010+
+  '# Examples'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_examples fpc_test'#010+
   #010+
-  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
+  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010,
   'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
   #010+
-  'over','ride CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
+  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
   #010+
   'fpc_examples: all $(EXAMPLEFILES)'#010+
   #010+
@@ -990,33 +996,33 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   #010+
   '[compilerules]'#010+
-  '#####################################################################'#010+
-  '# General compile rules'#010+
-  '#####################','###############################################'+
+  '###############################################','#####################'+
   '#'#010+
+  '# General compile rules'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_packages fpc_all fpc_debug'#010+
   #010+
   '$(FPCMADE): $(ALLTARGET)'#010+
   '        @$(ECHO) Compiled > $(FPCMADE)'#010+
   #010+
-  'fpc_packages: $(COMPILEPACKAGES)'#010+
+  'fpc_packages: $(C','OMPILEPACKAGES)'#010+
   #010+
   'fpc_all: fpc_packages $(FPCMADE)'#010+
   #010+
   'fpc_debug:'#010+
-  '      ','  $(MAKE) all DEBUG=1'#010+
+  '        $(MAKE) all DEBUG=1'#010+
   #010+
   '# General compile rules, available for both possible PASEXT'#010+
   #010+
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
   #010+
   '%$(PPUEXT): %.pp'#010+
-  '        $(COMPILER) $< $(REDIR)'#010+
+  '        $(COMPILER) $<',' $(REDIR)'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(PPUEXT): %.pas'#010+
-  '        $(COMPILER)',' $< $(REDIR)'#010+
+  '        $(COMPILER) $< $(REDIR)'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pp'#010+
@@ -1025,20 +1031,19 @@ const fpcmakeini : array[0..119,1..240] of char=(
   #010+
   '%$(EXEEXT): %.pas'#010+
   '        $(COMPILER) $< $(REDIR)'#010+
-  '        $(EXECPPAS)'#010+
+  '        $(EXECPPAS',')'#010+
   #010+
   #010+
   '[libraryrules]'#010+
-  '#################################################','###################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Library'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_smart fpc_shared'#010+
   #010+
-  '# Default sharedlib units are all unit objects'#010+
+  '# Default sharedlib units are all unit o','bjects'#010+
   'ifndef SHAREDLIBUNITOBJECTS'#010+
-  'SHAREDLIBUNITOBJECTS:=$(UNITOBJEC','TS)'#010+
+  'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+
   'endif'#010+
   #010+
   'fpc_smart:'#010+
@@ -1049,19 +1054,20 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'ifndef LIBNAME'#010+
   '        @$(ECHO) "LIBNAME not set"'#010+
   'else'#010+
-  '        $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
+  '        $(PPUMOVE)',' $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
   'endif'#010+
   'else'#010+
-  '        @$(ECHO) "S','hared Libraries not supported"'#010+
+  '        @$(ECHO) "Shared Libraries not supported"'#010+
   'endif'#010+
   #010+
   #010+
   '[installrules]'#010+
   '#####################################################################'#010+
   '# Install rules'#010+
-  '#####################################################################'#010+
+  '################################','####################################'+
+  '#'#010+
   #010+
-  '.PHONY: fpc_showinstall fpc_i','nstall'#010+
+  '.PHONY: fpc_showinstall fpc_install'#010+
   #010+
   'ifdef EXTRAINSTALLUNITS'#010+
   'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
@@ -1070,71 +1076,71 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'ifdef INSTALLPPUFILES'#010+
   'ifdef PPUFILES'#010+
   'ifdef inlinux'#010+
-  'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
-  'INSTALLPPULIB','FILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
+  'INSTALLPPULI','NKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
+  'INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
   'else'#010+
   'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
   'endif'#010+
   'else'#010+
-  'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
-  'FILES)))'#010+
+  'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPU','EXT),$(OEXT),$(INSTALLP'+
+  'PUFILES)))'#010+
   'endif'#010+
   'endif'#010+
   #010+
-  'fpc_showinstall: $(SH','OWINSTALLTARGET)'#010+
+  'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+
   'ifdef INSTALLEXEFILES'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
   'S))'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
-  '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
-  'ES))'#010+
-  'ifneq ($(INSTALLPPULINKF','ILES),)'#010+
+  '        @$(ECHO) -e $(addprefix',' "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUF'+
+  'ILES))'#010+
+  'ifneq ($(INSTALLPPULINKFILES),)'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
   'KFILES))'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
-  '        @$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBF'+
-  'ILES))'#010+
+  '        @$(ECHO) -e $(addprefix "\n"$(LIBINSTALL','DIR)/,$(INSTALLPPULI'+
+  'BFILES))'#010+
   'endif'#010+
   'endif'#010+
   'ifdef EXTRAINSTALLFILES'#010+
-  '   ','     @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTAL'+
-  'LFILES))'#010+
+  '        @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
+  'ILES))'#010+
   'endif'#010+
   #010+
   'fpc_install: $(INSTALLTARGET)'#010+
   '# Create UnitInstallFiles'#010+
   'ifdef INSTALLEXEFILES'#010+
-  '        $(MKDIR) $(BININSTALLDIR)'#010+
+  '        $(MKD','IR) $(BININSTALLDIR)'#010+
   '# Compress the exes if upx is defined'#010+
-  'ifdef UPX','PROG'#010+
+  'ifdef UPXPROG'#010+
   '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
   'endif'#010+
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(UNITINSTALLDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
-  'ifneq ($(INST','ALLPPULINKFILES),)'#010+
+  ' ','       $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
+  'ifneq ($(INSTALLPPULINKFILES),)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
   '        $(MKDIR) $(LIBINSTALLDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
+  '        $(INSTALL) $(I','NSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef EXTRAINSTALLFI','LES'#010+
+  'ifdef EXTRAINSTALLFILES'#010+
   '        $(MKDIR) $(DATAINSTALLDIR)'#010+
   '        $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
   'endif'#010+
   #010+
   #010+
   '[sourceinstallrules]'#010+
-  '#####################################################################'#010+
-  '# SourceInstall rules'#010+
-  '######################','##############################################'+
+  '##############################################','######################'+
   '#'#010+
+  '# SourceInstall rules'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_sourceinstall'#010+
   #010+
@@ -1143,19 +1149,19 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_sourceinstall: clean'#010+
-  '        $(MKDIR) $(SOURCEINSTALLDIR)'#010+
-  '        $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALL','DIR)'#010+
+  '        $(MKDIR) $(S','OURCEINSTALLDIR)'#010+
+  '        $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+
   #010+
   #010+
   '[zipinstallrules]'#010+
   '#####################################################################'#010+
   '# Zip'#010+
   '#####################################################################'#010+
-  #010+
+  #010,
   '.PHONY: fpc_zipinstall'#010+
   #010+
   '# Create suffix to add'#010+
-  'ifndef PACKAGESUFFIX'#010,
+  'ifndef PACKAGESUFFIX'#010+
   'PACKAGESUFFIX=$(OS_TARGET)'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
   'PACKAGESUFFIX=go32'#010+
@@ -1166,11 +1172,11 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'endif'#010+
   #010+
   '# Temporary path to pack a file'#010+
-  'ifndef PACKDIR'#010+
+  'ifnd','ef PACKDIR'#010+
   'ifndef inlinux'#010+
   'PACKDIR=$(BASEDIR)/pack_tmp'#010+
   'else'#010+
-  'PACKDIR=/','tmp/fpc-pack'#010+
+  'PACKDIR=/tmp/fpc-pack'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1179,12 +1185,12 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'ifdef PACKAGENAME'#010+
   'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)'#010+
   'endif'#010+
-  'endif'#010+
+  'endi','f'#010+
   #010+
   '# Use tar by default under linux'#010+
   'ifndef USEZIP'#010+
   'ifdef inlinux'#010+
-  'USET','AR=1'#010+
+  'USETAR=1'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1194,14 +1200,14 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '        @exit 1'#010+
   'else'#010+
   '        $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
-  'ifdef USETAR'#010+
+  'if','def USETAR'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
-  '        ','cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
-  '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
+  '        cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+
+  'IPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
   'else'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
-  '        cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
-  'ME)$(ZIPEXT) * ; cd',' $(BASEDIR)'#010+
+  '        cd $(PACKDIR)',' ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIP'+
+  'NAME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   'endif'#010+
@@ -1211,113 +1217,112 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '.PHONY:  fpc_zipsourceinstall'#010+
   #010+
   'fpc_zipsourceinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=s'+
-  'rc'#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGE','T=sourceinstall PACKAGESUFFIX'+
+  '=src'#010+
   #010+
   #010+
   '[cleanrules]'#010+
-  '###################','#################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Clean rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_clean fpc_cleanall'#010+
+  '.PHONY: fpc_clean fpc_cleanall fpc_d','istclean'#010+
   #010+
   'ifdef EXTRACLEANUNITS'#010+
-  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EX','TRACLEANUNITS))'#010+
+  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
   'ifdef PPUFILES'#010+
   'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
   'else'#010+
-  'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
-  'S)))'#010+
+  'CLEANPPULINKFILES:=$(wildcard $(subst ','$(PPUEXT),$(OEXT),$(CLEANPPUFI'+
+  'LES)))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   'fpc_clean: $(CLEANTARGET)'#010+
-  'ifdef ','CLEANEXEFILES'#010+
+  'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
   'endif'#010+
   'ifneq ($(CLEANPPULINKFILES),)'#010+
-  '        -$(DEL) $(CLEANPPULINKFILES)'#010+
+  '        -$(DEL) ','$(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
   '        -$(DEL) $(CLEANRSTFILES)'#010+
-  'en','dif'#010+
+  'endif'#010+
   'ifdef EXTRACLEANFILES'#010+
   '        -$(DEL) $(EXTRACLEANFILES)'#010+
   'endif'#010+
   '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
   #010+
   #010+
+  'fpc_distclean: fpc_','clean'#010+
+  #010+
   'fpc_cleanall: $(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
-  '        -$(DE','L) *$(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)'+
-  #010+
+  '        -','$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+
+  'E)'#010+
   #010+
   #010+
   '[dependrules]'#010+
-  '##############################','######################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Depend rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_depend'#010+
+  '.PHONY',': fpc_depend'#010+
   #010+
   'fpc_depend:'#010+
   '        $(PPDEP) $(UNITOBJECTS)'#010+
   #010+
   #010+
   '[inforules]'#010+
-  '####################################','################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Info rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+
-  'nfo \'#010+
+  '.PHONY: fpc_in','fo fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_instal'+
+  'linfo \'#010+
   '        fpc_dirinfo'#010+
   #010+
   'fpc_info: $(INFOTARGET)'#010+
-  #010,
+  #010+
   '[info_cfg]'#010+
   'fpc_infocfg:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  FPC....... $(FPC)'#010+
+  '        @$(ECHO)  FPC....... $(','FPC)'#010+
   '        @$(ECHO)  Version... $(FPC_VERSION)'#010+
   '        @$(ECHO)  CPU....... $(CPU_TARGET)'#010+
-  '        @$(ECHO)','  Source.... $(OS_SOURCE)'#010+
+  '        @$(ECHO)  Source.... $(OS_SOURCE)'#010+
   '        @$(ECHO)  Target.... $(OS_TARGET)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[info_dirs]'#010+
   'fpc_infodirs:'#010+
   'ifdef inlinux'#010+
-  '        @$(ECHO)'#010+
+  '      ','  @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
   'ifdef NEEDGCCLIB'#010+
-  '        @$(ECHO)  GCC li','brary is needed.'#010+
+  '        @$(ECHO)  GCC library is needed.'#010+
   'endif'#010+
   'ifdef NEEDOTHERLIB'#010+
   '        @$(ECHO)  Other library is needed.'#010+
   'endif'#010+
-  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
+  '        @$(ECHO)  Basedir......... $(BASE','DIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
-  '        @$(ECHO)  Other library... $(O','THERLIBDIR)'#010+
+  '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)'#010+
   'endif'#010+
   #010+
@@ -1325,23 +1330,23 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'fpc_infotools:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Tools info =='#010+
-  '        @$(ECHO)'#010+
+  '        @$(ECHO)',#010+
   '        @$(ECHO)  Pwd....... $(PWD)'#010+
   '        @$(ECHO)  Echo...... $(ECHO)'#010+
   'ifdef PPDEP'#010+
-  '        @$(ECHO)  PPDe','p..... $(PPDEP)'#010+
+  '        @$(ECHO)  PPDep..... $(PPDEP)'#010+
   'endif'#010+
   'ifdef PPUMOVE'#010+
   '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
   'endif'#010+
   'ifdef PPUFILES'#010+
-  '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
+  '        @$(ECHO)  PPUFiles.. $(PPUF','ILES)'#010+
   'endif'#010+
   'ifdef DATA2INC'#010+
   '        @$(ECHO)  Data2Inc.. $(DATA2INC)'#010+
   'endif'#010+
   'ifdef SED'#010+
-  '        @$(ECHO)  Sed...','.... $(SED)'#010+
+  '        @$(ECHO)  Sed....... $(SED)'#010+
   'endif'#010+
   'ifdef DATE'#010+
   '        @$(ECHO)  Date...... $(DATE)'#010+
@@ -1349,13 +1354,13 @@ const fpcmakeini : array[0..119,1..240] of char=(
   'ifdef DIFF'#010+
   '        @$(ECHO)  Diff...... $(DIFF)'#010+
   'endif'#010+
-  'ifdef CMP'#010+
+  'ifdef ','CMP'#010+
   '        @$(ECHO)  Cmp....... $(CMP)'#010+
   'endif'#010+
   'ifdef UPXPROG'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
   'endif'#010+
-  'if','def ZIPPROG'#010+
+  'ifdef ZIPPROG'#010+
   '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
   'endif'#010+
   '        @$(ECHO)'#010+
@@ -1363,64 +1368,65 @@ const fpcmakeini : array[0..119,1..240] of char=(
   '[info_objects]'#010+
   'fpc_infoobjects:'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Object info =='#010+
+  '       ',' @$(ECHO)  == Object info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)'#010+
-  '        ','@$(ECHO)  UnitObjects....... $(UNITOBJECTS)'#010+
+  '        @$(ECHO)  UnitObjects....... $(UNITOBJECTS)'#010+
   '        @$(ECHO)  ExeObjects........ $(EXEOBJECTS)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+
+  '        @$(ECHO)  Ex','traCleanUnits... $(EXTRACLEANUNITS)'#010+
   '        @$(ECHO)  ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
-  '        @$(ECHO)',#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
   '        @$(ECHO)  ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
-  '        @$(ECHO)'#010+
+  '        @$(ECHO',')'#010+
   #010+
   '[info_install]'#010+
   'fpc_infoinstall:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Install info =='#010+
   '        @$(ECHO)'#010+
-  'if','def DATE'#010+
+  'ifdef DATE'#010+
   '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
   'endif'#010+
   'ifdef PACKAGEPREFIX'#010+
-  '        @$(ECHO)  PackagePrefix........ $(PACKAGEPREFIX)'#010+
+  '        @$(ECHO)  PackagePrefix........ $(PACK','AGEPREFIX)'#010+
   'endif'#010+
   'ifdef PACKAGENAME'#010+
   '        @$(ECHO)  PackageName.......... $(PACKAGENAME)'#010+
   'endif'#010+
-  '        @$(E','CHO)  PackageSuffix........ $(PACKAGESUFFIX)'#010+
+  '        @$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  BaseInstallDir....... $(BASEINSTALLDIR)'#010+
-  '        @$(ECHO)  BinInstallDir........ $(BININSTALLDIR)'#010+
+  '        @$(E','CHO)  BinInstallDir........ $(BININSTALLDIR)'#010+
   '        @$(ECHO)  LibInstallDir........ $(LIBINSTALLDIR)'#010+
-  '      ','  @$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)'#010+
+  '        @$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)'#010+
   '        @$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
-  '        @$(ECHO)  DocInstallDir........ $(DOCINSTALLDIR)'#010+
+  '        @$(ECHO)  Do','cInstallDir........ $(DOCINSTALLDIR)'#010+
   '        @$(ECHO)  DataInstallDir....... $(DATAINSTALLDIR)'#010+
-  '        @$(EC','HO)'#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  DestZipDir........... $(DESTZIPDIR)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   #010+
-  '[directorytargets]'#010+
+  '[dire','ctorytargets]'#010+
   '#####################################################################'#010+
   '# Directories'#010+
-  '##########','##########################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   #010+
   '[localmakefile]'#010+
-  '#####################################################################'#010+
+  '#######################################################','#############'+
+  '#'#010+
   '# Local Makefile'#010+
   '#####################################################################'#010+
   #010+
-  'ifneq',' ($(wildcard fpcmake.loc),)'#010+
+  'ifneq ($(wildcard fpcmake.loc),)'#010+
   'include fpcmake.loc'#010+
   'endif'#010+
   #010+
   '[userrules]'#010+
-  '#####################################################################'#010+
+  '#################################################################','###'+
+  '#'#010+
   '# Users rules'#010+
   '#####################################################################'#010+
   #010+

utils/fpcmake.ini

@@ -676,7 +676,6 @@ export OTHERLIBDIR
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -778,9 +777,14 @@ override FPCOPT+=-g -dDEBUG
 endif
 
 # Release mode (strip, optimize and don't load ppc386.cfg)
+# 0.99.12b has a bug in the optimizer so don't use it by default
 ifdef RELEASE
+ifeq ($(FPC_VERSION),0.99.12)
+override FPCOPT+=-Xs -OGp3 -n
+else
 override FPCOPT+=-Xs -OG2p3 -n
 endif
+endif
 
 # Verbose settings (warning,note,info)
 ifdef VERBOSE
@@ -1172,7 +1176,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1204,6 +1208,8 @@ ifdef EXTRACLEANFILES
 endif
         -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
         -$(DEL) $(CLEANEXEFILES)

utils/fpcmake.pp

@@ -64,13 +64,13 @@ const
     'linux','go32v2','win32','os2'
   );
 
-  rules=15;
+  rules=16;
   rulestr : array[1..rules] of string=(
     'all','debug',
     'examples','test',
     'smart','shared',
     'showinstall','install','sourceinstall','zipinstall','zipsourceinstall',
-    'clean','cleanall',
+    'clean','distclean','cleanall',
     'require','info'
   );
 
@@ -79,7 +79,7 @@ const
     sec_examples,sec_examples,
     sec_libs,sec_libs,
     sec_install,sec_install,sec_sourceinstall,sec_zipinstall,sec_zipinstall,
-    sec_clean,sec_clean,
+    sec_clean,sec_clean,sec_clean,
     sec_require,sec_info
   );
 
@@ -88,7 +88,7 @@ const
     bic_build,bic_build,
     bic_build,bic_build,
     bic_install,bic_install,bic_install,bic_zipinstall,bic_zipinstall,
-    bic_clean,bic_clean,
+    bic_clean,bic_clean,bic_clean,
     bic_none,bic_none
   );
 
@@ -97,7 +97,7 @@ const
     true,true,
     true,true,
     true,true,true,false,false,
-    true,true,
+    true,true,true,
     true,false
   );
 
@@ -1300,7 +1300,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.28  2000-01-26 21:16:26  peter
+  Revision 1.29  2000-01-28 12:10:46  peter
+    * reinserted lost diff of rev 1.30
+    * distclean target
+
+  Revision 1.28  2000/01/26 21:16:26  peter
     * SMARTLINK=1 split into CREATESMART=1 and LINKSMART=1
     * FPCDIR checks enhanced