From b104d013b03fe59c22523e146d57ab23e03e0faa Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 3 Feb 2007 22:16:00 +0000
Subject: [PATCH] * Re-added fppkg

git-svn-id: trunk@6329 -
---
 utils/Makefile     | 491 ++++++++++++---------------------------------
 utils/Makefile.fpc |   3 +-
 2 files changed, 130 insertions(+), 364 deletions(-)

diff --git a/utils/Makefile b/utils/Makefile
index e775994795..7d26f690cb 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/02/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -233,157 +233,127 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=utils
 override PACKAGE_VERSION=2.0.0
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpmc fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpmc fpcres
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc  fpcres
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
@@ -436,12 +406,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
 endif
@@ -463,9 +427,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
 endif
@@ -484,9 +445,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
 endif
@@ -496,9 +454,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
 endif
@@ -508,9 +463,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
 endif
@@ -523,21 +475,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32  grab_vcsa
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_RSTS+=rstconv
 endif
@@ -589,12 +529,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=rstconv
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_RSTS+=rstconv
 endif
@@ -616,9 +550,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_RSTS+=rstconv
 endif
@@ -637,9 +568,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_RSTS+=rstconv
 endif
@@ -649,9 +577,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override TARGET_RSTS+=rstconv
 endif
@@ -661,9 +586,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_RSTS+=rstconv
 endif
@@ -676,21 +598,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=rstconv
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=rstconv
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_RSTS+=rstconv
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=rstconv
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_UNITS+=ptopu
 endif
@@ -742,12 +652,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override CLEAN_UNITS+=ptopu
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override CLEAN_UNITS+=ptopu
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override CLEAN_UNITS+=ptopu
 endif
@@ -769,9 +673,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override CLEAN_UNITS+=ptopu
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override CLEAN_UNITS+=ptopu
 endif
@@ -790,9 +691,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override CLEAN_UNITS+=ptopu
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override CLEAN_UNITS+=ptopu
 endif
@@ -802,9 +700,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override CLEAN_UNITS+=ptopu
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override CLEAN_UNITS+=ptopu
 endif
@@ -814,9 +709,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override CLEAN_UNITS+=ptopu
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override CLEAN_UNITS+=ptopu
 endif
@@ -829,21 +721,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override CLEAN_UNITS+=ptopu
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override CLEAN_UNITS+=ptopu
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override CLEAN_UNITS+=ptopu
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override CLEAN_UNITS+=ptopu
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override CLEAN_UNITS+=ptopu
-endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -1202,10 +1082,6 @@ EXEEXT=.gba
 SHAREDLIBEXT=.so
 SHORTSUFFIX=gba
 endif
-ifeq ($(OS_TARGET),symbian)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=symbian
-endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1653,7 +1529,6 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_WINUNITS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_IBASE=1
@@ -1810,22 +1685,6 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -1912,14 +1771,6 @@ REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -1991,14 +1842,6 @@ REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -2040,14 +1883,6 @@ REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -2085,18 +1920,9 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_WINUNITS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -2140,30 +1966,6 @@ REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_PASJPEG=1
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -2180,14 +1982,6 @@ REQUIRE_PACKAGES_ODBC=1
 REQUIRE_PACKAGES_ORACLE=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_PASJPEG=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -2552,32 +2346,6 @@ ifdef UNITDIR_SQLITE
 override COMPILER_UNITDIR+=$(UNITDIR_SQLITE)
 endif
 endif
-ifdef REQUIRE_PACKAGES_WINUNITS
-PACKAGEDIR_WINUNITS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_WINUNITS),)
-ifneq ($(wildcard $(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)),)
-UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)
-else
-UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_WINUNITS)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_WINUNITS) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_WINUNITS=
-UNITDIR_WINUNITS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_WINUNITS),)
-UNITDIR_WINUNITS:=$(firstword $(UNITDIR_WINUNITS))
-else
-UNITDIR_WINUNITS=
-endif
-endif
-ifdef UNITDIR_WINUNITS
-override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS)
-endif
-endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(CPU_TARGET)
 endif
@@ -2629,7 +2397,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -2688,13 +2456,6 @@ ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-Aas
 endif
 endif
-ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
-ifeq ($(CPU_TARGET),x86_64)
-override FPCOPT+=-Cg
-endif
-endif
-endif
 ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
@@ -3153,6 +2914,7 @@ fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIR
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 ifeq ($(FULL_TARGET),i386-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3162,6 +2924,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3170,6 +2933,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3180,6 +2944,7 @@ TARGET_DIRS_FPMC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3188,6 +2953,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3197,6 +2963,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3205,6 +2972,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3213,6 +2981,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3221,6 +2990,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3229,6 +2999,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3237,6 +3008,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3245,6 +3017,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3253,6 +3026,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3261,6 +3035,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3269,6 +3044,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3277,6 +3053,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3285,22 +3062,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3309,6 +3071,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3318,6 +3081,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3327,6 +3091,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3335,6 +3100,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3343,6 +3109,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3351,6 +3118,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3359,14 +3127,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3375,6 +3136,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3384,6 +3146,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3392,6 +3155,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3400,6 +3164,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3408,6 +3173,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3416,14 +3182,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3432,6 +3191,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3441,6 +3201,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3449,14 +3210,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3465,6 +3219,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3474,6 +3229,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3483,14 +3239,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3499,6 +3248,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3508,6 +3258,7 @@ TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3516,6 +3267,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3524,30 +3276,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3556,6 +3285,7 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
+TARGET_DIRS_FPPKG=1
 TARGET_DIRS_FPCM=1
 TARGET_DIRS_TPLY=1
 TARGET_DIRS_H2PAS=1
@@ -3564,13 +3294,50 @@ TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
 TARGET_DIRS_FPCRES=1
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_DIRS_FPCM=1
-TARGET_DIRS_TPLY=1
-TARGET_DIRS_H2PAS=1
-TARGET_DIRS_FPRCP=1
-TARGET_DIRS_DXEGEN=1
-TARGET_DIRS_FPDOC=1
+ifdef TARGET_DIRS_FPPKG
+fppkg_all:
+	$(MAKE) -C fppkg all
+fppkg_debug:
+	$(MAKE) -C fppkg debug
+fppkg_smart:
+	$(MAKE) -C fppkg smart
+fppkg_release:
+	$(MAKE) -C fppkg release
+fppkg_units:
+	$(MAKE) -C fppkg units
+fppkg_examples:
+	$(MAKE) -C fppkg examples
+fppkg_shared:
+	$(MAKE) -C fppkg shared
+fppkg_install:
+	$(MAKE) -C fppkg install
+fppkg_sourceinstall:
+	$(MAKE) -C fppkg sourceinstall
+fppkg_exampleinstall:
+	$(MAKE) -C fppkg exampleinstall
+fppkg_distinstall:
+	$(MAKE) -C fppkg distinstall
+fppkg_zipinstall:
+	$(MAKE) -C fppkg zipinstall
+fppkg_zipsourceinstall:
+	$(MAKE) -C fppkg zipsourceinstall
+fppkg_zipexampleinstall:
+	$(MAKE) -C fppkg zipexampleinstall
+fppkg_zipdistinstall:
+	$(MAKE) -C fppkg zipdistinstall
+fppkg_clean:
+	$(MAKE) -C fppkg clean
+fppkg_distclean:
+	$(MAKE) -C fppkg distclean
+fppkg_cleanall:
+	$(MAKE) -C fppkg cleanall
+fppkg_info:
+	$(MAKE) -C fppkg info
+fppkg_makefiles:
+	$(MAKE) -C fppkg makefiles
+fppkg:
+	$(MAKE) -C fppkg all
+.PHONY: fppkg_all fppkg_debug fppkg_smart fppkg_release fppkg_units fppkg_examples fppkg_shared fppkg_install fppkg_sourceinstall fppkg_exampleinstall fppkg_distinstall fppkg_zipinstall fppkg_zipsourceinstall fppkg_zipexampleinstall fppkg_zipdistinstall fppkg_clean fppkg_distclean fppkg_cleanall fppkg_info fppkg_makefiles fppkg
 endif
 ifdef TARGET_DIRS_FPCM
 fpcm_all:
diff --git a/utils/Makefile.fpc b/utils/Makefile.fpc
index a2a27b3da9..e439e7abd3 100644
--- a/utils/Makefile.fpc
+++ b/utils/Makefile.fpc
@@ -7,8 +7,7 @@ name=utils
 version=2.0.0
 
 [target]
-dirs=fpcm tply h2pas fprcp dxegen fpdoc
-# dirs=fppkg fpcm tply h2pas fprcp dxegen fpdoc
+dirs=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 programs=ppdep ptop rstconv data2inc delp bin2obj postw32
 programs_linux=grab_vcsa
 dirs_win32=fpmc fpcres