* version updates to 3.0.5

git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37640 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 4 insertions, 223 deletions

diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile
index 0242c33f51..674cf4d8bc 100644
--- a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile
+++ b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile
@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
-LIMIT83fs = go32v2 os2 emx watcom msdos win16
+LIMIT83fs = go32v2 os2 emx watcom msdos
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
@@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-ifeq ($(SUBARCH),)
-$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
 ifeq ($(SUBARCH),)
 $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined)
@@ -503,12 +497,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_PROGRAMS+=BackgroundAllInOne
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 override TARGET_PROGRAMS+=BackgroundAllInOne
 endif
@@ -539,9 +527,6 @@ endif
 ifeq ($(FULL_TARGET),arm-android)
 override TARGET_PROGRAMS+=BackgroundAllInOne
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=BackgroundAllInOne
 endif
@@ -581,21 +566,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override TARGET_PROGRAMS+=BackgroundAllInOne
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 override TARGET_PROGRAMS+=BackgroundAllInOne
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override TARGET_PROGRAMS+=BackgroundAllInOne
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_UNITS+=*
 endif
@@ -755,12 +728,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override CLEAN_UNITS+=*
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override CLEAN_UNITS+=*
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override CLEAN_UNITS+=*
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 override CLEAN_UNITS+=*
 endif
@@ -791,9 +758,6 @@ endif
 ifeq ($(FULL_TARGET),arm-android)
 override CLEAN_UNITS+=*
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-override CLEAN_UNITS+=*
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override CLEAN_UNITS+=*
 endif
@@ -833,21 +797,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override CLEAN_UNITS+=*
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override CLEAN_UNITS+=*
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 override CLEAN_UNITS+=*
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override CLEAN_UNITS+=*
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override CLEAN_UNITS+=*
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override CLEAN_UNITS+=*
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
@@ -1007,12 +959,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
@@ -1043,9 +989,6 @@ endif
 ifeq ($(FULL_TARGET),arm-android)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
@@ -1085,21 +1028,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/*
-endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_OPTIONS+=-Xm
@@ -1260,12 +1191,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override COMPILER_OPTIONS+=-Xm
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_OPTIONS+=-Xm
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_OPTIONS+=-Xm
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 override COMPILER_OPTIONS+=-Xm
 endif
@@ -1296,9 +1221,6 @@ endif
 ifeq ($(FULL_TARGET),arm-android)
 override COMPILER_OPTIONS+=-Xm
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_OPTIONS+=-Xm
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_OPTIONS+=-Xm
 endif
@@ -1338,21 +1260,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override COMPILER_OPTIONS+=-Xm
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_OPTIONS+=-Xm
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 override COMPILER_OPTIONS+=-Xm
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_OPTIONS+=-Xm
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_OPTIONS+=-Xm
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_OPTIONS+=-Xm
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
@@ -1512,12 +1422,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
@@ -1548,9 +1452,6 @@ endif
 ifeq ($(FULL_TARGET),arm-android)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
@@ -1590,21 +1491,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 override COMPILER_TARGETDIR+=$(BIN)
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_TARGETDIR+=$(BIN)
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
@@ -1764,12 +1653,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
@@ -1800,9 +1683,6 @@ endif
 ifeq ($(FULL_TARGET),arm-android)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
@@ -1842,21 +1722,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 override COMPILER_UNITTARGETDIR+=$(BUILD)
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_UNITTARGETDIR+=$(BUILD)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -2252,21 +2120,6 @@ STATICLIBPREFIX=
 STATICLIBEXT=.a
 SHORTSUFFIX=d16
 endif
-ifeq ($(OS_TARGET),embedded)
-ifeq ($(CPU_TARGET),i8086)
-STATICLIBPREFIX=
-STATICLIBEXT=.a
-else
-EXEEXT=.bin
-endif
-SHORTSUFFIX=emb
-endif
-ifeq ($(OS_TARGET),win16)
-STATICLIBPREFIX=
-STATICLIBEXT=.a
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=w16
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -2999,24 +2852,6 @@ REQUIRE_PACKAGES_LIBTAR=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_LIBNDSFPC=1
 endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -3107,15 +2942,6 @@ REQUIRE_PACKAGES_LIBTAR=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_LIBNDSFPC=1
 endif
-ifeq ($(FULL_TARGET),arm-aros)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -3233,15 +3059,6 @@ REQUIRE_PACKAGES_LIBTAR=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_LIBNDSFPC=1
 endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -3251,33 +3068,6 @@ REQUIRE_PACKAGES_LIBTAR=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_LIBNDSFPC=1
 endif
-ifeq ($(FULL_TARGET),i8086-win16)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-PROCESS=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_LIBTAR=1
-REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_LIBNDSFPC=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -3556,7 +3346,6 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
-override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
@@ -3569,7 +3358,6 @@ endif
 ifndef CROSSCOMPILE
 ifneq ($(BINUTILSPREFIX),)
 override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
-override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)
 endif
 endif
 ifdef UNITDIR
@@ -3669,9 +3457,6 @@ endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
-ifdef FPMAKEBUILDOPT
-override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)
-endif
 ifdef FPCOPTDEF
 override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
 endif
@@ -3863,7 +3648,7 @@ endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
 endif
@@ -3949,10 +3734,6 @@ endif
 ifdef DEBUGSYMEXT
 	-$(DEL) *$(DEBUGSYMEXT)
 endif
-ifdef LOCALFPMAKEBIN
-	-$(DEL) $(LOCALFPMAKEBIN)
-	-$(DEL) $(FPMAKEBINOBJ)
-endif
 fpc_distclean: cleanall
 .PHONY: fpc_baseinfo
 override INFORULES+=fpc_baseinfo