* Changed more packages to fpmake building

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20089 3ad0048d-3df7-0310-abae-a5850022a9f2

53 files changed, 8531 insertions, 17277 deletions

diff --git a/packages/Makefile b/packages/Makefile
index 496772c396..964d820aec 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/13]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -9647,11 +9647,11 @@ chm_shared:  fcl-xml_shared fpmkunit_shared
 chm_smart:  fcl-xml_smart fpmkunit_smart
 chm_debug:  fcl-xml_debug fpmkunit_debug
 chm_release:  fcl-xml_release fpmkunit_release
-fpgtk_all: fcl-base_all gtk1_all
-fpgtk_shared: fcl-base_shared gtk1_shared
-fpgtk_smart: fcl-base_smart gtk1_smart
-fpgtk_debug: fcl-base_debug gtk1_debug
-fpgtk_release: fcl-base_release gtk1_release
+fpgtk_all: fcl-base_all gtk1_all fpmkunit_all
+fpgtk_shared: fcl-base_shared gtk1_shared fpmkunit_shared
+fpgtk_smart: fcl-base_smart gtk1_smart fpmkunit_smart
+fpgtk_debug: fcl-base_debug gtk1_debug fpmkunit_debug
+fpgtk_release: fcl-base_release gtk1_release fpmkunit_release
 ifeq ($(findstring $(OS_TARGET),go32v2),)
 graph_all: sdl_all
 graph_shared: sdl_shared
@@ -9717,33 +9717,43 @@ sdl_shared: pthreads_shared x11_shared fpmkunit_shared
 sdl_smart: pthreads_smart x11_smart fpmkunit_smart
 sdl_debug: pthreads_debug x11_debug fpmkunit_debug
 sdl_release: pthreads_release x11_release_release
-opengl_all: x11_all
-opengl_shared: x11_shared
-opengl_smart: x11_smart
-opengl_debug: x11_debug
-opengl_release: x11_release
-ptc_all: x11_all
-ptc_shared: x11_shared
-ptc_smart: x11_smart
-ptc_debug: x11_debug
-ptc_release: x11_release
+opengl_all: x11_all fpmkunit_all
+opengl_shared: x11_shared fpmkunit_shared
+opengl_smart: x11_smart fpmkunit_smart
+opengl_debug: x11_debug fpmkunit_debug
+opengl_release: x11_release fpmkunit_release
+ptc_all: x11_all fpmkunit_all
+ptc_shared: x11_shared fpmkunit_shared
+ptc_smart: x11_smart fpmkunit_smart
+ptc_debug: x11_debug fpmkunit_debug
+ptc_release: x11_release fpmkunit_release
 else
 sdl_all: fpmkunit_all
 sdl_shared: fpmkunit_shared
 sdl_smart: fpmkunit_smart
 sdl_debug: fpmkunit_debug
 sdl_release: fpmkunit_release
+ptc_all: fpmkunit_all
+ptc_shared: fpmkunit_shared
+ptc_smart: fpmkunit_smart
+ptc_debug: fpmkunit_debug
+ptc_release: fpmkunit_release
+opengl_all: fpmkunit_all
+opengl_shared: fpmkunit_shared
+opengl_smart: fpmkunit_smart
+opengl_debug: fpmkunit_debug
+opengl_release: fpmkunit_release
 endif
 tcl_all: fcl-base_all fpmkunit_all
 tcl_shared: fcl-base_shared fpmkunit_shared
 tcl_smart: fcl-base_smart fpmkunit_smart
 tcl_debug: fcl-base_debug fpmkunit_debug
 tcl_release: fcl-base_release fpmkunit_release
-unixutil_all: libc_all fcl-base_all
-unixutil_shared: libc_shared fcl-base_shared
-unixutil_smart: libc_smart fcl-base_smart
-unixutil_debug: libc_debug fcl-base_debug
-unixutil_release: libc_release fcl-base_release
+unixutil_all: libc_all fcl-base_all fpmkunit_all
+unixutil_shared: libc_shared fcl-base_shared fpkmunit_shared
+unixutil_smart: libc_smart fcl-base_smart fpmkunit_smart
+unixutil_debug: libc_debug fcl-base_debug fpmkunit_debug
+unixutil_release: libc_release fcl-base_release fpmkunit_release
 winunits-base_all: fcl-registry_all fcl-base_all fpmkunit_all
 winunits-base_shared: fcl-registry_shared fcl-base_shared fpmkunit_shared
 winunits-base_smart: fcl-registry_smart fcl-base_smart fpmkunit_smart
@@ -10051,3 +10061,63 @@ unzip_shared: fpmkunit_shared
 unzip_smart: fpmkunit_smart
 unzip_debug: fpmkunit_debug
 unzip_release: fpmkunit_release
+os2units_all: fpmkunit_all
+os2units_shared: fpmkunit_shared
+os2units_smart: fpmkunit_smart
+os2units_debug: fpmkunit_debug
+os2units_release: fpmkunit_release
+gdbint_all: fpmkunit_all
+gdbint_shared: fpmkunit_shared
+gdbint_smart: fpmkunit_smart
+gdbint_debug: fpmkunit_debug
+gdbint_release: fpmkunit_release
+univint_all: fpmkunit_all
+univint_shared: fpmkunit_shared
+univint_smart: fpmkunit_smart
+univint_debug: fpmkunit_debug
+univint_release: fpmkunit_release
+cocoaint_all: fpmkunit_all
+cocoaint_shared: fpmkunit_shared
+cocoaint_smart: fpmkunit_smart
+cocoaint_debug: fpmkunit_debug
+cocoaint_release: fpmkunit_release
+pcap_all: fpmkunit_all
+pcap_shared: fpmkunit_shared
+pcap_smart: fpmkunit_smart
+pcap_debug: fpmkunit_debug
+pcap_release: fpmkunit_release
+pasjpeg_all: fpmkunit_all
+pasjpeg_shared: fpmkunit_shared
+pasjpeg_smart: fpmkunit_smart
+pasjpeg_debug: fpmkunit_debug
+pasjpeg_release: fpmkunit_release
+palmunits_all: fpmkunit_all
+palmunits_shared: fpmkunit_shared
+palmunits_smart: fpmkunit_smart
+palmunits_debug: fpmkunit_debug
+palmunits_release: fpmkunit_release
+opengles_all: fpmkunit_all
+opengles_shared: fpmkunit_shared
+opengles_smart: fpmkunit_smart
+opengles_debug: fpmkunit_debug
+opengles_release: fpmkunit_release
+openssl_all: fpmkunit_all
+openssl_shared: fpmkunit_shared
+openssl_smart: fpmkunit_smart
+openssl_debug: fpmkunit_debug
+openssl_release: fpmkunit_release
+pxlib_all: fpmkunit_all
+pxlib_shared: fpmkunit_shared
+pxlib_smart: fpmkunit_smart
+pxlib_debug: fpmkunit_debug
+pxlib_release: fpmkunit_release
+rexx_all: fpmkunit_all
+rexx_shared: fpmkunit_shared
+rexx_smart: fpmkunit_smart
+rexx_debug: fpmkunit_debug
+rexx_release: fpmkunit_release
+objcrtl_all: fpmkunit_all
+objcrtl_shared: fpmkunit_shared
+objcrtl_smart: fpmkunit_smart
+objcrtl_debug: fpmkunit_debug
+objcrtl_release: fpmkunit_release
diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc
index 35911cae62..01156ee76d 100644
--- a/packages/Makefile.fpc
+++ b/packages/Makefile.fpc
@@ -276,11 +276,11 @@ chm_smart:  fcl-xml_smart fpmkunit_smart
 chm_debug:  fcl-xml_debug fpmkunit_debug
 chm_release:  fcl-xml_release fpmkunit_release
 
-fpgtk_all: fcl-base_all gtk1_all
-fpgtk_shared: fcl-base_shared gtk1_shared
-fpgtk_smart: fcl-base_smart gtk1_smart
-fpgtk_debug: fcl-base_debug gtk1_debug
-fpgtk_release: fcl-base_release gtk1_release
+fpgtk_all: fcl-base_all gtk1_all fpmkunit_all
+fpgtk_shared: fcl-base_shared gtk1_shared fpmkunit_shared
+fpgtk_smart: fcl-base_smart gtk1_smart fpmkunit_smart
+fpgtk_debug: fcl-base_debug gtk1_debug fpmkunit_debug
+fpgtk_release: fcl-base_release gtk1_release fpmkunit_release
 
 ifeq ($(findstring $(OS_TARGET),go32v2),)
 graph_all: sdl_all
@@ -357,23 +357,36 @@ sdl_smart: pthreads_smart x11_smart fpmkunit_smart
 sdl_debug: pthreads_debug x11_debug fpmkunit_debug
 sdl_release: pthreads_release x11_release_release
 
-opengl_all: x11_all
-opengl_shared: x11_shared
-opengl_smart: x11_smart
-opengl_debug: x11_debug
-opengl_release: x11_release
-
-ptc_all: x11_all
-ptc_shared: x11_shared
-ptc_smart: x11_smart
-ptc_debug: x11_debug
-ptc_release: x11_release
+opengl_all: x11_all fpmkunit_all
+opengl_shared: x11_shared fpmkunit_shared
+opengl_smart: x11_smart fpmkunit_smart
+opengl_debug: x11_debug fpmkunit_debug
+opengl_release: x11_release fpmkunit_release
+
+ptc_all: x11_all fpmkunit_all
+ptc_shared: x11_shared fpmkunit_shared
+ptc_smart: x11_smart fpmkunit_smart
+ptc_debug: x11_debug fpmkunit_debug
+ptc_release: x11_release fpmkunit_release
 else
 sdl_all: fpmkunit_all
 sdl_shared: fpmkunit_shared
 sdl_smart: fpmkunit_smart
 sdl_debug: fpmkunit_debug
 sdl_release: fpmkunit_release
+
+ptc_all: fpmkunit_all
+ptc_shared: fpmkunit_shared
+ptc_smart: fpmkunit_smart
+ptc_debug: fpmkunit_debug
+ptc_release: fpmkunit_release
+
+opengl_all: fpmkunit_all
+opengl_shared: fpmkunit_shared
+opengl_smart: fpmkunit_smart
+opengl_debug: fpmkunit_debug
+opengl_release: fpmkunit_release
+
 endif
 
 tcl_all: fcl-base_all fpmkunit_all
@@ -382,11 +395,11 @@ tcl_smart: fcl-base_smart fpmkunit_smart
 tcl_debug: fcl-base_debug fpmkunit_debug
 tcl_release: fcl-base_release fpmkunit_release
 
-unixutil_all: libc_all fcl-base_all
-unixutil_shared: libc_shared fcl-base_shared
-unixutil_smart: libc_smart fcl-base_smart
-unixutil_debug: libc_debug fcl-base_debug
-unixutil_release: libc_release fcl-base_release
+unixutil_all: libc_all fcl-base_all fpmkunit_all
+unixutil_shared: libc_shared fcl-base_shared fpkmunit_shared
+unixutil_smart: libc_smart fcl-base_smart fpmkunit_smart
+unixutil_debug: libc_debug fcl-base_debug fpmkunit_debug
+unixutil_release: libc_release fcl-base_release fpmkunit_release
 
 winunits-base_all: fcl-registry_all fcl-base_all fpmkunit_all
 winunits-base_shared: fcl-registry_shared fcl-base_shared fpmkunit_shared
@@ -757,3 +770,75 @@ unzip_smart: fpmkunit_smart
 unzip_debug: fpmkunit_debug
 unzip_release: fpmkunit_release
 
+os2units_all: fpmkunit_all
+os2units_shared: fpmkunit_shared
+os2units_smart: fpmkunit_smart
+os2units_debug: fpmkunit_debug
+os2units_release: fpmkunit_release
+
+gdbint_all: fpmkunit_all
+gdbint_shared: fpmkunit_shared
+gdbint_smart: fpmkunit_smart
+gdbint_debug: fpmkunit_debug
+gdbint_release: fpmkunit_release
+
+univint_all: fpmkunit_all
+univint_shared: fpmkunit_shared
+univint_smart: fpmkunit_smart
+univint_debug: fpmkunit_debug
+univint_release: fpmkunit_release
+
+cocoaint_all: fpmkunit_all
+cocoaint_shared: fpmkunit_shared
+cocoaint_smart: fpmkunit_smart
+cocoaint_debug: fpmkunit_debug
+cocoaint_release: fpmkunit_release
+
+pcap_all: fpmkunit_all
+pcap_shared: fpmkunit_shared
+pcap_smart: fpmkunit_smart
+pcap_debug: fpmkunit_debug
+pcap_release: fpmkunit_release
+
+pasjpeg_all: fpmkunit_all
+pasjpeg_shared: fpmkunit_shared
+pasjpeg_smart: fpmkunit_smart
+pasjpeg_debug: fpmkunit_debug
+pasjpeg_release: fpmkunit_release
+
+palmunits_all: fpmkunit_all
+palmunits_shared: fpmkunit_shared
+palmunits_smart: fpmkunit_smart
+palmunits_debug: fpmkunit_debug
+palmunits_release: fpmkunit_release
+
+opengles_all: fpmkunit_all
+opengles_shared: fpmkunit_shared
+opengles_smart: fpmkunit_smart
+opengles_debug: fpmkunit_debug
+opengles_release: fpmkunit_release
+
+openssl_all: fpmkunit_all
+openssl_shared: fpmkunit_shared
+openssl_smart: fpmkunit_smart
+openssl_debug: fpmkunit_debug
+openssl_release: fpmkunit_release
+
+pxlib_all: fpmkunit_all
+pxlib_shared: fpmkunit_shared
+pxlib_smart: fpmkunit_smart
+pxlib_debug: fpmkunit_debug
+pxlib_release: fpmkunit_release
+
+rexx_all: fpmkunit_all
+rexx_shared: fpmkunit_shared
+rexx_smart: fpmkunit_smart
+rexx_debug: fpmkunit_debug
+rexx_release: fpmkunit_release
+
+objcrtl_all: fpmkunit_all
+objcrtl_shared: fpmkunit_shared
+objcrtl_smart: fpmkunit_smart
+objcrtl_debug: fpmkunit_debug
+objcrtl_release: fpmkunit_release
+
diff --git a/packages/cocoaint/Makefile b/packages/cocoaint/Makefile
index 5e230e4cdb..131704fb76 100644
--- a/packages/cocoaint/Makefile
+++ b/packages/cocoaint/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,574 +294,15 @@ endif
 endif
 override PACKAGE_NAME=cocoaint
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=CocoaAll WebKit CoreData
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1474,258 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl univint
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1765,42 +1376,156 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_UNIVINT
-PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_UNIVINT),)
-ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX)),)
-UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX)
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
 else
-UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
 endif
-ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
 else
-ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
 else
-UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
 endif
 endif
 ifdef CHECKDEPEND
-$(PACKAGEDIR_UNIVINT)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_UNIVINT)/$(FPCMADE)
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_UNIVINT=
-UNITDIR_UNIVINT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /univint/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_UNIVINT),)
-UNITDIR_UNIVINT:=$(firstword $(UNITDIR_UNIVINT))
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
 else
-UNITDIR_UNIVINT=
+UNITDIR_FPMKUNIT=
 endif
 endif
-ifdef UNITDIR_UNIVINT
-override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT)
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
 endif
-ifdef UNITDIR_FPMAKE_UNIVINT
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT)
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
 endif
 ifndef NOCPUDEF
@@ -1819,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1958,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2068,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2329,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2386,29 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-WebKit$(PPUEXT): CocoaAll$(PPUEXT)
-CoreData$(PPUEXT): CocoaAll$(PPUEXT)
+.NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/cocoaint/Makefile.fpc b/packages/cocoaint/Makefile.fpc
index f1927a4e21..230e628322 100644
--- a/packages/cocoaint/Makefile.fpc
+++ b/packages/cocoaint/Makefile.fpc
@@ -1,31 +1,76 @@
 #
-#   Makefile.fpc for Apple Universal Interfaces for Free Pascal
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=cocoaint
 version=2.7.1
 
-[target]
-units=CocoaAll WebKit CoreData
-implicitunits=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
-
-[libs]
-libversion=2.5.1
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
 
-[compiler]
-sourcedir=src
-
 [default]
 fpcdir=../..
 
-[require]
-packages=univint
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
-WebKit$(PPUEXT): CocoaAll$(PPUEXT)
+.NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
 
-CoreData$(PPUEXT): CocoaAll$(PPUEXT)
diff --git a/packages/cocoaint/Makefile.fpc.fpcmake b/packages/cocoaint/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..f1927a4e21
--- /dev/null
+++ b/packages/cocoaint/Makefile.fpc.fpcmake
@@ -0,0 +1,31 @@
+#
+#   Makefile.fpc for Apple Universal Interfaces for Free Pascal
+#
+
+[package]
+name=cocoaint
+version=2.7.1
+
+[target]
+units=CocoaAll WebKit CoreData
+implicitunits=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit
+
+[libs]
+libversion=2.5.1
+
+[install]
+fpcpackage=y
+
+[compiler]
+sourcedir=src
+
+[default]
+fpcdir=../..
+
+[require]
+packages=univint
+
+[rules]
+WebKit$(PPUEXT): CocoaAll$(PPUEXT)
+
+CoreData$(PPUEXT): CocoaAll$(PPUEXT)
diff --git a/packages/fpgtk/Makefile b/packages/fpgtk/Makefile
index a846bd820d..1d6e492a62 100644
--- a/packages/fpgtk/Makefile
+++ b/packages/fpgtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,763 +294,15 @@ endif
 endif
 override PACKAGE_NAME=fpgtk
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=fpglib fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=fpgtk fpgtkext
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=fpgtk fpgtkext
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1247,37 +499,6 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1694,17 +896,13 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fcl-base gtk1
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
@@ -1712,9 +910,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
@@ -1722,9 +917,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
@@ -1732,9 +924,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1742,10 +931,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
@@ -1753,9 +938,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
@@ -1763,9 +945,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1773,10 +952,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -1784,9 +959,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
@@ -1794,9 +966,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
@@ -1804,9 +973,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1814,10 +980,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
@@ -1825,9 +987,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -1835,10 +994,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
@@ -1846,9 +1001,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
@@ -1856,9 +1008,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
@@ -1866,9 +1015,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -1876,9 +1022,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -1886,9 +1029,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -1896,9 +1036,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
@@ -1906,9 +1043,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
@@ -1916,9 +1050,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -1926,10 +1057,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1937,10 +1064,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1948,10 +1071,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
@@ -1959,9 +1078,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
@@ -1969,9 +1085,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1979,10 +1092,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
@@ -1990,9 +1099,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2000,9 +1106,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2010,10 +1113,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2021,10 +1120,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
@@ -2032,9 +1127,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
@@ -2042,9 +1134,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2052,10 +1141,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
@@ -2063,9 +1148,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2073,9 +1155,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
@@ -2083,9 +1162,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2093,10 +1169,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2104,10 +1176,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2115,9 +1183,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2125,9 +1190,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2135,10 +1197,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2146,10 +1204,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2157,9 +1211,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2167,10 +1218,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
@@ -2178,9 +1225,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2188,9 +1232,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2198,10 +1239,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
@@ -2209,9 +1246,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2219,10 +1253,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -2230,9 +1260,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
@@ -2240,9 +1267,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
@@ -2250,9 +1274,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2260,9 +1281,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -2270,9 +1288,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2280,10 +1295,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2291,10 +1302,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2302,9 +1309,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2312,9 +1316,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2322,10 +1323,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2333,9 +1330,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2343,10 +1337,6 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK1=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2538,158 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FCL-BASE
-PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_FCL-BASE),)
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),)
-UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)
-else
-UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_FCL-BASE)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_FCL-BASE=
-UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FCL-BASE),)
-UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE))
-else
-UNITDIR_FCL-BASE=
-endif
-endif
-ifdef UNITDIR_FCL-BASE
-override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE)
-endif
-ifdef UNITDIR_FPMAKE_FCL-BASE
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE)
-endif
-endif
-ifdef REQUIRE_PACKAGES_X11
-PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_X11),)
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)),)
-UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)
-else
-UNITDIR_X11=$(PACKAGEDIR_X11)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_X11)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_X11=
-UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_X11),)
-UNITDIR_X11:=$(firstword $(UNITDIR_X11))
-else
-UNITDIR_X11=
-endif
-endif
-ifdef UNITDIR_X11
-override COMPILER_UNITDIR+=$(UNITDIR_X11)
-endif
-ifdef UNITDIR_FPMAKE_X11
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11)
-endif
-endif
-ifdef REQUIRE_PACKAGES_OPENGL
-PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_OPENGL),)
-ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX)),)
-UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX)
-else
-UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_OPENGL)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_OPENGL=
-UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_OPENGL),)
-UNITDIR_OPENGL:=$(firstword $(UNITDIR_OPENGL))
-else
-UNITDIR_OPENGL=
-endif
-endif
-ifdef UNITDIR_OPENGL
-override COMPILER_UNITDIR+=$(UNITDIR_OPENGL)
-endif
-ifdef UNITDIR_FPMAKE_OPENGL
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL)
-endif
-endif
-ifdef REQUIRE_PACKAGES_GTK1
-PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_GTK1),)
-ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX)),)
-UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX)
-else
-UNITDIR_GTK1=$(PACKAGEDIR_GTK1)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_GTK1)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK1)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_GTK1=
-UNITDIR_GTK1:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_GTK1),)
-UNITDIR_GTK1:=$(firstword $(UNITDIR_GTK1))
-else
-UNITDIR_GTK1=
-endif
-endif
-ifdef UNITDIR_GTK1
-override COMPILER_UNITDIR+=$(UNITDIR_GTK1)
-endif
-ifdef UNITDIR_FPMAKE_GTK1
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1)
-endif
-endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -2706,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2811,12 +1653,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -2851,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2961,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -3222,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -3279,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/fpgtk/Makefile.fpc b/packages/fpgtk/Makefile.fpc
index 3225480fe0..e63bf59141 100644
--- a/packages/fpgtk/Makefile.fpc
+++ b/packages/fpgtk/Makefile.fpc
@@ -1,16 +1,13 @@
 #
-#   Makefile.fpc for fpgtk
+#   Makefile.fpc for running fpmake
 #
-[require]
-packages=fcl-base gtk1
 
 [package]
 name=fpgtk
 version=2.7.1
 
-[target]
-units=fpglib fpgtk fpgtkext
-rsts=fpgtk fpgtkext
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -18,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src src/editor src/def src/pgtk tests
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/fpgtk/Makefile.fpc.fpcmake b/packages/fpgtk/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..3225480fe0
--- /dev/null
+++ b/packages/fpgtk/Makefile.fpc.fpcmake
@@ -0,0 +1,26 @@
+#
+#   Makefile.fpc for fpgtk
+#
+[require]
+packages=fcl-base gtk1
+
+[package]
+name=fpgtk
+version=2.7.1
+
+[target]
+units=fpglib fpgtk fpgtkext
+rsts=fpgtk fpgtkext
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src src/editor src/def src/pgtk tests
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile
index 43d9feaeea..033aff9e90 100644
--- a/packages/gdbint/Makefile
+++ b/packages/gdbint/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,1173 +294,15 @@ endif
 endif
 override PACKAGE_NAME=gdbint
 override PACKAGE_VERSION=2.7.1
-ifdef inUnix
-CURRDIR=./
-else
-CURRDIR=
-endif
-ifdef GDBLIBDIR
-override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
-endif
-ifeq ($(LIBGDBFILE),)
-override GDBLIBDIR=$(wildcard $(FPCDIR)/libgdb/$(OS_TARGET)/$(CPU_TARGET))
-ifeq ($(GDBLIBDIR),)
-override GDBLIBDIR=$(FPCDIR)/libgdb/$(OS_TARGET)
-endif
-override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
-endif
-ifeq ($(LIBGDBFILE),)
-GDBFOUND=0
-else
-GDBFOUND=1
-override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR))))
-ifeq ($(LIBGDBINC),)
-GDBLIBINCFOUND=0
-GDBLIBINCCOND=
-else
-GDBLIBINCFOUND=1
-GDBLIBINCCOND=-dUSE_GDBLIBINC
-endif
-ifdef NO_GDBLIBINC
-GDBLIBINCFOUND=0
-GDBLIBINCCOND=
-endif
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLES+=examples/testgdb examples/symify
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1657,37 +499,6 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -2076,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -2104,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2332,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -2348,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2453,12 +1653,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -2493,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2623,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2884,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2941,114 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+units:
+examples:
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-ifeq ($(FULL_SOURCE),$(FULL_TARGET))
-CAN_RUN_GDBVER=1
-endif
-ifeq ($(FULL_SOURCE),i386-win32)
-ifeq ($(FULL_TARGET),i386-go32v2)
-CAN_RUN_GDBVER=1
-endif
-endif
-ifdef CAN_RUN_GDBVER
-ifeq ($(GDBFOUND),1)
-$(CURRDIR)getver$(EXEEXT) : gdbver.pp
-	$(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp
-ifndef GOTGDBVER
-gdbint$(PPUEXT): $(CURRDIR)gdbver$(EXEEXT) gdbint.pp
-	$(MAKE) gdbint$(PPUEXT) GOTGDBVER=1
-else
-GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n))
-gdbver.inc: gdbver$(EXEEXT)
-	./gdbver$(EXEEXT) -o gdbver.inc
-gdbint$(PPUEXT): gdbint.pp gdbver.inc
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-	@$(ECHO) Using GDB $(GDBVER)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp
-else
-	@$(ECHO) Using GDB $(GDBVER) \(MingW\)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp
-endif
-	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)
-endif
-else
-GDBVER=GDB_V606
-gdbver.inc:
-	$(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc
-gdbint$(PPUEXT): gdbint.pp gdbver.inc
-	@$(ECHO) libgdb.a not found, using default GDB $(GDBVER)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND)  -Fisrc -Fusrc src/gdbint.pp
-	$(DEL) src/gdbver.inc
-endif
-else
-GDBVER=GDB_V606
-gdbver.inc:
-	$(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc
-gdbint$(PPUEXT): gdbint.pp gdbver.inc
-	@$(ECHO) Different target os or cpu, using default GDB $(GDBVER)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND)  -Fisrc -Fusrc src/gdbint.pp
-endif
-gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT)
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-	$(COMPILER) src/gdbcon.pp
-else
-	$(COMPILER) -dUSE_MINGW_GDB src/gdbcon.pp
-endif
-	$(EXECPPAS)
-ifeq ($(OS_TARGET),go32v2)
-DBGCOM=dbgcom$(OEXT)
+.NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
 else
-DBGCOM=
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
-ifdef $(COMPILEDBGCOM)
-$(DBGCOM): ../v4.16/dbgcom.c
-	gcc -c -DFPC -Dother_sel -gstabs -o dbgcom.o -I../v4.16 ../v4.16/dbgcom.c
-else
-$(DBGCOM):
+	-$(DEL) $(LOCALFPMAKE)
 endif
-simple: $(DBGCOM)
-	-rm gdbint.ppu
-	ppc386 -dUSE_LIBGDB -fisrc -fusrc gdbint
-	ppc386 testgdb
-examples/testgdb$(EXEEXT): examples/testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-	$(COMPILER) -FEexamples  examples/testgdb.pp
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
 else
-	$(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/testgdb.pp
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
 endif
-	$(EXECPPAS)
-examples/symify$(EXEEXT): examples/symify.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-	$(COMPILER) -FEexamples  examples/symify.pp
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
 else
-	$(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/symify.pp
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
 endif
-	$(EXECPPAS)
-.PHONY: test
-test: examples
-clean: fpc_clean
-	$(DEL) src/gdbver$(EXEEXT) src/gdbver$(OEXT)
-distclean: fpc_distclean
-	$(DEL) src/gdbver.inc
-.NOTPARALLEL:
diff --git a/packages/gdbint/Makefile.fpc b/packages/gdbint/Makefile.fpc
index f65f340a9b..f0298191fc 100644
--- a/packages/gdbint/Makefile.fpc
+++ b/packages/gdbint/Makefile.fpc
@@ -1,24 +1,13 @@
 #
-#   Makefile.fpc for Free Pascal GDB Interface
+#   Makefile.fpc for running fpmake
 #
 
-
 [package]
 name=gdbint
 version=2.7.1
 
-[target]
-units=gdbint gdbcon
-examples=examples/testgdb examples/symify
-
-[compiler]
-objectdir=$(GDBLIBDIR)
-librarydir=$(GDBLIBDIR)
-includedir=$(GDBLIBDIR) src
-sourcedir=src tests
-
 [require]
-libc=y
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -26,168 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-
 [prerules]
-# For unix be sure to use the locally created gdbver
-ifdef inUnix
-CURRDIR=./
-else
-CURRDIR=
-endif
-
-# Look for a valid GDBLIBDIR environment variable
-ifdef GDBLIBDIR
-override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
-endif
-
-# Use default dirs if not available
-ifeq ($(LIBGDBFILE),)
-# Default locations <target>/<cpu> (linux) or <target> (win32,go32v2) only
-override GDBLIBDIR=$(wildcard $(FPCDIR)/libgdb/$(OS_TARGET)/$(CPU_TARGET))
-ifeq ($(GDBLIBDIR),)
-override GDBLIBDIR=$(FPCDIR)/libgdb/$(OS_TARGET)
-endif
-# Detect if libgdb.a is available
-override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
-endif
-
-# Set GDBFOUND variable
-ifeq ($(LIBGDBFILE),)
-GDBFOUND=0
-else
-GDBFOUND=1
-# Detect if gdblib.inc is available
-override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR))))
-ifeq ($(LIBGDBINC),)
-GDBLIBINCFOUND=0
-GDBLIBINCCOND=
-else
-GDBLIBINCFOUND=1
-GDBLIBINCCOND=-dUSE_GDBLIBINC
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifdef NO_GDBLIBINC
-GDBLIBINCFOUND=0
-GDBLIBINCCOND=
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
-endif
-
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
-ifeq ($(FULL_SOURCE),$(FULL_TARGET))
-CAN_RUN_GDBVER=1
-endif
-
-ifeq ($(FULL_SOURCE),i386-win32)
-ifeq ($(FULL_TARGET),i386-go32v2)
-CAN_RUN_GDBVER=1
-endif
-endif
-
-
-ifdef CAN_RUN_GDBVER
-ifeq ($(GDBFOUND),1)
-# libgdb.a found
-
-$(CURRDIR)getver$(EXEEXT) : gdbver.pp
-	$(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp
-
-ifndef GOTGDBVER
-# gdbver doesn't exists, build it first
-gdbint$(PPUEXT): $(CURRDIR)gdbver$(EXEEXT) gdbint.pp
-	$(MAKE) gdbint$(PPUEXT) GOTGDBVER=1
-else
-# gdbver exists
-GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n))
-gdbver.inc: gdbver$(EXEEXT)
-        ./gdbver$(EXEEXT) -o gdbver.inc
-gdbint$(PPUEXT): gdbint.pp gdbver.inc
-# MingW?
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-	@$(ECHO) Using GDB $(GDBVER)
-        $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp
-else
-	@$(ECHO) Using GDB $(GDBVER) \(MingW\)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp
-endif
-	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)
-endif
-
-else
-# libgdb.a not found, default to libgdb v6
-GDBVER=GDB_V606
-gdbver.inc:
-        $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc
-gdbint$(PPUEXT): gdbint.pp gdbver.inc
-	@$(ECHO) libgdb.a not found, using default GDB $(GDBVER)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND)  -Fisrc -Fusrc src/gdbint.pp
-        $(DEL) src/gdbver.inc
-endif
+.NOTPARALLEL:
 
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
 else
-# Different OS_TARGET, default to libgdb v6
-GDBVER=GDB_V606
-gdbver.inc:
-        $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc
-gdbint$(PPUEXT): gdbint.pp gdbver.inc
-	@$(ECHO) Different target os or cpu, using default GDB $(GDBVER)
-	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND)  -Fisrc -Fusrc src/gdbint.pp
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
-
-gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT)
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-        $(COMPILER) src/gdbcon.pp
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
 else
-        $(COMPILER) -dUSE_MINGW_GDB src/gdbcon.pp
-endif
-	$(EXECPPAS)
-
-ifeq ($(OS_TARGET),go32v2)
-DBGCOM=dbgcom$(OEXT)
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
 else
-DBGCOM=
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 endif
-
-ifdef $(COMPILEDBGCOM)
-# FPC conditionnal remove the file watching mecanism introduced
-# in v2.02 of dbgcom.c because it relies
-# on the fact that all files are opened via C lib calls
-# which is wrong for FPC !!
-$(DBGCOM): ../v4.16/dbgcom.c
-	gcc -c -DFPC -Dother_sel -gstabs -o dbgcom.o -I../v4.16 ../v4.16/dbgcom.c
-else
-$(DBGCOM):
+	-$(DEL) $(LOCALFPMAKE)
 endif
-
-simple: $(DBGCOM)
-	-rm gdbint.ppu
-	ppc386 -dUSE_LIBGDB -fisrc -fusrc gdbint
-	ppc386 testgdb
-
-examples/testgdb$(EXEEXT): examples/testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-	$(COMPILER) -FEexamples  examples/testgdb.pp
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
 else
-	$(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/testgdb.pp
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
 endif
-	$(EXECPPAS)
-
-examples/symify$(EXEEXT): examples/symify.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
-ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
-        $(COMPILER) -FEexamples  examples/symify.pp
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
 else
-        $(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/symify.pp
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
 endif
-	$(EXECPPAS)
 
-# Allow test for example
-.PHONY: test
-
-test: examples
-
-clean: fpc_clean
-	$(DEL) src/gdbver$(EXEEXT) src/gdbver$(OEXT)
-
-distclean: fpc_distclean
-	$(DEL) src/gdbver.inc
-
-.NOTPARALLEL:
diff --git a/packages/gdbint/Makefile.fpc.fpcmake b/packages/gdbint/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..f65f340a9b
--- /dev/null
+++ b/packages/gdbint/Makefile.fpc.fpcmake
@@ -0,0 +1,193 @@
+#
+#   Makefile.fpc for Free Pascal GDB Interface
+#
+
+
+[package]
+name=gdbint
+version=2.7.1
+
+[target]
+units=gdbint gdbcon
+examples=examples/testgdb examples/symify
+
+[compiler]
+objectdir=$(GDBLIBDIR)
+librarydir=$(GDBLIBDIR)
+includedir=$(GDBLIBDIR) src
+sourcedir=src tests
+
+[require]
+libc=y
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+
+[prerules]
+# For unix be sure to use the locally created gdbver
+ifdef inUnix
+CURRDIR=./
+else
+CURRDIR=
+endif
+
+# Look for a valid GDBLIBDIR environment variable
+ifdef GDBLIBDIR
+override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
+endif
+
+# Use default dirs if not available
+ifeq ($(LIBGDBFILE),)
+# Default locations <target>/<cpu> (linux) or <target> (win32,go32v2) only
+override GDBLIBDIR=$(wildcard $(FPCDIR)/libgdb/$(OS_TARGET)/$(CPU_TARGET))
+ifeq ($(GDBLIBDIR),)
+override GDBLIBDIR=$(FPCDIR)/libgdb/$(OS_TARGET)
+endif
+# Detect if libgdb.a is available
+override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
+endif
+
+# Set GDBFOUND variable
+ifeq ($(LIBGDBFILE),)
+GDBFOUND=0
+else
+GDBFOUND=1
+# Detect if gdblib.inc is available
+override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR))))
+ifeq ($(LIBGDBINC),)
+GDBLIBINCFOUND=0
+GDBLIBINCCOND=
+else
+GDBLIBINCFOUND=1
+GDBLIBINCCOND=-dUSE_GDBLIBINC
+endif
+ifdef NO_GDBLIBINC
+GDBLIBINCFOUND=0
+GDBLIBINCCOND=
+endif
+endif
+
+
+[rules]
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+CAN_RUN_GDBVER=1
+endif
+
+ifeq ($(FULL_SOURCE),i386-win32)
+ifeq ($(FULL_TARGET),i386-go32v2)
+CAN_RUN_GDBVER=1
+endif
+endif
+
+
+ifdef CAN_RUN_GDBVER
+ifeq ($(GDBFOUND),1)
+# libgdb.a found
+
+$(CURRDIR)getver$(EXEEXT) : gdbver.pp
+	$(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp
+
+ifndef GOTGDBVER
+# gdbver doesn't exists, build it first
+gdbint$(PPUEXT): $(CURRDIR)gdbver$(EXEEXT) gdbint.pp
+	$(MAKE) gdbint$(PPUEXT) GOTGDBVER=1
+else
+# gdbver exists
+GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n))
+gdbver.inc: gdbver$(EXEEXT)
+        ./gdbver$(EXEEXT) -o gdbver.inc
+gdbint$(PPUEXT): gdbint.pp gdbver.inc
+# MingW?
+ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
+	@$(ECHO) Using GDB $(GDBVER)
+        $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp
+else
+	@$(ECHO) Using GDB $(GDBVER) \(MingW\)
+	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp
+endif
+	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)
+endif
+
+else
+# libgdb.a not found, default to libgdb v6
+GDBVER=GDB_V606
+gdbver.inc:
+        $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc
+gdbint$(PPUEXT): gdbint.pp gdbver.inc
+	@$(ECHO) libgdb.a not found, using default GDB $(GDBVER)
+	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND)  -Fisrc -Fusrc src/gdbint.pp
+        $(DEL) src/gdbver.inc
+endif
+
+else
+# Different OS_TARGET, default to libgdb v6
+GDBVER=GDB_V606
+gdbver.inc:
+        $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc
+gdbint$(PPUEXT): gdbint.pp gdbver.inc
+	@$(ECHO) Different target os or cpu, using default GDB $(GDBVER)
+	$(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND)  -Fisrc -Fusrc src/gdbint.pp
+endif
+
+gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT)
+ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
+        $(COMPILER) src/gdbcon.pp
+else
+        $(COMPILER) -dUSE_MINGW_GDB src/gdbcon.pp
+endif
+	$(EXECPPAS)
+
+ifeq ($(OS_TARGET),go32v2)
+DBGCOM=dbgcom$(OEXT)
+else
+DBGCOM=
+endif
+
+ifdef $(COMPILEDBGCOM)
+# FPC conditionnal remove the file watching mecanism introduced
+# in v2.02 of dbgcom.c because it relies
+# on the fact that all files are opened via C lib calls
+# which is wrong for FPC !!
+$(DBGCOM): ../v4.16/dbgcom.c
+	gcc -c -DFPC -Dother_sel -gstabs -o dbgcom.o -I../v4.16 ../v4.16/dbgcom.c
+else
+$(DBGCOM):
+endif
+
+simple: $(DBGCOM)
+	-rm gdbint.ppu
+	ppc386 -dUSE_LIBGDB -fisrc -fusrc gdbint
+	ppc386 testgdb
+
+examples/testgdb$(EXEEXT): examples/testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
+ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
+	$(COMPILER) -FEexamples  examples/testgdb.pp
+else
+	$(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/testgdb.pp
+endif
+	$(EXECPPAS)
+
+examples/symify$(EXEEXT): examples/symify.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
+ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),)
+        $(COMPILER) -FEexamples  examples/symify.pp
+else
+        $(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/symify.pp
+endif
+	$(EXECPPAS)
+
+# Allow test for example
+.PHONY: test
+
+test: examples
+
+clean: fpc_clean
+	$(DEL) src/gdbver$(EXEEXT) src/gdbver$(OEXT)
+
+distclean: fpc_distclean
+	$(DEL) src/gdbver.inc
+
+.NOTPARALLEL:
diff --git a/packages/objcrtl/Makefile b/packages/objcrtl/Makefile
index f25b2c37c7..131514c3c0 100644
--- a/packages/objcrtl/Makefile
+++ b/packages/objcrtl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -292,576 +292,17 @@ FPMAKE_SKIP_CONFIG=-n
 FPCFPMAKE=$(FPC)
 endif
 endif
-override PACKAGE_NAME=obcjrtl
+override PACKAGE_NAME=objcrtl
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1474,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1718,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1857,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -1967,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2228,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2285,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/objcrtl/Makefile.fpc b/packages/objcrtl/Makefile.fpc
index 3f22d9261f..59656beccf 100644
--- a/packages/objcrtl/Makefile.fpc
+++ b/packages/objcrtl/Makefile.fpc
@@ -1,13 +1,13 @@
 #
-#   Makefile.fpc for objective-c runtime library bindings
+#   Makefile.fpc for running fpmake
 #
 
 [package]
-name=obcjrtl
+name=objcrtl
 version=2.7.1
 
-[target]
-units=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -15,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/objcrtl/Makefile.fpc.fpcmake b/packages/objcrtl/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..3f22d9261f
--- /dev/null
+++ b/packages/objcrtl/Makefile.fpc.fpcmake
@@ -0,0 +1,23 @@
+#
+#   Makefile.fpc for objective-c runtime library bindings
+#
+
+[package]
+name=obcjrtl
+version=2.7.1
+
+[target]
+units=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile
index 7acb7e5c65..1259eb2d2c 100644
--- a/packages/opengl/Makefile
+++ b/packages/opengl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,952 +294,15 @@ endif
 endif
 override PACKAGE_NAME=opengl
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=gl glu glut  glext
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=gl glu glut  glext
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=gl glu glut  glext
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=gl glu glut
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=gl glu glut  glx glext
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_IMPLICITUNITS+=freeglut
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1436,37 +499,6 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -1864,218 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2115,42 +1376,156 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_X11
-PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_X11),)
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)),)
-UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
 else
-UNITDIR_X11=$(PACKAGEDIR_X11)
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
 endif
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
 else
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
 else
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
 endif
 endif
 ifdef CHECKDEPEND
-$(PACKAGEDIR_X11)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_X11=
-UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_X11),)
-UNITDIR_X11:=$(firstword $(UNITDIR_X11))
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
 else
-UNITDIR_X11=
+UNITDIR_FPMKUNIT=
 endif
 endif
-ifdef UNITDIR_X11
-override COMPILER_UNITDIR+=$(UNITDIR_X11)
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
 endif
-ifdef UNITDIR_FPMAKE_X11
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11)
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
 endif
 ifndef NOCPUDEF
@@ -2278,12 +1653,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -2318,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2762,262 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/opengl/Makefile.fpc b/packages/opengl/Makefile.fpc
index 6efee33e77..05a7def4b6 100644
--- a/packages/opengl/Makefile.fpc
+++ b/packages/opengl/Makefile.fpc
@@ -1,5 +1,5 @@
 #
-#   Makefile.fpc for OpenGL for FPC
+#   Makefile.fpc for running fpmake
 #
 
 [package]
@@ -7,36 +7,70 @@ name=opengl
 version=2.7.1
 
 [require]
-packages_linux=x11
-packages_freebsd=x11
-packages_netbsd=x11
-packages_openbsd=x11
-packages_darwin=x11
-packages_i386_iphonesim=x11
-
-[target]
-units=gl glu glut
-units_win32=glext
-units_win64=glext
-units_haiku=glext
-units_linux=glx glext
-units_freebsd=glx glext
-units_netbsd=glx glext
-units_openbsd=glx glext
-units_darwin=glx glext
-exampledirs=examples
-
-implicitunits=freeglut
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
 
-[compiler]
-includedir=src
-sourcedir=src tests examples
-
 [default]
 fpcdir=../..
 
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
+
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/opengl/Makefile.fpc.fpcmake b/packages/opengl/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..6efee33e77
--- /dev/null
+++ b/packages/opengl/Makefile.fpc.fpcmake
@@ -0,0 +1,42 @@
+#
+#   Makefile.fpc for OpenGL for FPC
+#
+
+[package]
+name=opengl
+version=2.7.1
+
+[require]
+packages_linux=x11
+packages_freebsd=x11
+packages_netbsd=x11
+packages_openbsd=x11
+packages_darwin=x11
+packages_i386_iphonesim=x11
+
+[target]
+units=gl glu glut
+units_win32=glext
+units_win64=glext
+units_haiku=glext
+units_linux=glx glext
+units_freebsd=glx glext
+units_netbsd=glx glext
+units_openbsd=glx glext
+units_darwin=glx glext
+exampledirs=examples
+
+implicitunits=freeglut
+
+[install]
+fpcpackage=y
+
+[compiler]
+includedir=src
+sourcedir=src tests examples
+
+[default]
+fpcdir=../..
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/opengles/Makefile b/packages/opengles/Makefile
index b474d2f30d..236a8271cc 100644
--- a/packages/opengles/Makefile
+++ b/packages/opengles/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,631 +294,15 @@ endif
 endif
 override PACKAGE_NAME=opengles
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=gles11
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=gles20 gles11
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=gles20
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src examples
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1503,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1531,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1759,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1775,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1914,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2044,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2305,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2362,262 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/opengles/Makefile.fpc b/packages/opengles/Makefile.fpc
index fa85085e39..f670cb0385 100644
--- a/packages/opengles/Makefile.fpc
+++ b/packages/opengles/Makefile.fpc
@@ -1,34 +1,76 @@
 #
-#   Makefile.fpc for OpenGL ES for FPC
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=opengles
 version=2.7.1
 
-# [require]
-# packages_linux=x11
-#
-
-[target]
-units_arm_darwin=gles11
-units_i386_iphonesim=gles11
-units_linux=gles20
-units_wince=gles20
-units_win32=gles20
-units_win64=gles20
-units_darwin=gles20
-exampledirs=examples
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
 
-[compiler]
-includedir=src
-sourcedir=src examples
-
 [default]
 fpcdir=../..
 
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
+
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/opengles/Makefile.fpc.fpcmake b/packages/opengles/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..fa85085e39
--- /dev/null
+++ b/packages/opengles/Makefile.fpc.fpcmake
@@ -0,0 +1,34 @@
+#
+#   Makefile.fpc for OpenGL ES for FPC
+#
+
+[package]
+name=opengles
+version=2.7.1
+
+# [require]
+# packages_linux=x11
+#
+
+[target]
+units_arm_darwin=gles11
+units_i386_iphonesim=gles11
+units_linux=gles20
+units_wince=gles20
+units_win32=gles20
+units_win64=gles20
+units_darwin=gles20
+exampledirs=examples
+
+[install]
+fpcpackage=y
+
+[compiler]
+includedir=src
+sourcedir=src examples
+
+[default]
+fpcdir=../..
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/openssl/Makefile b/packages/openssl/Makefile
index 5b189b9bba..8ea12a4be0 100644
--- a/packages/openssl/Makefile
+++ b/packages/openssl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,574 +294,15 @@ endif
 endif
 override PACKAGE_NAME=openssl
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=openssl
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=openssl
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=openssl
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1474,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1718,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1857,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -1967,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2228,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2285,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/openssl/Makefile.fpc b/packages/openssl/Makefile.fpc
index 63d4080bb8..c07cd4bbd4 100644
--- a/packages/openssl/Makefile.fpc
+++ b/packages/openssl/Makefile.fpc
@@ -1,13 +1,13 @@
 #
-#   Makefile.fpc for OpenSSL bindings
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=openssl
 version=2.7.1
 
-[target]
-units=openssl
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -15,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src tests examples
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/openssl/Makefile.fpc.fpcmake b/packages/openssl/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..63d4080bb8
--- /dev/null
+++ b/packages/openssl/Makefile.fpc.fpcmake
@@ -0,0 +1,23 @@
+#
+#   Makefile.fpc for OpenSSL bindings
+#
+
+[package]
+name=openssl
+version=2.7.1
+
+[target]
+units=openssl
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests examples
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/os2units/Makefile b/packages/os2units/Makefile
index 4b6c71bf15..88a12ced35 100644
--- a/packages/os2units/Makefile
+++ b/packages/os2units/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,763 +294,15 @@ endif
 endif
 override PACKAGE_NAME=os2units
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1247,37 +499,6 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1694,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1922,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1938,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2043,12 +1653,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -2083,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2213,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2474,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2531,262 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/os2units/Makefile.fpc b/packages/os2units/Makefile.fpc
index b21dfd1b98..614e295d84 100644
--- a/packages/os2units/Makefile.fpc
+++ b/packages/os2units/Makefile.fpc
@@ -1,5 +1,5 @@
 #
-#   Makefile.fpc for SDL bindings
+#   Makefile.fpc for running fpmake
 #
 
 [package]
@@ -7,12 +7,7 @@ name=os2units
 version=2.7.1
 
 [require]
-libc=y
-
-[target]
-units=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
-# som wpstk
-exampledirs=examples
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -20,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src tests examples
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/os2units/Makefile.fpc.fpcmake b/packages/os2units/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..b21dfd1b98
--- /dev/null
+++ b/packages/os2units/Makefile.fpc.fpcmake
@@ -0,0 +1,28 @@
+#
+#   Makefile.fpc for SDL bindings
+#
+
+[package]
+name=os2units
+version=2.7.1
+
+[require]
+libc=y
+
+[target]
+units=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw
+# som wpstk
+exampledirs=examples
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests examples
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/palmunits/Makefile b/packages/palmunits/Makefile
index 5d58103951..84aa2b79ce 100644
--- a/packages/palmunits/Makefile
+++ b/packages/palmunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,574 +294,15 @@ endif
 endif
 override PACKAGE_NAME=palmunits
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1474,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1718,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1857,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -1967,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2228,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2285,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/palmunits/Makefile.fpc b/packages/palmunits/Makefile.fpc
index a770dadea2..23caf86cdb 100644
--- a/packages/palmunits/Makefile.fpc
+++ b/packages/palmunits/Makefile.fpc
@@ -1,27 +1,13 @@
 #
-#   Makefile.fpc for the Multimedia Toolkit (interface units for MMPM)
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=palmunits
 version=2.7.1
 
-[target]
-units=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard \
-connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver \
-encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr \
-field filestream find_ floatmgr font fontselect_ form fslib graffiti \
-graffitireference graffitishift hal helper helperserviceclass hwrmiscflags \
-imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps \
-list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  \
-netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos \
-password pdiconst pdilib penmgr phonelookup preferences privaterecords progress \
-rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold \
-slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr \
-systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui \
-textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
-
-exampledirs=
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -29,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src tests
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/palmunits/Makefile.fpc.fpcmake b/packages/palmunits/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..a770dadea2
--- /dev/null
+++ b/packages/palmunits/Makefile.fpc.fpcmake
@@ -0,0 +1,37 @@
+#
+#   Makefile.fpc for the Multimedia Toolkit (interface units for MMPM)
+#
+
+[package]
+name=palmunits
+version=2.7.1
+
+[target]
+units=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard \
+connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver \
+encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr \
+field filestream find_ floatmgr font fontselect_ form fslib graffiti \
+graffitireference graffitishift hal helper helperserviceclass hwrmiscflags \
+imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps \
+list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr  \
+netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos \
+password pdiconst pdilib penmgr phonelookup preferences privaterecords progress \
+rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold \
+slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr \
+systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui \
+textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window
+
+exampledirs=
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/pasjpeg/Makefile b/packages/pasjpeg/Makefile
index 57f909d264..5a0f314ae2 100644
--- a/packages/pasjpeg/Makefile
+++ b/packages/pasjpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,763 +294,15 @@ endif
 endif
 override PACKAGE_NAME=pasjpeg
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=buildpasjpeg jctrans
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1635,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1663,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1891,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1907,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2046,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2176,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2437,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2494,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+units:
+examples:
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/pasjpeg/Makefile.fpc b/packages/pasjpeg/Makefile.fpc
index 77eb4f41c9..0328dd5781 100644
--- a/packages/pasjpeg/Makefile.fpc
+++ b/packages/pasjpeg/Makefile.fpc
@@ -1,30 +1,76 @@
 #
-#   Makefile.fpc for PasJPEG
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=pasjpeg
 version=2.7.1
 
-[target]
-units=buildpasjpeg jctrans
-implicitunits=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct \
-      jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin \
-      jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr \
-      jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct \
-      jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst \
-      jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib \
-      jquant1 jquant2 jutils
-examples=cjpeg demo djpeg jpegtran rdjpgcom
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
 
-[compiler]
-sourcedir=src
-
 [default]
 fpcdir=../..
 
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
+
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/pasjpeg/Makefile.fpc.fpcmake b/packages/pasjpeg/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..77eb4f41c9
--- /dev/null
+++ b/packages/pasjpeg/Makefile.fpc.fpcmake
@@ -0,0 +1,30 @@
+#
+#   Makefile.fpc for PasJPEG
+#
+
+[package]
+name=pasjpeg
+version=2.7.1
+
+[target]
+units=buildpasjpeg jctrans
+implicitunits=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct \
+      jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin \
+      jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr \
+      jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct \
+      jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst \
+      jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib \
+      jquant1 jquant2 jutils
+examples=cjpeg demo djpeg jpegtran rdjpgcom
+
+[install]
+fpcpackage=y
+
+[compiler]
+sourcedir=src
+
+[default]
+fpcdir=../..
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/pcap/Makefile b/packages/pcap/Makefile
index e672e79cf9..1e8891d073 100644
--- a/packages/pcap/Makefile
+++ b/packages/pcap/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,574 +294,15 @@ endif
 endif
 override PACKAGE_NAME=pcap
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=pcap
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=pcap
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=pcap
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1474,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1718,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1857,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -1967,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2228,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2285,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/pcap/Makefile.fpc b/packages/pcap/Makefile.fpc
index 568f841956..0d8dadbde6 100644
--- a/packages/pcap/Makefile.fpc
+++ b/packages/pcap/Makefile.fpc
@@ -1,13 +1,13 @@
 #
-#   Makefile.fpc for pcap bindings
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=pcap
 version=2.7.1
 
-[target]
-units=pcap
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -15,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src tests
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/pcap/Makefile.fpc.fpcmake b/packages/pcap/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..568f841956
--- /dev/null
+++ b/packages/pcap/Makefile.fpc.fpcmake
@@ -0,0 +1,23 @@
+#
+#   Makefile.fpc for pcap bindings
+#
+
+[package]
+name=pcap
+version=2.7.1
+
+[target]
+units=pcap
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/ptc/Makefile b/packages/ptc/Makefile
index 15ef134b28..83e27106cf 100644
--- a/packages/ptc/Makefile
+++ b/packages/ptc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,589 +294,15 @@ endif
 endif
 override PACKAGE_NAME=ptc
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue  p_ddraw
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue  p_ddraw
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=examples
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=src/dos/base src/dos/cga src/dos/vga src/dos/textfx2 src/dos/timeunit src/dos/vesa
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=src/win32/directx
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITDIR+=src/wince/gapi
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITDIR+=src/win32/directx
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITDIR+=src/wince/gapi
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper  src/win32/directx
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper  src/win32/directx
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1073,37 +499,6 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -1492,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1520,585 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl hermes fcl-base
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HERMES=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
-REQUIRE_PACKAGES_X11=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2138,44 +1376,6 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_HERMES
-PACKAGEDIR_HERMES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hermes/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_HERMES),)
-ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units/$(TARGETSUFFIX)),)
-UNITDIR_HERMES=$(PACKAGEDIR_HERMES)/units/$(TARGETSUFFIX)
-else
-UNITDIR_HERMES=$(PACKAGEDIR_HERMES)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_HERMES)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_HERMES) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_HERMES)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_HERMES=
-UNITDIR_HERMES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hermes/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_HERMES),)
-UNITDIR_HERMES:=$(firstword $(UNITDIR_HERMES))
-else
-UNITDIR_HERMES=
-endif
-endif
-ifdef UNITDIR_HERMES
-override COMPILER_UNITDIR+=$(UNITDIR_HERMES)
-endif
-ifdef UNITDIR_FPMAKE_HERMES
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HERMES)
-endif
-endif
 ifdef REQUIRE_PACKAGES_HASH
 PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_HASH),)
@@ -2328,82 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FCL-BASE
-PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_FCL-BASE),)
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),)
-UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)
-else
-UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_FCL-BASE)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_FCL-BASE=
-UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FCL-BASE),)
-UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE))
-else
-UNITDIR_FCL-BASE=
-endif
-endif
-ifdef UNITDIR_FCL-BASE
-override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE)
-endif
-ifdef UNITDIR_FPMAKE_FCL-BASE
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE)
-endif
-endif
-ifdef REQUIRE_PACKAGES_X11
-PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_X11),)
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)),)
-UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)
-else
-UNITDIR_X11=$(PACKAGEDIR_X11)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_X11)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_X11=
-UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_X11),)
-UNITDIR_X11:=$(firstword $(UNITDIR_X11))
-else
-UNITDIR_X11=
-endif
-endif
-ifdef UNITDIR_X11
-override COMPILER_UNITDIR+=$(UNITDIR_X11)
-endif
-ifdef UNITDIR_FPMAKE_X11
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11)
-endif
-endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -2420,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2525,12 +1653,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -2565,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2695,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2956,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -3013,262 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/ptc/Makefile.fpc b/packages/ptc/Makefile.fpc
index d1431f8e31..4b0183c164 100644
--- a/packages/ptc/Makefile.fpc
+++ b/packages/ptc/Makefile.fpc
@@ -1,37 +1,76 @@
 #
-#   Makefile.fpc for PTCPas
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=ptc
 version=2.7.1
 
-[target]
-units=ptc ptcwrapper ptceventqueue
-units_win32=p_ddraw
-units_win64=p_ddraw
-exampledirs=examples
-
-[compiler]
-#unitdir=src/ptcwrapper src/x11
-unitdir_go32v2=src/dos/base src/dos/cga src/dos/vga src/dos/textfx2 src/dos/timeunit src/dos/vesa
-unitdir_win32=src/win32/directx
-unitdir_win64=src/win32/directx
-sourcedir_win32=src/win32/directx
-sourcedir_win64=src/win32/directx
-unitdir_wince=src/wince/gapi
-sourcedir=src src/ptcwrapper
-
 [require]
-packages=hermes fcl-base
-packages_linux=x11
-packages_freebsd=x11
+packages=rtl fpmkunit
+
+[install]
+fpcpackage=y
 
 [default]
 fpcdir=../..
 
-[install]
-fpcpackage=y
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/ptc/Makefile.fpc.fpcmake b/packages/ptc/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..d1431f8e31
--- /dev/null
+++ b/packages/ptc/Makefile.fpc.fpcmake
@@ -0,0 +1,37 @@
+#
+#   Makefile.fpc for PTCPas
+#
+
+[package]
+name=ptc
+version=2.7.1
+
+[target]
+units=ptc ptcwrapper ptceventqueue
+units_win32=p_ddraw
+units_win64=p_ddraw
+exampledirs=examples
+
+[compiler]
+#unitdir=src/ptcwrapper src/x11
+unitdir_go32v2=src/dos/base src/dos/cga src/dos/vga src/dos/textfx2 src/dos/timeunit src/dos/vesa
+unitdir_win32=src/win32/directx
+unitdir_win64=src/win32/directx
+sourcedir_win32=src/win32/directx
+sourcedir_win64=src/win32/directx
+unitdir_wince=src/wince/gapi
+sourcedir=src src/ptcwrapper
+
+[require]
+packages=hermes fcl-base
+packages_linux=x11
+packages_freebsd=x11
+
+[default]
+fpcdir=../..
+
+[install]
+fpcpackage=y
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile
index c09d299284..1e6e8f5c91 100644
--- a/packages/pxlib/Makefile
+++ b/packages/pxlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,358 +294,15 @@ endif
 endif
 override PACKAGE_NAME=pxlib
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=pxlib
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=pxlib
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1230,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1258,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1486,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1502,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1641,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -1771,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2032,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2089,154 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/pxlib/Makefile.fpc b/packages/pxlib/Makefile.fpc
index e4ecf8e182..e57654b65b 100644
--- a/packages/pxlib/Makefile.fpc
+++ b/packages/pxlib/Makefile.fpc
@@ -1,39 +1,76 @@
 #
-#   Makefile.fpc for MD5 checksum.
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=pxlib
 version=2.7.1
 
-[target]
-units_beos=pxlib
-units_haiku=pxlib
-units_linux=pxlib
-units_win32=pxlib
-units_darwin=pxlib
-units_iphonesim=pxlib
-units_freebsd=pxlib
-units_openbsd=pxlib
-units_netbsd=pxlib
-exampledirs_beos=examples
-exampledirs_haiku=examples
-exampledirs_linux=examples
-exampledirs_win32=examples
-exampledirs_darwin=examples
-exampledirs_iphonesim=examples
-exampledirs_freebsd=examples
-exampledirs_openbsd=examples
-exampledirs_netbsd=examples
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
 
-[compiler]
-sourcedir=src
-
 [default]
 fpcdir=../..
 
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
+
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/pxlib/Makefile.fpc.fpcmake b/packages/pxlib/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..e4ecf8e182
--- /dev/null
+++ b/packages/pxlib/Makefile.fpc.fpcmake
@@ -0,0 +1,39 @@
+#
+#   Makefile.fpc for MD5 checksum.
+#
+
+[package]
+name=pxlib
+version=2.7.1
+
+[target]
+units_beos=pxlib
+units_haiku=pxlib
+units_linux=pxlib
+units_win32=pxlib
+units_darwin=pxlib
+units_iphonesim=pxlib
+units_freebsd=pxlib
+units_openbsd=pxlib
+units_netbsd=pxlib
+exampledirs_beos=examples
+exampledirs_haiku=examples
+exampledirs_linux=examples
+exampledirs_win32=examples
+exampledirs_darwin=examples
+exampledirs_iphonesim=examples
+exampledirs_freebsd=examples
+exampledirs_openbsd=examples
+exampledirs_netbsd=examples
+
+[install]
+fpcpackage=y
+
+[compiler]
+sourcedir=src
+
+[default]
+fpcdir=../..
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/rexx/Makefile b/packages/rexx/Makefile
index 9f0d6c4182..0764f576a9 100644
--- a/packages/rexx/Makefile
+++ b/packages/rexx/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,763 +294,15 @@ endif
 endif
 override PACKAGE_NAME=rexx
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=rexxsaa
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=examples
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests examples
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1635,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1663,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1891,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1907,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2046,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2176,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2437,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2494,262 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/rexx/Makefile.fpc b/packages/rexx/Makefile.fpc
index 1b11081fc5..9a51c82b06 100644
--- a/packages/rexx/Makefile.fpc
+++ b/packages/rexx/Makefile.fpc
@@ -1,15 +1,13 @@
 #
-#   Makefile.fpc for OpenGL for FPC
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=rexx
 version=2.7.1
 
-[target]
-units=rexxsaa
-
-exampledirs=examples
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -17,9 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
-[compiler]
-includedir=src
-sourcedir=src tests examples
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/rexx/Makefile.fpc.fpcmake b/packages/rexx/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..1b11081fc5
--- /dev/null
+++ b/packages/rexx/Makefile.fpc.fpcmake
@@ -0,0 +1,25 @@
+#
+#   Makefile.fpc for OpenGL for FPC
+#
+
+[package]
+name=rexx
+version=2.7.1
+
+[target]
+units=rexxsaa
+
+exampledirs=examples
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests examples
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/univint/Makefile b/packages/univint/Makefile
index 4bf74e64a3..520b7cf2de 100644
--- a/packages/univint/Makefile
+++ b/packages/univint/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,954 +294,15 @@ endif
 endif
 override PACKAGE_NAME=univint
 override PACKAGE_VERSION=2.7.1
-override FPCOPT+=-Mmacpas
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=MacOSAll MacOS
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-override INSTALL_BUILDUNIT=MacOS
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1826,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1854,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2082,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -2098,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2237,113 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples
-ifneq ($(TARGET_EXAMPLES),)
-HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
-override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
-override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
-override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)
-ifeq ($(OS_TARGET),os2)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-ifeq ($(OS_TARGET),emx)
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
-endif
-endif
-ifneq ($(TARGET_EXAMPLEDIRS),)
-HASEXAMPLES=1
-endif
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2367,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2628,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2685,263 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLES
-examples_all:
-	$(MAKE) -C examples all
-examples_debug:
-	$(MAKE) -C examples debug
-examples_smart:
-	$(MAKE) -C examples smart
-examples_release:
-	$(MAKE) -C examples release
-examples_units:
-	$(MAKE) -C examples units
-examples_examples:
-	$(MAKE) -C examples examples
-examples_shared:
-	$(MAKE) -C examples shared
-examples_install:
-	$(MAKE) -C examples install
-examples_sourceinstall:
-	$(MAKE) -C examples sourceinstall
-examples_exampleinstall:
-	$(MAKE) -C examples exampleinstall
-examples_distinstall:
-	$(MAKE) -C examples distinstall
-examples_zipinstall:
-	$(MAKE) -C examples zipinstall
-examples_zipsourceinstall:
-	$(MAKE) -C examples zipsourceinstall
-examples_zipexampleinstall:
-	$(MAKE) -C examples zipexampleinstall
-examples_zipdistinstall:
-	$(MAKE) -C examples zipdistinstall
-examples_clean:
-	$(MAKE) -C examples clean
-examples_distclean:
-	$(MAKE) -C examples distclean
-examples_cleanall:
-	$(MAKE) -C examples cleanall
-examples_info:
-	$(MAKE) -C examples info
-examples_makefiles:
-	$(MAKE) -C examples makefiles
+units:
 examples:
-	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples
-endif
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples: fpc_examples
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-MacOSAll$(PPUEXT): $(filter-out MacOS.pas GPCStrings.pas KeyEvents.pas,$(wildcard *.pas))
-MacOS$(PPUEXT): $(filter-out MacOSAll.pas,$(wildcard *.pas))
+.NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/univint/Makefile.fpc b/packages/univint/Makefile.fpc
index 9d7d813f67..88684a69c5 100644
--- a/packages/univint/Makefile.fpc
+++ b/packages/univint/Makefile.fpc
@@ -1,124 +1,76 @@
 #
-#   Makefile.fpc for Apple Universal Interfaces for Free Pascal
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=univint
 version=2.7.1
 
-[target]
-units=MacOSAll MacOS
-implicitunits=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel \
-  AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry \
-  AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes \
-  ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening \
-  ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes \
-  AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants \
-  AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString \
-  AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance \
-  AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs \
-  AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews \
-  AudioUnitParameters AudioUnitProperties AuthSession Authorization \
-  AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray \
-  CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle \
-  CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter \
-  CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage \
-  CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics \
-  CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber \
-  CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList \
-  CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString \
-  CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess \
-  CFUUID \
-  CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase \
-  CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer \
-  CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration \
-  CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont \
-  CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination \
-  CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler \
-  CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray \
-  CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject \
-  CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString \
-  CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading \
-  CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority \
-  CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager \
-  CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine \
-  CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase \
-  CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer \
-  CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer \
-  CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents \
-  CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM \
-  ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform \
-  Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes \
-  CoreFoundation CoreGraphics CoreText DADisk DASession \
-  DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary \
-  DigitalHubRegistry Displays Drag DrawSprocket DriverServices \
-  DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files \
-  Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu \
-  GPCStrings \
-  HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox \
-  HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews \
-  HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton \
-  HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView \
-  HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils \
-  HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView \
-  HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication \
-  ICACamera ICADevice IconStorage Icons IconsCore ImageCodec \
-  ImageCompression InternetConfig IntlResources \
-  IOKitReturn IOSurfaceAPI KeyEvents Keyboards \
-  KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList \
-  LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem \
-  MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup \
-  MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory \
-  MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions \
-  Math64 MediaHandlers Menus MixedMode Movies MoviesFormat \
-  MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation \
-  Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime \
-  OpenTransport OpenTransportProtocol OpenTransportProviders \
-  PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated \
-  PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors \
-  PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes \
-  Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen \
-  QDPictToCGContext \
-  QLBase QLGenerator QLThumbnailImage \
-  QTML QTSMovie QTStreamingComponents QuickTimeComponents \
-  QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR \
-  QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources \
-  SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific \
-  SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection \
-  SCNetworkReachability SCPreferences SCPreferencesPath \
-  SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes \
-  SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound \
-  SpeechRecognition \
-  SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE \
-  TextCommon TextEdit TextEncodingConverter TextEncodingPlugin \
-  TextInputSources TextServices TextUtils Threads Timer ToolUtils \
-  Translation TranslationExtensions TranslationServices TypeSelect \
-  URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities \
-  UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas \
-  certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype \
-  fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext \
-  macglu mach_error vBLAS vDSP x509defs xattr 
-exampledirs=examples
+[require]
+packages=rtl fpmkunit
 
-[libs]
-libversion=2.0.0
-
-# FPCMacOSAll is not a build unit, but directly includes the code of
-# most other units
 [install]
-buildunit=MacOS
 fpcpackage=y
 
-[compiler]
-includedir=src
-sourcedir=src tests
-
 [default]
 fpcdir=../..
 
 [prerules]
-override FPCOPT+=-Mmacpas
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
-MacOSAll$(PPUEXT): $(filter-out MacOS.pas GPCStrings.pas KeyEvents.pas,$(wildcard *.pas))
-MacOS$(PPUEXT): $(filter-out MacOSAll.pas,$(wildcard *.pas))
+.NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/univint/Makefile.fpc.fpcmake b/packages/univint/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..9d7d813f67
--- /dev/null
+++ b/packages/univint/Makefile.fpc.fpcmake
@@ -0,0 +1,124 @@
+#
+#   Makefile.fpc for Apple Universal Interfaces for Free Pascal
+#
+
+[package]
+name=univint
+version=2.7.1
+
+[target]
+units=MacOSAll MacOS
+implicitunits=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel \
+  AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry \
+  AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes \
+  ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening \
+  ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes \
+  AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants \
+  AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString \
+  AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance \
+  AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs \
+  AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews \
+  AudioUnitParameters AudioUnitProperties AuthSession Authorization \
+  AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray \
+  CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle \
+  CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter \
+  CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage \
+  CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics \
+  CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber \
+  CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList \
+  CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString \
+  CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess \
+  CFUUID \
+  CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase \
+  CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer \
+  CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration \
+  CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont \
+  CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination \
+  CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler \
+  CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray \
+  CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject \
+  CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString \
+  CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading \
+  CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority \
+  CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager \
+  CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine \
+  CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase \
+  CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer \
+  CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer \
+  CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents \
+  CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM \
+  ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform \
+  Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes \
+  CoreFoundation CoreGraphics CoreText DADisk DASession \
+  DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary \
+  DigitalHubRegistry Displays Drag DrawSprocket DriverServices \
+  DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files \
+  Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu \
+  GPCStrings \
+  HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox \
+  HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews \
+  HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton \
+  HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView \
+  HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils \
+  HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView \
+  HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication \
+  ICACamera ICADevice IconStorage Icons IconsCore ImageCodec \
+  ImageCompression InternetConfig IntlResources \
+  IOKitReturn IOSurfaceAPI KeyEvents Keyboards \
+  KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList \
+  LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem \
+  MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup \
+  MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory \
+  MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions \
+  Math64 MediaHandlers Menus MixedMode Movies MoviesFormat \
+  MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation \
+  Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime \
+  OpenTransport OpenTransportProtocol OpenTransportProviders \
+  PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated \
+  PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors \
+  PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes \
+  Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen \
+  QDPictToCGContext \
+  QLBase QLGenerator QLThumbnailImage \
+  QTML QTSMovie QTStreamingComponents QuickTimeComponents \
+  QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR \
+  QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources \
+  SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific \
+  SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection \
+  SCNetworkReachability SCPreferences SCPreferencesPath \
+  SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes \
+  SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound \
+  SpeechRecognition \
+  SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE \
+  TextCommon TextEdit TextEncodingConverter TextEncodingPlugin \
+  TextInputSources TextServices TextUtils Threads Timer ToolUtils \
+  Translation TranslationExtensions TranslationServices TypeSelect \
+  URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities \
+  UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas \
+  certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype \
+  fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext \
+  macglu mach_error vBLAS vDSP x509defs xattr 
+exampledirs=examples
+
+[libs]
+libversion=2.0.0
+
+# FPCMacOSAll is not a build unit, but directly includes the code of
+# most other units
+[install]
+buildunit=MacOS
+fpcpackage=y
+
+[compiler]
+includedir=src
+sourcedir=src tests
+
+[default]
+fpcdir=../..
+
+[prerules]
+override FPCOPT+=-Mmacpas
+
+[rules]
+MacOSAll$(PPUEXT): $(filter-out MacOS.pas GPCStrings.pas KeyEvents.pas,$(wildcard *.pas))
+MacOS$(PPUEXT): $(filter-out MacOSAll.pas,$(wildcard *.pas))
diff --git a/packages/unixutil/Makefile b/packages/unixutil/Makefile
index cccf10f972..71079b61ce 100644
--- a/packages/unixutil/Makefile
+++ b/packages/unixutil/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,763 +294,15 @@ endif
 endif
 override PACKAGE_NAME=unixutil
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=unixutils
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=unixutils
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=unixutils
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1247,37 +499,6 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1694,573 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl libc fcl-base
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_LIBC=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-BASE=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -2300,44 +1376,6 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_LIBC
-PACKAGEDIR_LIBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libc/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_LIBC),)
-ifneq ($(wildcard $(PACKAGEDIR_LIBC)/units/$(TARGETSUFFIX)),)
-UNITDIR_LIBC=$(PACKAGEDIR_LIBC)/units/$(TARGETSUFFIX)
-else
-UNITDIR_LIBC=$(PACKAGEDIR_LIBC)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_LIBC)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_LIBC=$(PACKAGEDIR_LIBC)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_LIBC)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_LIBC=$(PACKAGEDIR_LIBC)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_LIBC=$(PACKAGEDIR_LIBC)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_LIBC)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_LIBC) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBC)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_LIBC=
-UNITDIR_LIBC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libc/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_LIBC),)
-UNITDIR_LIBC:=$(firstword $(UNITDIR_LIBC))
-else
-UNITDIR_LIBC=
-endif
-endif
-ifdef UNITDIR_LIBC
-override COMPILER_UNITDIR+=$(UNITDIR_LIBC)
-endif
-ifdef UNITDIR_FPMAKE_LIBC
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBC)
-endif
-endif
 ifdef REQUIRE_PACKAGES_HASH
 PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_HASH),)
@@ -2490,44 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FCL-BASE
-PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_FCL-BASE),)
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),)
-UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)
-else
-UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
-endif
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
-endif
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_FCL-BASE)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_FCL-BASE=
-UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FCL-BASE),)
-UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE))
-else
-UNITDIR_FCL-BASE=
-endif
-endif
-ifdef UNITDIR_FCL-BASE
-override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE)
-endif
-ifdef UNITDIR_FPMAKE_FCL-BASE
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE)
-endif
-endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -2544,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -2649,12 +1653,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -2689,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2799,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -3060,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -3117,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/unixutil/Makefile.fpc b/packages/unixutil/Makefile.fpc
index 8922aa6041..f3062247b7 100644
--- a/packages/unixutil/Makefile.fpc
+++ b/packages/unixutil/Makefile.fpc
@@ -1,22 +1,13 @@
 #
-#   Makefile.fpc for libc binding
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=unixutil
 version=2.7.1
 
-[target]
-units=unixutils
-rsts=unixutils
-
 [require]
-libc=y
-packages=libc fcl-base
-
-[compiler]
-includedir=src
-sourcedir=src tests
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -24,5 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
+
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/unixutil/Makefile.fpc.fpcmake b/packages/unixutil/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..8922aa6041
--- /dev/null
+++ b/packages/unixutil/Makefile.fpc.fpcmake
@@ -0,0 +1,28 @@
+#
+#   Makefile.fpc for libc binding
+#
+
+[package]
+name=unixutil
+version=2.7.1
+
+[target]
+units=unixutils
+rsts=unixutils
+
+[require]
+libc=y
+packages=libc fcl-base
+
+[compiler]
+includedir=src
+sourcedir=src tests
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[rules]
+.NOTPARALLEL:
diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile
index 016e12a353..089eb3da5c 100644
--- a/packages/unzip/Makefile
+++ b/packages/unzip/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/14]
 #
 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -294,574 +294,15 @@ endif
 endif
 override PACKAGE_NAME=unzip
 override PACKAGE_VERSION=2.7.1
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=ziptypes unzip51g  unzipdll
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=ziptypes unzip51g
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=ziptypes unzip51g  unzipdll
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=ziptypes unzip51g
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=ziptypes unzip51g
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_INCLUDEDIR+=src
-endif
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_SOURCEDIR+=src tests
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_SOURCEDIR+=src tests
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@@ -1474,195 +896,447 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl 
+override REQUIRE_PACKAGES=rtl fpmkunit
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_FPMKUNIT=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
 endif
 endif
+ifdef REQUIRE_PACKAGES_HASH
+PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_HASH),)
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
+UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_HASH=$(PACKAGEDIR_HASH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_HASH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_HASH=
+UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_HASH),)
+UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
+else
+UNITDIR_HASH=
+endif
+endif
+ifdef UNITDIR_HASH
+override COMPILER_UNITDIR+=$(UNITDIR_HASH)
+endif
+ifdef UNITDIR_FPMAKE_HASH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
+endif
+endif
+ifdef REQUIRE_PACKAGES_PASZLIB
+PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PASZLIB),)
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
+else
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PASZLIB=
+UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PASZLIB),)
+UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB))
+else
+UNITDIR_PASZLIB=
+endif
+endif
+ifdef UNITDIR_PASZLIB
+override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
+endif
+ifdef UNITDIR_FPMAKE_PASZLIB
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-PROCESS
+PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-PROCESS),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-PROCESS=
+UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-PROCESS),)
+UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS))
+else
+UNITDIR_FCL-PROCESS=
+endif
+endif
+ifdef UNITDIR_FCL-PROCESS
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS)
+endif
+ifdef UNITDIR_FPMAKE_FCL-PROCESS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FPMKUNIT
+PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FPMKUNIT),)
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),)
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FPMKUNIT=
+UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FPMKUNIT),)
+UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT))
+else
+UNITDIR_FPMKUNIT=
+endif
+endif
+ifdef UNITDIR_FPMKUNIT
+override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT)
+endif
+ifdef UNITDIR_FPMAKE_FPMKUNIT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
@@ -1718,12 +1544,16 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1857,93 +1687,10 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -1967,9 +1714,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -2228,7 +1972,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
@@ -2285,28 +2028,59 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
+units:
 examples:
-shared: fpc_shared
-install: fpc_install
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
-distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
 makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
diff --git a/packages/unzip/Makefile.fpc b/packages/unzip/Makefile.fpc
index c054c51128..91412c2904 100644
--- a/packages/unzip/Makefile.fpc
+++ b/packages/unzip/Makefile.fpc
@@ -1,19 +1,13 @@
 #
-#   Makefile.fpc for Unzip
+#   Makefile.fpc for running fpmake
 #
 
 [package]
 name=unzip
 version=2.7.1
 
-[target]
-units=ziptypes unzip51g
-units_emx=unzipdll
-units_os2=unzipdll
-
-[compiler]
-includedir=src
-sourcedir=src tests
+[require]
+packages=rtl fpmkunit
 
 [install]
 fpcpackage=y
@@ -21,5 +15,62 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
+[prerules]
+FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
+ifdef OS_TARGET
+FPC_TARGETOPT+=--os=$(OS_TARGET)
+endif
+ifdef CPU_TARGET
+FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
+endif
+LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
+
 [rules]
 .NOTPARALLEL:
+
+fpmake: fpmake.pp
+	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT)
+all:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu
+smart:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX
+release:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE
+debug:	fpmake
+	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
+# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
+# most often fail because the dependencies are cleared.
+# In case of a clean, simply do nothing
+ifeq ($(FPMAKE_BIN_CLEAN),)
+clean:	
+else
+clean:	
+	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
+# when the package is compiled using fpcmake prior to running this clean using fpmake
+ifeq ($(FPMAKE_BIN_CLEAN),)
+distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
+else
+distclean:	
+ifdef inUnix
+        { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
+	-$(DEL) $(LOCALFPMAKE)
+endif
+install:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
+endif
+# distinstall also installs the example-sources
+distinstall:	fpmake
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)  --unitinstalldir=$(INSTALL_UNITDIR) -ie
+endif
+
diff --git a/packages/unzip/Makefile.fpc.fpcmake b/packages/unzip/Makefile.fpc.fpcmake
new file mode 100644
index 0000000000..c054c51128
--- /dev/null
+++ b/packages/unzip/Makefile.fpc.fpcmake
@@ -0,0 +1,25 @@
+#
+#   Makefile.fpc for Unzip
+#
+
+[package]
+name=unzip
+version=2.7.1
+
+[target]
+units=ziptypes unzip51g
+units_emx=unzipdll
+units_os2=unzipdll
+
+[compiler]
+includedir=src
+sourcedir=src tests
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+
+[rules]
+.NOTPARALLEL: