* regenerated

api/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -412,7 +413,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -454,13 +454,15 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: $(addsuffix _clean,$(OS_TARGET))
 
+distclean: $(addsuffix _distclean,$(OS_TARGET))
+
 cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
 require: $(addsuffix _require,$(OS_TARGET))
 
 info: $(addsuffix _info,$(OS_TARGET))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
 
 #####################################################################
 # SourceInstall rules
@@ -550,7 +552,7 @@ OBJECTDIRTEST=1
 # Dir go32v2
 
 ifdef OBJECTDIRGO32V2
-.PHONY:  go32v2_all go32v2_debug go32v2_examples go32v2_test go32v2_smart go32v2_shared go32v2_showinstall go32v2_install go32v2_sourceinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_clean go32v2_cleanall go32v2_require go32v2_info
+.PHONY:  go32v2_all go32v2_debug go32v2_examples go32v2_test go32v2_smart go32v2_shared go32v2_showinstall go32v2_install go32v2_sourceinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_require go32v2_info
 
 go32v2_all:
 	$(MAKE) -C go32v2 all
@@ -588,6 +590,9 @@ go32v2_zipsourceinstall:
 go32v2_clean:
 	$(MAKE) -C go32v2 clean
 
+go32v2_distclean:
+	$(MAKE) -C go32v2 distclean
+
 go32v2_cleanall:
 	$(MAKE) -C go32v2 cleanall
 
@@ -601,7 +606,7 @@ endif
 # Dir linux
 
 ifdef OBJECTDIRLINUX
-.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_cleanall linux_require linux_info
+.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_distclean linux_cleanall linux_require linux_info
 
 linux_all:
 	$(MAKE) -C linux all
@@ -639,6 +644,9 @@ linux_zipsourceinstall:
 linux_clean:
 	$(MAKE) -C linux clean
 
+linux_distclean:
+	$(MAKE) -C linux distclean
+
 linux_cleanall:
 	$(MAKE) -C linux cleanall
 
@@ -652,7 +660,7 @@ endif
 # Dir win32
 
 ifdef OBJECTDIRWIN32
-.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_cleanall win32_require win32_info
+.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_distclean win32_cleanall win32_require win32_info
 
 win32_all:
 	$(MAKE) -C win32 all
@@ -690,6 +698,9 @@ win32_zipsourceinstall:
 win32_clean:
 	$(MAKE) -C win32 clean
 
+win32_distclean:
+	$(MAKE) -C win32 distclean
+
 win32_cleanall:
 	$(MAKE) -C win32 cleanall
 
@@ -703,7 +714,7 @@ endif
 # Dir os2
 
 ifdef OBJECTDIROS2
-.PHONY:  os2_all os2_debug os2_examples os2_test os2_smart os2_shared os2_showinstall os2_install os2_sourceinstall os2_zipinstall os2_zipsourceinstall os2_clean os2_cleanall os2_require os2_info
+.PHONY:  os2_all os2_debug os2_examples os2_test os2_smart os2_shared os2_showinstall os2_install os2_sourceinstall os2_zipinstall os2_zipsourceinstall os2_clean os2_distclean os2_cleanall os2_require os2_info
 
 os2_all:
 	$(MAKE) -C os2 all
@@ -741,6 +752,9 @@ os2_zipsourceinstall:
 os2_clean:
 	$(MAKE) -C os2 clean
 
+os2_distclean:
+	$(MAKE) -C os2 distclean
+
 os2_cleanall:
 	$(MAKE) -C os2 cleanall
 
@@ -754,7 +768,7 @@ endif
 # Dir test
 
 ifdef OBJECTDIRTEST
-.PHONY:  test_all test_debug test_examples test_test test_smart test_shared test_showinstall test_install test_sourceinstall test_zipinstall test_zipsourceinstall test_clean test_cleanall test_require test_info
+.PHONY:  test_all test_debug test_examples test_test test_smart test_shared test_showinstall test_install test_sourceinstall test_zipinstall test_zipsourceinstall test_clean test_distclean test_cleanall test_require test_info
 
 test_all:
 	$(MAKE) -C test all
@@ -792,6 +806,9 @@ test_zipsourceinstall:
 test_clean:
 	$(MAKE) -C test clean
 
+test_distclean:
+	$(MAKE) -C test distclean
+
 test_cleanall:
 	$(MAKE) -C test cleanall
 

api/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -163,14 +164,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -641,7 +642,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -697,9 +697,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
@@ -783,11 +788,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1024,7 +1031,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1056,6 +1063,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

api/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -163,14 +164,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -641,7 +642,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -697,9 +697,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
@@ -783,11 +788,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1024,7 +1031,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1056,6 +1063,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

api/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -163,14 +164,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -641,7 +642,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -697,9 +697,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
@@ -783,11 +788,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1024,7 +1031,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1056,6 +1063,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: info
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -509,7 +510,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -551,11 +551,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: $(addsuffix _clean,$(DIROBJECTS))
 
+distclean: $(addsuffix _distclean,$(DIROBJECTS))
+
 cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 #####################################################################
 # Zip
@@ -629,7 +631,7 @@ OBJECTDIRIDE=1
 # Dir compiler
 
 ifdef OBJECTDIRCOMPILER
-.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_cleanall compiler_require compiler_info
+.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_distclean compiler_cleanall compiler_require compiler_info
 
 compiler_all:
 	$(MAKE) -C compiler all
@@ -667,6 +669,9 @@ compiler_zipsourceinstall:
 compiler_clean:
 	$(MAKE) -C compiler clean
 
+compiler_distclean:
+	$(MAKE) -C compiler distclean
+
 compiler_cleanall:
 	$(MAKE) -C compiler cleanall
 
@@ -680,7 +685,7 @@ endif
 # Dir rtl
 
 ifdef OBJECTDIRRTL
-.PHONY:  rtl_all rtl_debug rtl_examples rtl_test rtl_smart rtl_shared rtl_showinstall rtl_install rtl_sourceinstall rtl_zipinstall rtl_zipsourceinstall rtl_clean rtl_cleanall rtl_require rtl_info
+.PHONY:  rtl_all rtl_debug rtl_examples rtl_test rtl_smart rtl_shared rtl_showinstall rtl_install rtl_sourceinstall rtl_zipinstall rtl_zipsourceinstall rtl_clean rtl_distclean rtl_cleanall rtl_require rtl_info
 
 rtl_all:
 	$(MAKE) -C rtl all
@@ -718,6 +723,9 @@ rtl_zipsourceinstall:
 rtl_clean:
 	$(MAKE) -C rtl clean
 
+rtl_distclean:
+	$(MAKE) -C rtl distclean
+
 rtl_cleanall:
 	$(MAKE) -C rtl cleanall
 
@@ -731,7 +739,7 @@ endif
 # Dir utils
 
 ifdef OBJECTDIRUTILS
-.PHONY:  utils_all utils_debug utils_examples utils_test utils_smart utils_shared utils_showinstall utils_install utils_sourceinstall utils_zipinstall utils_zipsourceinstall utils_clean utils_cleanall utils_require utils_info
+.PHONY:  utils_all utils_debug utils_examples utils_test utils_smart utils_shared utils_showinstall utils_install utils_sourceinstall utils_zipinstall utils_zipsourceinstall utils_clean utils_distclean utils_cleanall utils_require utils_info
 
 utils_all:
 	$(MAKE) -C utils all
@@ -769,6 +777,9 @@ utils_zipsourceinstall:
 utils_clean:
 	$(MAKE) -C utils clean
 
+utils_distclean:
+	$(MAKE) -C utils distclean
+
 utils_cleanall:
 	$(MAKE) -C utils cleanall
 
@@ -782,7 +793,7 @@ endif
 # Dir fcl
 
 ifdef OBJECTDIRFCL
-.PHONY:  fcl_all fcl_debug fcl_examples fcl_test fcl_smart fcl_shared fcl_showinstall fcl_install fcl_sourceinstall fcl_zipinstall fcl_zipsourceinstall fcl_clean fcl_cleanall fcl_require fcl_info
+.PHONY:  fcl_all fcl_debug fcl_examples fcl_test fcl_smart fcl_shared fcl_showinstall fcl_install fcl_sourceinstall fcl_zipinstall fcl_zipsourceinstall fcl_clean fcl_distclean fcl_cleanall fcl_require fcl_info
 
 fcl_all:
 	$(MAKE) -C fcl all
@@ -820,6 +831,9 @@ fcl_zipsourceinstall:
 fcl_clean:
 	$(MAKE) -C fcl clean
 
+fcl_distclean:
+	$(MAKE) -C fcl distclean
+
 fcl_cleanall:
 	$(MAKE) -C fcl cleanall
 
@@ -833,7 +847,7 @@ endif
 # Dir api
 
 ifdef OBJECTDIRAPI
-.PHONY:  api_all api_debug api_examples api_test api_smart api_shared api_showinstall api_install api_sourceinstall api_zipinstall api_zipsourceinstall api_clean api_cleanall api_require api_info
+.PHONY:  api_all api_debug api_examples api_test api_smart api_shared api_showinstall api_install api_sourceinstall api_zipinstall api_zipsourceinstall api_clean api_distclean api_cleanall api_require api_info
 
 api_all:
 	$(MAKE) -C api all
@@ -871,6 +885,9 @@ api_zipsourceinstall:
 api_clean:
 	$(MAKE) -C api clean
 
+api_distclean:
+	$(MAKE) -C api distclean
+
 api_cleanall:
 	$(MAKE) -C api cleanall
 
@@ -884,7 +901,7 @@ endif
 # Dir fv
 
 ifdef OBJECTDIRFV
-.PHONY:  fv_all fv_debug fv_examples fv_test fv_smart fv_shared fv_showinstall fv_install fv_sourceinstall fv_zipinstall fv_zipsourceinstall fv_clean fv_cleanall fv_require fv_info
+.PHONY:  fv_all fv_debug fv_examples fv_test fv_smart fv_shared fv_showinstall fv_install fv_sourceinstall fv_zipinstall fv_zipsourceinstall fv_clean fv_distclean fv_cleanall fv_require fv_info
 
 fv_all:
 	$(MAKE) -C fv all
@@ -922,6 +939,9 @@ fv_zipsourceinstall:
 fv_clean:
 	$(MAKE) -C fv clean
 
+fv_distclean:
+	$(MAKE) -C fv distclean
+
 fv_cleanall:
 	$(MAKE) -C fv cleanall
 
@@ -935,7 +955,7 @@ endif
 # Dir packages
 
 ifdef OBJECTDIRPACKAGES
-.PHONY:  packages_all packages_debug packages_examples packages_test packages_smart packages_shared packages_showinstall packages_install packages_sourceinstall packages_zipinstall packages_zipsourceinstall packages_clean packages_cleanall packages_require packages_info
+.PHONY:  packages_all packages_debug packages_examples packages_test packages_smart packages_shared packages_showinstall packages_install packages_sourceinstall packages_zipinstall packages_zipsourceinstall packages_clean packages_distclean packages_cleanall packages_require packages_info
 
 packages_all:
 	$(MAKE) -C packages all
@@ -973,6 +993,9 @@ packages_zipsourceinstall:
 packages_clean:
 	$(MAKE) -C packages clean
 
+packages_distclean:
+	$(MAKE) -C packages distclean
+
 packages_cleanall:
 	$(MAKE) -C packages cleanall
 
@@ -986,7 +1009,7 @@ endif
 # Dir ide
 
 ifdef OBJECTDIRIDE
-.PHONY:  ide_all ide_debug ide_examples ide_test ide_smart ide_shared ide_showinstall ide_install ide_sourceinstall ide_zipinstall ide_zipsourceinstall ide_clean ide_cleanall ide_require ide_info
+.PHONY:  ide_all ide_debug ide_examples ide_test ide_smart ide_shared ide_showinstall ide_install ide_sourceinstall ide_zipinstall ide_zipsourceinstall ide_clean ide_distclean ide_cleanall ide_require ide_info
 
 ide_all:
 	$(MAKE) -C ide all
@@ -1024,6 +1047,9 @@ ide_zipsourceinstall:
 ide_clean:
 	$(MAKE) -C ide clean
 
+ide_distclean:
+	$(MAKE) -C ide distclean
+
 ide_cleanall:
 	$(MAKE) -C ide cleanall
 
@@ -1074,9 +1100,6 @@ info:
 # Compiler
 #######################################
 
-compiler_clean:
-	$(MAKE) -C compiler distclean
-
 compiler_cycle:
 	$(MAKE) -C compiler cycle
 

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -195,14 +196,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -737,7 +738,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -797,9 +797,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
@@ -1085,7 +1090,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1117,6 +1122,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1384,6 +1391,8 @@ cvstest:
 # Installation
 #####################################################################
 
+.PHONY: quickinstall install installsym
+
 MSGINSTALLDIR=$(BASEINSTALLDIR)/msg
 
 # This will only install the ppc386.exe, not the message files etc.
@@ -1399,7 +1408,7 @@ endif
 	$(INSTALLEXE) $(EXENAME) $(BININSTALLDIR)
 endif
 
-installlib: quickinstall
+install: quickinstall
 ifdef inlinux
 	$(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(BASEINSTALLDIR)/samplecfg
 endif
@@ -1407,7 +1416,7 @@ endif
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 
 # this also installs the link /usr/bin/ppc386. The .deb does that later
-install: installlib
+installsymlink: install
 ifdef inlinux
 	$(MKDIR) $(BININSTALLDIR)
 	ln -sf $(BASEINSTALLDIR)/ppc386 $(BININSTALLDIR)/ppc386

compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -210,14 +211,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -666,7 +667,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -731,9 +731,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
@@ -1019,7 +1024,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1051,6 +1056,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -412,7 +413,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -454,13 +454,15 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: $(addsuffix _clean,$(OS_TARGET))
 
+distclean: $(addsuffix _distclean,$(OS_TARGET))
+
 cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
 require: $(addsuffix _require,$(OS_TARGET))
 
 info: $(addsuffix _info,$(OS_TARGET))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
 
 #####################################################################
 # SourceInstall rules
@@ -550,7 +552,7 @@ OBJECTDIRTESTS=1
 # Dir go32v2
 
 ifdef OBJECTDIRGO32V2
-.PHONY:  go32v2_all go32v2_debug go32v2_examples go32v2_test go32v2_smart go32v2_shared go32v2_showinstall go32v2_install go32v2_sourceinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_clean go32v2_cleanall go32v2_require go32v2_info
+.PHONY:  go32v2_all go32v2_debug go32v2_examples go32v2_test go32v2_smart go32v2_shared go32v2_showinstall go32v2_install go32v2_sourceinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_require go32v2_info
 
 go32v2_all:
 	$(MAKE) -C go32v2 all
@@ -588,6 +590,9 @@ go32v2_zipsourceinstall:
 go32v2_clean:
 	$(MAKE) -C go32v2 clean
 
+go32v2_distclean:
+	$(MAKE) -C go32v2 distclean
+
 go32v2_cleanall:
 	$(MAKE) -C go32v2 cleanall
 
@@ -601,7 +606,7 @@ endif
 # Dir linux
 
 ifdef OBJECTDIRLINUX
-.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_cleanall linux_require linux_info
+.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_distclean linux_cleanall linux_require linux_info
 
 linux_all:
 	$(MAKE) -C linux all
@@ -639,6 +644,9 @@ linux_zipsourceinstall:
 linux_clean:
 	$(MAKE) -C linux clean
 
+linux_distclean:
+	$(MAKE) -C linux distclean
+
 linux_cleanall:
 	$(MAKE) -C linux cleanall
 
@@ -652,7 +660,7 @@ endif
 # Dir win32
 
 ifdef OBJECTDIRWIN32
-.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_cleanall win32_require win32_info
+.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_distclean win32_cleanall win32_require win32_info
 
 win32_all:
 	$(MAKE) -C win32 all
@@ -690,6 +698,9 @@ win32_zipsourceinstall:
 win32_clean:
 	$(MAKE) -C win32 clean
 
+win32_distclean:
+	$(MAKE) -C win32 distclean
+
 win32_cleanall:
 	$(MAKE) -C win32 cleanall
 
@@ -703,7 +714,7 @@ endif
 # Dir os2
 
 ifdef OBJECTDIROS2
-.PHONY:  os2_all os2_debug os2_examples os2_test os2_smart os2_shared os2_showinstall os2_install os2_sourceinstall os2_zipinstall os2_zipsourceinstall os2_clean os2_cleanall os2_require os2_info
+.PHONY:  os2_all os2_debug os2_examples os2_test os2_smart os2_shared os2_showinstall os2_install os2_sourceinstall os2_zipinstall os2_zipsourceinstall os2_clean os2_distclean os2_cleanall os2_require os2_info
 
 os2_all:
 	$(MAKE) -C os2 all
@@ -741,6 +752,9 @@ os2_zipsourceinstall:
 os2_clean:
 	$(MAKE) -C os2 clean
 
+os2_distclean:
+	$(MAKE) -C os2 distclean
+
 os2_cleanall:
 	$(MAKE) -C os2 cleanall
 
@@ -754,7 +768,7 @@ endif
 # Dir tests
 
 ifdef OBJECTDIRTESTS
-.PHONY:  tests_all tests_debug tests_examples tests_test tests_smart tests_shared tests_showinstall tests_install tests_sourceinstall tests_zipinstall tests_zipsourceinstall tests_clean tests_cleanall tests_require tests_info
+.PHONY:  tests_all tests_debug tests_examples tests_test tests_smart tests_shared tests_showinstall tests_install tests_sourceinstall tests_zipinstall tests_zipsourceinstall tests_clean tests_distclean tests_cleanall tests_require tests_info
 
 tests_all:
 	$(MAKE) -C tests all
@@ -792,6 +806,9 @@ tests_zipsourceinstall:
 tests_clean:
 	$(MAKE) -C tests clean
 
+tests_distclean:
+	$(MAKE) -C tests distclean
+
 tests_cleanall:
 	$(MAKE) -C tests cleanall
 

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -152,14 +153,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -696,7 +697,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -761,9 +761,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
@@ -847,11 +852,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1088,7 +1095,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1120,6 +1127,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

fcl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -166,14 +167,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -675,7 +676,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -740,9 +740,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
@@ -822,11 +827,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1048,7 +1055,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1080,6 +1087,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -166,14 +167,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -675,7 +676,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -740,9 +740,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
@@ -822,11 +827,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1048,7 +1055,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1080,6 +1087,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -166,14 +167,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -675,7 +676,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -740,9 +740,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
@@ -822,11 +827,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1048,7 +1055,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1080,6 +1087,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -677,7 +678,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -728,9 +728,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
@@ -810,11 +815,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1051,7 +1058,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1083,6 +1090,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -205,7 +206,6 @@ export DESTZIPDIR
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -241,11 +241,13 @@ sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS))
 
 clean: $(addsuffix _clean,$(DIROBJECTS))
 
+distclean: $(addsuffix _distclean,$(DIROBJECTS))
+
 cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  debug examples test smart shared showinstall install sourceinstall clean cleanall require
+.PHONY:  debug examples test smart shared showinstall install sourceinstall clean distclean cleanall require
 
 #####################################################################
 # Directories
@@ -257,7 +259,7 @@ OBJECTDIRTEXT=1
 # Dir fake
 
 ifdef OBJECTDIRFAKE
-.PHONY:  fake_all fake_debug fake_examples fake_test fake_smart fake_shared fake_showinstall fake_install fake_sourceinstall fake_zipinstall fake_zipsourceinstall fake_clean fake_cleanall fake_require fake_info
+.PHONY:  fake_all fake_debug fake_examples fake_test fake_smart fake_shared fake_showinstall fake_install fake_sourceinstall fake_zipinstall fake_zipsourceinstall fake_clean fake_distclean fake_cleanall fake_require fake_info
 
 fake_all:
 	$(MAKE) -C fake all
@@ -295,6 +297,9 @@ fake_zipsourceinstall:
 fake_clean:
 	$(MAKE) -C fake clean
 
+fake_distclean:
+	$(MAKE) -C fake distclean
+
 fake_cleanall:
 	$(MAKE) -C fake cleanall
 
@@ -308,7 +313,7 @@ endif
 # Dir text
 
 ifdef OBJECTDIRTEXT
-.PHONY:  text_all text_debug text_examples text_test text_smart text_shared text_showinstall text_install text_sourceinstall text_zipinstall text_zipsourceinstall text_clean text_cleanall text_require text_info
+.PHONY:  text_all text_debug text_examples text_test text_smart text_shared text_showinstall text_install text_sourceinstall text_zipinstall text_zipsourceinstall text_clean text_distclean text_cleanall text_require text_info
 
 text_all:
 	$(MAKE) -C text all
@@ -346,6 +351,9 @@ text_zipsourceinstall:
 text_clean:
 	$(MAKE) -C text clean
 
+text_distclean:
+	$(MAKE) -C text distclean
+
 text_cleanall:
 	$(MAKE) -C text cleanall
 

ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -205,7 +206,6 @@ export DESTZIPDIR
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -243,11 +243,13 @@ sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS))
 
 clean: $(addsuffix _clean,$(DIROBJECTS))
 
+distclean: $(addsuffix _distclean,$(DIROBJECTS))
+
 cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall clean cleanall require
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall clean distclean cleanall require
 
 #####################################################################
 # Directories
@@ -259,7 +261,7 @@ OBJECTDIRGDB=1
 # Dir compiler
 
 ifdef OBJECTDIRCOMPILER
-.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_cleanall compiler_require compiler_info
+.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_distclean compiler_cleanall compiler_require compiler_info
 
 compiler_all:
 	$(MAKE) -C compiler all
@@ -297,6 +299,9 @@ compiler_zipsourceinstall:
 compiler_clean:
 	$(MAKE) -C compiler clean
 
+compiler_distclean:
+	$(MAKE) -C compiler distclean
+
 compiler_cleanall:
 	$(MAKE) -C compiler cleanall
 
@@ -310,7 +315,7 @@ endif
 # Dir gdb
 
 ifdef OBJECTDIRGDB
-.PHONY:  gdb_all gdb_debug gdb_examples gdb_test gdb_smart gdb_shared gdb_showinstall gdb_install gdb_sourceinstall gdb_zipinstall gdb_zipsourceinstall gdb_clean gdb_cleanall gdb_require gdb_info
+.PHONY:  gdb_all gdb_debug gdb_examples gdb_test gdb_smart gdb_shared gdb_showinstall gdb_install gdb_sourceinstall gdb_zipinstall gdb_zipsourceinstall gdb_clean gdb_distclean gdb_cleanall gdb_require gdb_info
 
 gdb_all:
 	$(MAKE) -C gdb all
@@ -348,6 +353,9 @@ gdb_zipsourceinstall:
 gdb_clean:
 	$(MAKE) -C gdb clean
 
+gdb_distclean:
+	$(MAKE) -C gdb distclean
+
 gdb_cleanall:
 	$(MAKE) -C gdb cleanall
 

ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -606,7 +607,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -657,9 +657,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
@@ -739,11 +744,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -965,7 +972,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -997,6 +1004,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -606,7 +607,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -657,9 +657,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
@@ -739,11 +744,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -965,7 +972,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -997,6 +1004,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -174,14 +175,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -755,7 +756,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -823,9 +823,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
@@ -901,11 +906,13 @@ zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall sourceinstall zipinstall zipsourceinstall cleanall info
+.PHONY:  all debug smart shared showinstall sourceinstall zipinstall zipsourceinstall distclean cleanall info
 
 #####################################################################
 # Exes
@@ -1128,7 +1135,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1160,6 +1167,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

install/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/27]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: help
@@ -627,7 +627,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -674,9 +673,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
@@ -752,9 +756,11 @@ zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
-.PHONY:  all debug smart shared showinstall sourceinstall zipinstall zipsourceinstall cleanall
+.PHONY:  all debug smart shared showinstall sourceinstall zipinstall zipsourceinstall distclean cleanall
 
 #####################################################################
 # General compile rules
@@ -962,7 +968,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -994,6 +1000,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

install/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: both
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -668,7 +669,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -724,9 +724,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
@@ -804,11 +809,13 @@ zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
 
 #####################################################################
 # Units
@@ -1045,7 +1052,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1077,6 +1084,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -698,7 +699,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -754,9 +754,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
@@ -836,11 +841,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -1063,7 +1070,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1095,6 +1102,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -357,7 +358,7 @@ endif
 # Pkg all
 
 ifdef PKGALL
-.PHONY:  pkgall_all pkgall_debug pkgall_examples pkgall_test pkgall_smart pkgall_shared pkgall_showinstall pkgall_install pkgall_sourceinstall pkgall_zipinstall pkgall_zipsourceinstall pkgall_clean pkgall_cleanall pkgall_require pkgall_info
+.PHONY:  pkgall_all pkgall_debug pkgall_examples pkgall_test pkgall_smart pkgall_shared pkgall_showinstall pkgall_install pkgall_sourceinstall pkgall_zipinstall pkgall_zipsourceinstall pkgall_clean pkgall_distclean pkgall_cleanall pkgall_require pkgall_info
 
 pkgall_all: $(addsuffix _all,$(DIROBJECTS))
 
@@ -385,6 +386,8 @@ pkgall_zipsourceinstall:
 
 pkgall_clean: $(addsuffix _clean,$(DIROBJECTS))
 
+pkgall_distclean: $(addsuffix _distclean,$(DIROBJECTS))
+
 pkgall_cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 pkgall_require: $(addsuffix _require,$(DIROBJECTS))
@@ -394,7 +397,7 @@ endif
 # Pkg base
 
 ifdef PKGBASE
-.PHONY:  pkgbase_all pkgbase_debug pkgbase_examples pkgbase_test pkgbase_smart pkgbase_shared pkgbase_showinstall pkgbase_install pkgbase_sourceinstall pkgbase_zipinstall pkgbase_zipsourceinstall pkgbase_clean pkgbase_cleanall pkgbase_require pkgbase_info
+.PHONY:  pkgbase_all pkgbase_debug pkgbase_examples pkgbase_test pkgbase_smart pkgbase_shared pkgbase_showinstall pkgbase_install pkgbase_sourceinstall pkgbase_zipinstall pkgbase_zipsourceinstall pkgbase_clean pkgbase_distclean pkgbase_cleanall pkgbase_require pkgbase_info
 
 override PKGOBJECTS+=pkgbase
 pkgbase_all: $(addsuffix _all,$(PKGBASE))
@@ -423,6 +426,8 @@ pkgbase_zipsourceinstall:
 
 pkgbase_clean: $(addsuffix _clean,$(PKGBASE))
 
+pkgbase_distclean: $(addsuffix _distclean,$(PKGBASE))
+
 pkgbase_cleanall: $(addsuffix _cleanall,$(PKGBASE))
 
 pkgbase_require: $(addsuffix _require,$(PKGBASE))
@@ -432,7 +437,7 @@ endif
 # Pkg gtk
 
 ifdef PKGGTK
-.PHONY:  pkggtk_all pkggtk_debug pkggtk_examples pkggtk_test pkggtk_smart pkggtk_shared pkggtk_showinstall pkggtk_install pkggtk_sourceinstall pkggtk_zipinstall pkggtk_zipsourceinstall pkggtk_clean pkggtk_cleanall pkggtk_require pkggtk_info
+.PHONY:  pkggtk_all pkggtk_debug pkggtk_examples pkggtk_test pkggtk_smart pkggtk_shared pkggtk_showinstall pkggtk_install pkggtk_sourceinstall pkggtk_zipinstall pkggtk_zipsourceinstall pkggtk_clean pkggtk_distclean pkggtk_cleanall pkggtk_require pkggtk_info
 
 override PKGOBJECTS+=pkggtk
 pkggtk_all: $(addsuffix _all,$(PKGGTK))
@@ -461,6 +466,8 @@ pkggtk_zipsourceinstall:
 
 pkggtk_clean: $(addsuffix _clean,$(PKGGTK))
 
+pkggtk_distclean: $(addsuffix _distclean,$(PKGGTK))
+
 pkggtk_cleanall: $(addsuffix _cleanall,$(PKGGTK))
 
 pkggtk_require: $(addsuffix _require,$(PKGGTK))
@@ -470,7 +477,7 @@ endif
 # Pkg net
 
 ifdef PKGNET
-.PHONY:  pkgnet_all pkgnet_debug pkgnet_examples pkgnet_test pkgnet_smart pkgnet_shared pkgnet_showinstall pkgnet_install pkgnet_sourceinstall pkgnet_zipinstall pkgnet_zipsourceinstall pkgnet_clean pkgnet_cleanall pkgnet_require pkgnet_info
+.PHONY:  pkgnet_all pkgnet_debug pkgnet_examples pkgnet_test pkgnet_smart pkgnet_shared pkgnet_showinstall pkgnet_install pkgnet_sourceinstall pkgnet_zipinstall pkgnet_zipsourceinstall pkgnet_clean pkgnet_distclean pkgnet_cleanall pkgnet_require pkgnet_info
 
 override PKGOBJECTS+=pkgnet
 pkgnet_all: $(addsuffix _all,$(PKGNET))
@@ -499,6 +506,8 @@ pkgnet_zipsourceinstall:
 
 pkgnet_clean: $(addsuffix _clean,$(PKGNET))
 
+pkgnet_distclean: $(addsuffix _distclean,$(PKGNET))
+
 pkgnet_cleanall: $(addsuffix _cleanall,$(PKGNET))
 
 pkgnet_require: $(addsuffix _require,$(PKGNET))
@@ -508,7 +517,7 @@ endif
 # Pkg db
 
 ifdef PKGDB
-.PHONY:  pkgdb_all pkgdb_debug pkgdb_examples pkgdb_test pkgdb_smart pkgdb_shared pkgdb_showinstall pkgdb_install pkgdb_sourceinstall pkgdb_zipinstall pkgdb_zipsourceinstall pkgdb_clean pkgdb_cleanall pkgdb_require pkgdb_info
+.PHONY:  pkgdb_all pkgdb_debug pkgdb_examples pkgdb_test pkgdb_smart pkgdb_shared pkgdb_showinstall pkgdb_install pkgdb_sourceinstall pkgdb_zipinstall pkgdb_zipsourceinstall pkgdb_clean pkgdb_distclean pkgdb_cleanall pkgdb_require pkgdb_info
 
 override PKGOBJECTS+=pkgdb
 pkgdb_all: $(addsuffix _all,$(PKGDB))
@@ -537,6 +546,8 @@ pkgdb_zipsourceinstall:
 
 pkgdb_clean: $(addsuffix _clean,$(PKGDB))
 
+pkgdb_distclean: $(addsuffix _distclean,$(PKGDB))
+
 pkgdb_cleanall: $(addsuffix _cleanall,$(PKGDB))
 
 pkgdb_require: $(addsuffix _require,$(PKGDB))
@@ -546,7 +557,7 @@ endif
 # Pkg gfx
 
 ifdef PKGGFX
-.PHONY:  pkggfx_all pkggfx_debug pkggfx_examples pkggfx_test pkggfx_smart pkggfx_shared pkggfx_showinstall pkggfx_install pkggfx_sourceinstall pkggfx_zipinstall pkggfx_zipsourceinstall pkggfx_clean pkggfx_cleanall pkggfx_require pkggfx_info
+.PHONY:  pkggfx_all pkggfx_debug pkggfx_examples pkggfx_test pkggfx_smart pkggfx_shared pkggfx_showinstall pkggfx_install pkggfx_sourceinstall pkggfx_zipinstall pkggfx_zipsourceinstall pkggfx_clean pkggfx_distclean pkggfx_cleanall pkggfx_require pkggfx_info
 
 override PKGOBJECTS+=pkggfx
 pkggfx_all: $(addsuffix _all,$(PKGGFX))
@@ -575,6 +586,8 @@ pkggfx_zipsourceinstall:
 
 pkggfx_clean: $(addsuffix _clean,$(PKGGFX))
 
+pkggfx_distclean: $(addsuffix _distclean,$(PKGGFX))
+
 pkggfx_cleanall: $(addsuffix _cleanall,$(PKGGFX))
 
 pkggfx_require: $(addsuffix _require,$(PKGGFX))
@@ -584,7 +597,7 @@ endif
 # Pkg misc
 
 ifdef PKGMISC
-.PHONY:  pkgmisc_all pkgmisc_debug pkgmisc_examples pkgmisc_test pkgmisc_smart pkgmisc_shared pkgmisc_showinstall pkgmisc_install pkgmisc_sourceinstall pkgmisc_zipinstall pkgmisc_zipsourceinstall pkgmisc_clean pkgmisc_cleanall pkgmisc_require pkgmisc_info
+.PHONY:  pkgmisc_all pkgmisc_debug pkgmisc_examples pkgmisc_test pkgmisc_smart pkgmisc_shared pkgmisc_showinstall pkgmisc_install pkgmisc_sourceinstall pkgmisc_zipinstall pkgmisc_zipsourceinstall pkgmisc_clean pkgmisc_distclean pkgmisc_cleanall pkgmisc_require pkgmisc_info
 
 override PKGOBJECTS+=pkgmisc
 pkgmisc_all: $(addsuffix _all,$(PKGMISC))
@@ -613,6 +626,8 @@ pkgmisc_zipsourceinstall:
 
 pkgmisc_clean: $(addsuffix _clean,$(PKGMISC))
 
+pkgmisc_distclean: $(addsuffix _distclean,$(PKGMISC))
+
 pkgmisc_cleanall: $(addsuffix _cleanall,$(PKGMISC))
 
 pkgmisc_require: $(addsuffix _require,$(PKGMISC))
@@ -708,7 +723,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -750,11 +764,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: $(addsuffix _clean,$(DIROBJECTS))
 
+distclean: $(addsuffix _distclean,$(DIROBJECTS))
+
 cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 #####################################################################
 # SourceInstall rules
@@ -871,7 +887,7 @@ endif
 # Dir zlib
 
 ifdef OBJECTDIRZLIB
-.PHONY:  zlib_all zlib_debug zlib_examples zlib_test zlib_smart zlib_shared zlib_showinstall zlib_install zlib_sourceinstall zlib_zipinstall zlib_zipsourceinstall zlib_clean zlib_cleanall zlib_require zlib_info
+.PHONY:  zlib_all zlib_debug zlib_examples zlib_test zlib_smart zlib_shared zlib_showinstall zlib_install zlib_sourceinstall zlib_zipinstall zlib_zipsourceinstall zlib_clean zlib_distclean zlib_cleanall zlib_require zlib_info
 
 zlib_all:
 	$(MAKE) -C zlib all
@@ -909,6 +925,9 @@ zlib_zipsourceinstall:
 zlib_clean:
 	$(MAKE) -C zlib clean
 
+zlib_distclean:
+	$(MAKE) -C zlib distclean
+
 zlib_cleanall:
 	$(MAKE) -C zlib cleanall
 
@@ -922,7 +941,7 @@ endif
 # Dir ncurses
 
 ifdef OBJECTDIRNCURSES
-.PHONY:  ncurses_all ncurses_debug ncurses_examples ncurses_test ncurses_smart ncurses_shared ncurses_showinstall ncurses_install ncurses_sourceinstall ncurses_zipinstall ncurses_zipsourceinstall ncurses_clean ncurses_cleanall ncurses_require ncurses_info
+.PHONY:  ncurses_all ncurses_debug ncurses_examples ncurses_test ncurses_smart ncurses_shared ncurses_showinstall ncurses_install ncurses_sourceinstall ncurses_zipinstall ncurses_zipsourceinstall ncurses_clean ncurses_distclean ncurses_cleanall ncurses_require ncurses_info
 
 ncurses_all:
 	$(MAKE) -C ncurses all
@@ -960,6 +979,9 @@ ncurses_zipsourceinstall:
 ncurses_clean:
 	$(MAKE) -C ncurses clean
 
+ncurses_distclean:
+	$(MAKE) -C ncurses distclean
+
 ncurses_cleanall:
 	$(MAKE) -C ncurses cleanall
 
@@ -973,7 +995,7 @@ endif
 # Dir x11
 
 ifdef OBJECTDIRX11
-.PHONY:  x11_all x11_debug x11_examples x11_test x11_smart x11_shared x11_showinstall x11_install x11_sourceinstall x11_zipinstall x11_zipsourceinstall x11_clean x11_cleanall x11_require x11_info
+.PHONY:  x11_all x11_debug x11_examples x11_test x11_smart x11_shared x11_showinstall x11_install x11_sourceinstall x11_zipinstall x11_zipsourceinstall x11_clean x11_distclean x11_cleanall x11_require x11_info
 
 x11_all:
 	$(MAKE) -C x11 all
@@ -1011,6 +1033,9 @@ x11_zipsourceinstall:
 x11_clean:
 	$(MAKE) -C x11 clean
 
+x11_distclean:
+	$(MAKE) -C x11 distclean
+
 x11_cleanall:
 	$(MAKE) -C x11 cleanall
 
@@ -1024,7 +1049,7 @@ endif
 # Dir gtk
 
 ifdef OBJECTDIRGTK
-.PHONY:  gtk_all gtk_debug gtk_examples gtk_test gtk_smart gtk_shared gtk_showinstall gtk_install gtk_sourceinstall gtk_zipinstall gtk_zipsourceinstall gtk_clean gtk_cleanall gtk_require gtk_info
+.PHONY:  gtk_all gtk_debug gtk_examples gtk_test gtk_smart gtk_shared gtk_showinstall gtk_install gtk_sourceinstall gtk_zipinstall gtk_zipsourceinstall gtk_clean gtk_distclean gtk_cleanall gtk_require gtk_info
 
 gtk_all:
 	$(MAKE) -C gtk all
@@ -1062,6 +1087,9 @@ gtk_zipsourceinstall:
 gtk_clean:
 	$(MAKE) -C gtk clean
 
+gtk_distclean:
+	$(MAKE) -C gtk distclean
+
 gtk_cleanall:
 	$(MAKE) -C gtk cleanall
 
@@ -1075,7 +1103,7 @@ endif
 # Dir inet
 
 ifdef OBJECTDIRINET
-.PHONY:  inet_all inet_debug inet_examples inet_test inet_smart inet_shared inet_showinstall inet_install inet_sourceinstall inet_zipinstall inet_zipsourceinstall inet_clean inet_cleanall inet_require inet_info
+.PHONY:  inet_all inet_debug inet_examples inet_test inet_smart inet_shared inet_showinstall inet_install inet_sourceinstall inet_zipinstall inet_zipsourceinstall inet_clean inet_distclean inet_cleanall inet_require inet_info
 
 inet_all:
 	$(MAKE) -C inet all
@@ -1113,6 +1141,9 @@ inet_zipsourceinstall:
 inet_clean:
 	$(MAKE) -C inet clean
 
+inet_distclean:
+	$(MAKE) -C inet distclean
+
 inet_cleanall:
 	$(MAKE) -C inet cleanall
 
@@ -1126,7 +1157,7 @@ endif
 # Dir uncgi
 
 ifdef OBJECTDIRUNCGI
-.PHONY:  uncgi_all uncgi_debug uncgi_examples uncgi_test uncgi_smart uncgi_shared uncgi_showinstall uncgi_install uncgi_sourceinstall uncgi_zipinstall uncgi_zipsourceinstall uncgi_clean uncgi_cleanall uncgi_require uncgi_info
+.PHONY:  uncgi_all uncgi_debug uncgi_examples uncgi_test uncgi_smart uncgi_shared uncgi_showinstall uncgi_install uncgi_sourceinstall uncgi_zipinstall uncgi_zipsourceinstall uncgi_clean uncgi_distclean uncgi_cleanall uncgi_require uncgi_info
 
 uncgi_all:
 	$(MAKE) -C uncgi all
@@ -1164,6 +1195,9 @@ uncgi_zipsourceinstall:
 uncgi_clean:
 	$(MAKE) -C uncgi clean
 
+uncgi_distclean:
+	$(MAKE) -C uncgi distclean
+
 uncgi_cleanall:
 	$(MAKE) -C uncgi cleanall
 
@@ -1177,7 +1211,7 @@ endif
 # Dir mysql
 
 ifdef OBJECTDIRMYSQL
-.PHONY:  mysql_all mysql_debug mysql_examples mysql_test mysql_smart mysql_shared mysql_showinstall mysql_install mysql_sourceinstall mysql_zipinstall mysql_zipsourceinstall mysql_clean mysql_cleanall mysql_require mysql_info
+.PHONY:  mysql_all mysql_debug mysql_examples mysql_test mysql_smart mysql_shared mysql_showinstall mysql_install mysql_sourceinstall mysql_zipinstall mysql_zipsourceinstall mysql_clean mysql_distclean mysql_cleanall mysql_require mysql_info
 
 mysql_all:
 	$(MAKE) -C mysql all
@@ -1215,6 +1249,9 @@ mysql_zipsourceinstall:
 mysql_clean:
 	$(MAKE) -C mysql clean
 
+mysql_distclean:
+	$(MAKE) -C mysql distclean
+
 mysql_cleanall:
 	$(MAKE) -C mysql cleanall
 
@@ -1228,7 +1265,7 @@ endif
 # Dir ibase
 
 ifdef OBJECTDIRIBASE
-.PHONY:  ibase_all ibase_debug ibase_examples ibase_test ibase_smart ibase_shared ibase_showinstall ibase_install ibase_sourceinstall ibase_zipinstall ibase_zipsourceinstall ibase_clean ibase_cleanall ibase_require ibase_info
+.PHONY:  ibase_all ibase_debug ibase_examples ibase_test ibase_smart ibase_shared ibase_showinstall ibase_install ibase_sourceinstall ibase_zipinstall ibase_zipsourceinstall ibase_clean ibase_distclean ibase_cleanall ibase_require ibase_info
 
 ibase_all:
 	$(MAKE) -C ibase all
@@ -1266,6 +1303,9 @@ ibase_zipsourceinstall:
 ibase_clean:
 	$(MAKE) -C ibase clean
 
+ibase_distclean:
+	$(MAKE) -C ibase distclean
+
 ibase_cleanall:
 	$(MAKE) -C ibase cleanall
 
@@ -1279,7 +1319,7 @@ endif
 # Dir postgres
 
 ifdef OBJECTDIRPOSTGRES
-.PHONY:  postgres_all postgres_debug postgres_examples postgres_test postgres_smart postgres_shared postgres_showinstall postgres_install postgres_sourceinstall postgres_zipinstall postgres_zipsourceinstall postgres_clean postgres_cleanall postgres_require postgres_info
+.PHONY:  postgres_all postgres_debug postgres_examples postgres_test postgres_smart postgres_shared postgres_showinstall postgres_install postgres_sourceinstall postgres_zipinstall postgres_zipsourceinstall postgres_clean postgres_distclean postgres_cleanall postgres_require postgres_info
 
 postgres_all:
 	$(MAKE) -C postgres all
@@ -1317,6 +1357,9 @@ postgres_zipsourceinstall:
 postgres_clean:
 	$(MAKE) -C postgres clean
 
+postgres_distclean:
+	$(MAKE) -C postgres distclean
+
 postgres_cleanall:
 	$(MAKE) -C postgres cleanall
 
@@ -1330,7 +1373,7 @@ endif
 # Dir opengl
 
 ifdef OBJECTDIROPENGL
-.PHONY:  opengl_all opengl_debug opengl_examples opengl_test opengl_smart opengl_shared opengl_showinstall opengl_install opengl_sourceinstall opengl_zipinstall opengl_zipsourceinstall opengl_clean opengl_cleanall opengl_require opengl_info
+.PHONY:  opengl_all opengl_debug opengl_examples opengl_test opengl_smart opengl_shared opengl_showinstall opengl_install opengl_sourceinstall opengl_zipinstall opengl_zipsourceinstall opengl_clean opengl_distclean opengl_cleanall opengl_require opengl_info
 
 opengl_all:
 	$(MAKE) -C opengl all
@@ -1368,6 +1411,9 @@ opengl_zipsourceinstall:
 opengl_clean:
 	$(MAKE) -C opengl clean
 
+opengl_distclean:
+	$(MAKE) -C opengl distclean
+
 opengl_cleanall:
 	$(MAKE) -C opengl cleanall
 
@@ -1381,7 +1427,7 @@ endif
 # Dir forms
 
 ifdef OBJECTDIRFORMS
-.PHONY:  forms_all forms_debug forms_examples forms_test forms_smart forms_shared forms_showinstall forms_install forms_sourceinstall forms_zipinstall forms_zipsourceinstall forms_clean forms_cleanall forms_require forms_info
+.PHONY:  forms_all forms_debug forms_examples forms_test forms_smart forms_shared forms_showinstall forms_install forms_sourceinstall forms_zipinstall forms_zipsourceinstall forms_clean forms_distclean forms_cleanall forms_require forms_info
 
 forms_all:
 	$(MAKE) -C forms all
@@ -1419,6 +1465,9 @@ forms_zipsourceinstall:
 forms_clean:
 	$(MAKE) -C forms clean
 
+forms_distclean:
+	$(MAKE) -C forms distclean
+
 forms_cleanall:
 	$(MAKE) -C forms cleanall
 
@@ -1432,7 +1481,7 @@ endif
 # Dir svgalib
 
 ifdef OBJECTDIRSVGALIB
-.PHONY:  svgalib_all svgalib_debug svgalib_examples svgalib_test svgalib_smart svgalib_shared svgalib_showinstall svgalib_install svgalib_sourceinstall svgalib_zipinstall svgalib_zipsourceinstall svgalib_clean svgalib_cleanall svgalib_require svgalib_info
+.PHONY:  svgalib_all svgalib_debug svgalib_examples svgalib_test svgalib_smart svgalib_shared svgalib_showinstall svgalib_install svgalib_sourceinstall svgalib_zipinstall svgalib_zipsourceinstall svgalib_clean svgalib_distclean svgalib_cleanall svgalib_require svgalib_info
 
 svgalib_all:
 	$(MAKE) -C svgalib all
@@ -1470,6 +1519,9 @@ svgalib_zipsourceinstall:
 svgalib_clean:
 	$(MAKE) -C svgalib clean
 
+svgalib_distclean:
+	$(MAKE) -C svgalib distclean
+
 svgalib_cleanall:
 	$(MAKE) -C svgalib cleanall
 
@@ -1483,7 +1535,7 @@ endif
 # Dir ggi
 
 ifdef OBJECTDIRGGI
-.PHONY:  ggi_all ggi_debug ggi_examples ggi_test ggi_smart ggi_shared ggi_showinstall ggi_install ggi_sourceinstall ggi_zipinstall ggi_zipsourceinstall ggi_clean ggi_cleanall ggi_require ggi_info
+.PHONY:  ggi_all ggi_debug ggi_examples ggi_test ggi_smart ggi_shared ggi_showinstall ggi_install ggi_sourceinstall ggi_zipinstall ggi_zipsourceinstall ggi_clean ggi_distclean ggi_cleanall ggi_require ggi_info
 
 ggi_all:
 	$(MAKE) -C ggi all
@@ -1521,6 +1573,9 @@ ggi_zipsourceinstall:
 ggi_clean:
 	$(MAKE) -C ggi clean
 
+ggi_distclean:
+	$(MAKE) -C ggi distclean
+
 ggi_cleanall:
 	$(MAKE) -C ggi cleanall
 
@@ -1534,7 +1589,7 @@ endif
 # Dir utmp
 
 ifdef OBJECTDIRUTMP
-.PHONY:  utmp_all utmp_debug utmp_examples utmp_test utmp_smart utmp_shared utmp_showinstall utmp_install utmp_sourceinstall utmp_zipinstall utmp_zipsourceinstall utmp_clean utmp_cleanall utmp_require utmp_info
+.PHONY:  utmp_all utmp_debug utmp_examples utmp_test utmp_smart utmp_shared utmp_showinstall utmp_install utmp_sourceinstall utmp_zipinstall utmp_zipsourceinstall utmp_clean utmp_distclean utmp_cleanall utmp_require utmp_info
 
 utmp_all:
 	$(MAKE) -C utmp all
@@ -1572,6 +1627,9 @@ utmp_zipsourceinstall:
 utmp_clean:
 	$(MAKE) -C utmp clean
 
+utmp_distclean:
+	$(MAKE) -C utmp distclean
+
 utmp_cleanall:
 	$(MAKE) -C utmp cleanall
 
@@ -1585,7 +1643,7 @@ endif
 # Dir paszlib
 
 ifdef OBJECTDIRPASZLIB
-.PHONY:  paszlib_all paszlib_debug paszlib_examples paszlib_test paszlib_smart paszlib_shared paszlib_showinstall paszlib_install paszlib_sourceinstall paszlib_zipinstall paszlib_zipsourceinstall paszlib_clean paszlib_cleanall paszlib_require paszlib_info
+.PHONY:  paszlib_all paszlib_debug paszlib_examples paszlib_test paszlib_smart paszlib_shared paszlib_showinstall paszlib_install paszlib_sourceinstall paszlib_zipinstall paszlib_zipsourceinstall paszlib_clean paszlib_distclean paszlib_cleanall paszlib_require paszlib_info
 
 paszlib_all:
 	$(MAKE) -C paszlib all
@@ -1623,6 +1681,9 @@ paszlib_zipsourceinstall:
 paszlib_clean:
 	$(MAKE) -C paszlib clean
 
+paszlib_distclean:
+	$(MAKE) -C paszlib distclean
+
 paszlib_cleanall:
 	$(MAKE) -C paszlib cleanall
 
@@ -1636,7 +1697,7 @@ endif
 # Dir gdbint
 
 ifdef OBJECTDIRGDBINT
-.PHONY:  gdbint_all gdbint_debug gdbint_examples gdbint_test gdbint_smart gdbint_shared gdbint_showinstall gdbint_install gdbint_sourceinstall gdbint_zipinstall gdbint_zipsourceinstall gdbint_clean gdbint_cleanall gdbint_require gdbint_info
+.PHONY:  gdbint_all gdbint_debug gdbint_examples gdbint_test gdbint_smart gdbint_shared gdbint_showinstall gdbint_install gdbint_sourceinstall gdbint_zipinstall gdbint_zipsourceinstall gdbint_clean gdbint_distclean gdbint_cleanall gdbint_require gdbint_info
 
 gdbint_all:
 	$(MAKE) -C gdbint all
@@ -1674,6 +1735,9 @@ gdbint_zipsourceinstall:
 gdbint_clean:
 	$(MAKE) -C gdbint clean
 
+gdbint_distclean:
+	$(MAKE) -C gdbint distclean
+
 gdbint_cleanall:
 	$(MAKE) -C gdbint cleanall
 

packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -647,7 +648,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -698,9 +698,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
@@ -780,11 +785,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1021,7 +1028,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1053,6 +1060,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -685,7 +686,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -741,9 +741,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
@@ -823,11 +828,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -1050,7 +1057,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1082,6 +1089,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -631,7 +632,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -700,9 +700,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
@@ -784,11 +789,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1025,7 +1032,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1057,6 +1064,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -204,7 +205,6 @@ export DESTZIPDIR
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif

packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -621,7 +622,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -677,9 +677,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
@@ -757,11 +762,13 @@ zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
 
 #####################################################################
 # Units
@@ -983,7 +990,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1015,6 +1022,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -668,7 +669,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -734,9 +734,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
@@ -816,11 +821,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -1043,7 +1050,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1075,6 +1082,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -667,7 +668,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -733,9 +733,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
@@ -815,11 +820,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -1042,7 +1049,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1074,6 +1081,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -205,7 +206,6 @@ export DESTZIPDIR
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -241,11 +241,13 @@ sourceinstall: $(addsuffix _sourceinstall,$(OS_TARGET))
 
 clean: $(addsuffix _clean,$(DIROBJECTS))
 
+distclean: $(addsuffix _distclean,$(DIROBJECTS))
+
 cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  all debug test smart shared showinstall install sourceinstall clean cleanall require
+.PHONY:  all debug test smart shared showinstall install sourceinstall clean distclean cleanall require
 
 #####################################################################
 # Directories
@@ -258,7 +260,7 @@ OBJECTDIRBUILD=1
 # Dir linux
 
 ifdef OBJECTDIRLINUX
-.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_cleanall linux_require linux_info
+.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_distclean linux_cleanall linux_require linux_info
 
 linux_all:
 	$(MAKE) -C linux all
@@ -296,6 +298,9 @@ linux_zipsourceinstall:
 linux_clean:
 	$(MAKE) -C linux clean
 
+linux_distclean:
+	$(MAKE) -C linux distclean
+
 linux_cleanall:
 	$(MAKE) -C linux cleanall
 
@@ -309,7 +314,7 @@ endif
 # Dir examples
 
 ifdef OBJECTDIREXAMPLES
-.PHONY:  examples_all examples_debug examples_examples examples_test examples_smart examples_shared examples_showinstall examples_install examples_sourceinstall examples_zipinstall examples_zipsourceinstall examples_clean examples_cleanall examples_require examples_info
+.PHONY:  examples_all examples_debug examples_examples examples_test examples_smart examples_shared examples_showinstall examples_install examples_sourceinstall examples_zipinstall examples_zipsourceinstall examples_clean examples_distclean examples_cleanall examples_require examples_info
 
 examples_all:
 	$(MAKE) -C examples all
@@ -347,6 +352,9 @@ examples_zipsourceinstall:
 examples_clean:
 	$(MAKE) -C examples clean
 
+examples_distclean:
+	$(MAKE) -C examples distclean
+
 examples_cleanall:
 	$(MAKE) -C examples cleanall
 
@@ -360,7 +368,7 @@ endif
 # Dir build
 
 ifdef OBJECTDIRBUILD
-.PHONY:  build_all build_debug build_examples build_test build_smart build_shared build_showinstall build_install build_sourceinstall build_zipinstall build_zipsourceinstall build_clean build_cleanall build_require build_info
+.PHONY:  build_all build_debug build_examples build_test build_smart build_shared build_showinstall build_install build_sourceinstall build_zipinstall build_zipsourceinstall build_clean build_distclean build_cleanall build_require build_info
 
 build_all:
 	$(MAKE) -C build all
@@ -398,6 +406,9 @@ build_zipsourceinstall:
 build_clean:
 	$(MAKE) -C build clean
 
+build_distclean:
+	$(MAKE) -C build distclean
+
 build_cleanall:
 	$(MAKE) -C build cleanall
 

packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -647,7 +648,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -698,9 +698,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
@@ -780,11 +785,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1021,7 +1028,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1053,6 +1060,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -685,7 +686,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -741,9 +741,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
@@ -823,11 +828,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -1050,7 +1057,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1082,6 +1089,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/opengl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -83,13 +83,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -152,14 +153,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -652,7 +653,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -703,9 +703,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
@@ -785,11 +790,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1011,7 +1018,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1043,6 +1050,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -618,7 +619,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -669,9 +669,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
@@ -755,11 +760,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -996,7 +1003,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1028,6 +1035,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -754,11 +759,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -995,7 +1002,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1027,6 +1034,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -616,7 +617,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -667,9 +667,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
@@ -749,11 +754,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -975,7 +982,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1007,6 +1014,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -616,7 +617,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -667,9 +667,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
@@ -749,11 +754,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -975,7 +982,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1007,6 +1014,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -136,14 +137,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -412,7 +413,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -454,13 +454,15 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: $(addsuffix _clean,$(OS_TARGET))
 
+distclean: $(addsuffix _distclean,$(OS_TARGET))
+
 cleanall: $(addsuffix _cleanall,$(OS_TARGET))
 
 require: $(addsuffix _require,$(OS_TARGET))
 
 info: $(addsuffix _info,$(OS_TARGET))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
 
 #####################################################################
 # SourceInstall rules
@@ -550,7 +552,7 @@ OBJECTDIRGO32V1=1
 # Dir go32v2
 
 ifdef OBJECTDIRGO32V2
-.PHONY:  go32v2_all go32v2_debug go32v2_examples go32v2_test go32v2_smart go32v2_shared go32v2_showinstall go32v2_install go32v2_sourceinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_clean go32v2_cleanall go32v2_require go32v2_info
+.PHONY:  go32v2_all go32v2_debug go32v2_examples go32v2_test go32v2_smart go32v2_shared go32v2_showinstall go32v2_install go32v2_sourceinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_require go32v2_info
 
 go32v2_all:
 	$(MAKE) -C go32v2 all
@@ -588,6 +590,9 @@ go32v2_zipsourceinstall:
 go32v2_clean:
 	$(MAKE) -C go32v2 clean
 
+go32v2_distclean:
+	$(MAKE) -C go32v2 distclean
+
 go32v2_cleanall:
 	$(MAKE) -C go32v2 cleanall
 
@@ -601,7 +606,7 @@ endif
 # Dir linux
 
 ifdef OBJECTDIRLINUX
-.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_cleanall linux_require linux_info
+.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_distclean linux_cleanall linux_require linux_info
 
 linux_all:
 	$(MAKE) -C linux all
@@ -639,6 +644,9 @@ linux_zipsourceinstall:
 linux_clean:
 	$(MAKE) -C linux clean
 
+linux_distclean:
+	$(MAKE) -C linux distclean
+
 linux_cleanall:
 	$(MAKE) -C linux cleanall
 
@@ -652,7 +660,7 @@ endif
 # Dir win32
 
 ifdef OBJECTDIRWIN32
-.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_cleanall win32_require win32_info
+.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_distclean win32_cleanall win32_require win32_info
 
 win32_all:
 	$(MAKE) -C win32 all
@@ -690,6 +698,9 @@ win32_zipsourceinstall:
 win32_clean:
 	$(MAKE) -C win32 clean
 
+win32_distclean:
+	$(MAKE) -C win32 distclean
+
 win32_cleanall:
 	$(MAKE) -C win32 cleanall
 
@@ -703,7 +714,7 @@ endif
 # Dir os2
 
 ifdef OBJECTDIROS2
-.PHONY:  os2_all os2_debug os2_examples os2_test os2_smart os2_shared os2_showinstall os2_install os2_sourceinstall os2_zipinstall os2_zipsourceinstall os2_clean os2_cleanall os2_require os2_info
+.PHONY:  os2_all os2_debug os2_examples os2_test os2_smart os2_shared os2_showinstall os2_install os2_sourceinstall os2_zipinstall os2_zipsourceinstall os2_clean os2_distclean os2_cleanall os2_require os2_info
 
 os2_all:
 	$(MAKE) -C os2 all
@@ -741,6 +752,9 @@ os2_zipsourceinstall:
 os2_clean:
 	$(MAKE) -C os2 clean
 
+os2_distclean:
+	$(MAKE) -C os2 distclean
+
 os2_cleanall:
 	$(MAKE) -C os2 cleanall
 
@@ -754,7 +768,7 @@ endif
 # Dir go32v1
 
 ifdef OBJECTDIRGO32V1
-.PHONY:  go32v1_all go32v1_debug go32v1_examples go32v1_test go32v1_smart go32v1_shared go32v1_showinstall go32v1_install go32v1_sourceinstall go32v1_zipinstall go32v1_zipsourceinstall go32v1_clean go32v1_cleanall go32v1_require go32v1_info
+.PHONY:  go32v1_all go32v1_debug go32v1_examples go32v1_test go32v1_smart go32v1_shared go32v1_showinstall go32v1_install go32v1_sourceinstall go32v1_zipinstall go32v1_zipsourceinstall go32v1_clean go32v1_distclean go32v1_cleanall go32v1_require go32v1_info
 
 go32v1_all:
 	$(MAKE) -C go32v1 all
@@ -792,6 +806,9 @@ go32v1_zipsourceinstall:
 go32v1_clean:
 	$(MAKE) -C go32v1 clean
 
+go32v1_distclean:
+	$(MAKE) -C go32v1 distclean
+
 go32v1_cleanall:
 	$(MAKE) -C go32v1 cleanall
 

rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -84,13 +84,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -169,14 +170,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -601,7 +602,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -658,9 +658,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
@@ -740,11 +745,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Loaders
@@ -994,7 +1001,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1026,6 +1033,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -84,13 +84,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -169,14 +170,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -601,7 +602,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -658,9 +658,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
@@ -740,11 +745,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Loaders
@@ -994,7 +1001,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1026,6 +1033,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -84,13 +84,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -178,14 +179,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -612,7 +613,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -669,9 +669,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
@@ -751,11 +756,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Loaders
@@ -1005,7 +1012,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1037,6 +1044,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -84,13 +84,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -169,14 +170,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -601,7 +602,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -658,9 +658,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
@@ -740,11 +745,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Loaders
@@ -994,7 +1001,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1026,6 +1033,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -84,13 +84,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -174,14 +175,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -606,7 +607,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -663,9 +663,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
@@ -745,11 +750,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Loaders
@@ -999,7 +1006,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1031,6 +1038,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -745,7 +746,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -801,9 +801,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
@@ -887,13 +892,15 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean $(addsuffix _clean,$(DIROBJECTS))
 
+distclean: fpc_distclean $(addsuffix _distclean,$(DIROBJECTS))
+
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
 info: fpc_info
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall require info
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require info
 
 #####################################################################
 # Exes
@@ -1116,7 +1123,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1148,6 +1155,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1229,7 +1238,7 @@ OBJECTDIRFPRCP=1
 # Dir tply
 
 ifdef OBJECTDIRTPLY
-.PHONY:  tply_all tply_debug tply_examples tply_test tply_smart tply_shared tply_showinstall tply_install tply_sourceinstall tply_zipinstall tply_zipsourceinstall tply_clean tply_cleanall tply_require tply_info
+.PHONY:  tply_all tply_debug tply_examples tply_test tply_smart tply_shared tply_showinstall tply_install tply_sourceinstall tply_zipinstall tply_zipsourceinstall tply_clean tply_distclean tply_cleanall tply_require tply_info
 
 tply_all:
 	$(MAKE) -C tply all
@@ -1267,6 +1276,9 @@ tply_zipsourceinstall:
 tply_clean:
 	$(MAKE) -C tply clean
 
+tply_distclean:
+	$(MAKE) -C tply distclean
+
 tply_cleanall:
 	$(MAKE) -C tply cleanall
 
@@ -1280,7 +1292,7 @@ endif
 # Dir h2pas
 
 ifdef OBJECTDIRH2PAS
-.PHONY:  h2pas_all h2pas_debug h2pas_examples h2pas_test h2pas_smart h2pas_shared h2pas_showinstall h2pas_install h2pas_sourceinstall h2pas_zipinstall h2pas_zipsourceinstall h2pas_clean h2pas_cleanall h2pas_require h2pas_info
+.PHONY:  h2pas_all h2pas_debug h2pas_examples h2pas_test h2pas_smart h2pas_shared h2pas_showinstall h2pas_install h2pas_sourceinstall h2pas_zipinstall h2pas_zipsourceinstall h2pas_clean h2pas_distclean h2pas_cleanall h2pas_require h2pas_info
 
 h2pas_all:
 	$(MAKE) -C h2pas all
@@ -1318,6 +1330,9 @@ h2pas_zipsourceinstall:
 h2pas_clean:
 	$(MAKE) -C h2pas clean
 
+h2pas_distclean:
+	$(MAKE) -C h2pas distclean
+
 h2pas_cleanall:
 	$(MAKE) -C h2pas cleanall
 
@@ -1331,7 +1346,7 @@ endif
 # Dir fprcp
 
 ifdef OBJECTDIRFPRCP
-.PHONY:  fprcp_all fprcp_debug fprcp_examples fprcp_test fprcp_smart fprcp_shared fprcp_showinstall fprcp_install fprcp_sourceinstall fprcp_zipinstall fprcp_zipsourceinstall fprcp_clean fprcp_cleanall fprcp_require fprcp_info
+.PHONY:  fprcp_all fprcp_debug fprcp_examples fprcp_test fprcp_smart fprcp_shared fprcp_showinstall fprcp_install fprcp_sourceinstall fprcp_zipinstall fprcp_zipsourceinstall fprcp_clean fprcp_distclean fprcp_cleanall fprcp_require fprcp_info
 
 fprcp_all:
 	$(MAKE) -C fprcp all
@@ -1369,6 +1384,9 @@ fprcp_zipsourceinstall:
 fprcp_clean:
 	$(MAKE) -C fprcp clean
 
+fprcp_distclean:
+	$(MAKE) -C fprcp distclean
+
 fprcp_cleanall:
 	$(MAKE) -C fprcp cleanall
 

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -750,11 +755,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -977,7 +984,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1009,6 +1016,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -618,7 +619,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -673,9 +673,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
@@ -755,11 +760,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -982,7 +989,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1014,6 +1021,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -146,14 +147,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -617,7 +618,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -668,9 +668,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
@@ -750,11 +755,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Exes
@@ -977,7 +984,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1009,6 +1016,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/26]
+# Makefile generated by fpcmake v0.99.13 [2000/01/28]
 #
 
 defaultrule: all
@@ -77,13 +77,14 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2$(EXEEXT)
+FPC=ppos2
 else
-FPC=ppc386$(EXEEXT)
+FPC=ppc386
 endif
 endif
 endif
-override FPC:=$(subst \,/,$(FPC))
+override FPC:=$(subst $(EXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -155,14 +156,14 @@ ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
 endif
 else
-override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(FPCDIR)/rtl),)
 ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=wrong
+override FPCDIR=c:/pp
 endif
 endif
 endif
@@ -630,7 +631,6 @@ endif
 # Redirection
 #####################################################################
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -685,9 +685,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
@@ -767,11 +772,13 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
+distclean: fpc_distclean
+
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 #####################################################################
 # Units
@@ -1008,7 +1015,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1040,6 +1047,8 @@ ifdef EXTRACLEANFILES
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
+fpc_distclean: fpc_clean
+
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)