* Reordered so it all compiles

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

1 files changed, 208 insertions, 379 deletions

diff --git a/packages/Makefile b/packages/Makefile
index 6a7760adb2..b37754d1c0 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/02/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -229,159 +229,129 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_DIRS+=base extra fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
+override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fcl-fpcunit extra
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages
@@ -711,10 +681,6 @@ EXEEXT=.gba
 SHAREDLIBEXT=.so
 SHORTSUFFIX=gba
 endif
-ifeq ($(OS_TARGET),symbian)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=symbian
-endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1183,7 +1149,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -1242,13 +1208,6 @@ ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-Aas
 endif
 endif
-ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
-ifeq ($(CPU_TARGET),x86_64)
-override FPCOPT+=-Cg
-endif
-endif
-endif
 ifdef LINKSHARED
 endif
 ifdef OPT
@@ -1460,666 +1419,536 @@ fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 ifeq ($(FULL_TARGET),i386-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_DIRS_BASE=1
 TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_FCL-FPCUNIT=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_DIRS_BASE=1
 TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
 endif
-ifeq ($(FULL_TARGET),arm-embedded)
+ifeq ($(FULL_TARGET),arm-gba)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
-TARGET_DIRS_FCL-FPCUNIT=1
 TARGET_DIRS_FCL-IMAGE=1
 TARGET_DIRS_FCL-NET=1
 TARGET_DIRS_FCL-PASSRC=1
 TARGET_DIRS_FCL-REGISTRY=1
 TARGET_DIRS_FCL-WEB=1
 TARGET_DIRS_FCL-XML=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_DIRS_BASE=1
-TARGET_DIRS_EXTRA=1
-TARGET_DIRS_FCL-BASE=1
-TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-FPCUNIT=1
-TARGET_DIRS_FCL-IMAGE=1
-TARGET_DIRS_FCL-NET=1
-TARGET_DIRS_FCL-PASSRC=1
-TARGET_DIRS_FCL-REGISTRY=1
-TARGET_DIRS_FCL-WEB=1
-TARGET_DIRS_FCL-XML=1
+TARGET_DIRS_EXTRA=1
 endif
 ifdef TARGET_DIRS_BASE
 base_all:
@@ -2166,51 +1995,6 @@ base:
 	$(MAKE) -C base all
 .PHONY: base_all base_debug base_smart base_release base_units base_examples base_shared base_install base_sourceinstall base_exampleinstall base_distinstall base_zipinstall base_zipsourceinstall base_zipexampleinstall base_zipdistinstall base_clean base_distclean base_cleanall base_info base_makefiles base
 endif
-ifdef TARGET_DIRS_EXTRA
-extra_all:
-	$(MAKE) -C extra all
-extra_debug:
-	$(MAKE) -C extra debug
-extra_smart:
-	$(MAKE) -C extra smart
-extra_release:
-	$(MAKE) -C extra release
-extra_units:
-	$(MAKE) -C extra units
-extra_examples:
-	$(MAKE) -C extra examples
-extra_shared:
-	$(MAKE) -C extra shared
-extra_install:
-	$(MAKE) -C extra install
-extra_sourceinstall:
-	$(MAKE) -C extra sourceinstall
-extra_exampleinstall:
-	$(MAKE) -C extra exampleinstall
-extra_distinstall:
-	$(MAKE) -C extra distinstall
-extra_zipinstall:
-	$(MAKE) -C extra zipinstall
-extra_zipsourceinstall:
-	$(MAKE) -C extra zipsourceinstall
-extra_zipexampleinstall:
-	$(MAKE) -C extra zipexampleinstall
-extra_zipdistinstall:
-	$(MAKE) -C extra zipdistinstall
-extra_clean:
-	$(MAKE) -C extra clean
-extra_distclean:
-	$(MAKE) -C extra distclean
-extra_cleanall:
-	$(MAKE) -C extra cleanall
-extra_info:
-	$(MAKE) -C extra info
-extra_makefiles:
-	$(MAKE) -C extra makefiles
-extra:
-	$(MAKE) -C extra all
-.PHONY: extra_all extra_debug extra_smart extra_release extra_units extra_examples extra_shared extra_install extra_sourceinstall extra_exampleinstall extra_distinstall extra_zipinstall extra_zipsourceinstall extra_zipexampleinstall extra_zipdistinstall extra_clean extra_distclean extra_cleanall extra_info extra_makefiles extra
-endif
 ifdef TARGET_DIRS_FCL-BASE
 fcl-base_all:
 	$(MAKE) -C fcl-base all
@@ -2301,51 +2085,6 @@ fcl-db:
 	$(MAKE) -C fcl-db all
 .PHONY: fcl-db_all fcl-db_debug fcl-db_smart fcl-db_release fcl-db_units fcl-db_examples fcl-db_shared fcl-db_install fcl-db_sourceinstall fcl-db_exampleinstall fcl-db_distinstall fcl-db_zipinstall fcl-db_zipsourceinstall fcl-db_zipexampleinstall fcl-db_zipdistinstall fcl-db_clean fcl-db_distclean fcl-db_cleanall fcl-db_info fcl-db_makefiles fcl-db
 endif
-ifdef TARGET_DIRS_FCL-FPCUNIT
-fcl-fpcunit_all:
-	$(MAKE) -C fcl-fpcunit all
-fcl-fpcunit_debug:
-	$(MAKE) -C fcl-fpcunit debug
-fcl-fpcunit_smart:
-	$(MAKE) -C fcl-fpcunit smart
-fcl-fpcunit_release:
-	$(MAKE) -C fcl-fpcunit release
-fcl-fpcunit_units:
-	$(MAKE) -C fcl-fpcunit units
-fcl-fpcunit_examples:
-	$(MAKE) -C fcl-fpcunit examples
-fcl-fpcunit_shared:
-	$(MAKE) -C fcl-fpcunit shared
-fcl-fpcunit_install:
-	$(MAKE) -C fcl-fpcunit install
-fcl-fpcunit_sourceinstall:
-	$(MAKE) -C fcl-fpcunit sourceinstall
-fcl-fpcunit_exampleinstall:
-	$(MAKE) -C fcl-fpcunit exampleinstall
-fcl-fpcunit_distinstall:
-	$(MAKE) -C fcl-fpcunit distinstall
-fcl-fpcunit_zipinstall:
-	$(MAKE) -C fcl-fpcunit zipinstall
-fcl-fpcunit_zipsourceinstall:
-	$(MAKE) -C fcl-fpcunit zipsourceinstall
-fcl-fpcunit_zipexampleinstall:
-	$(MAKE) -C fcl-fpcunit zipexampleinstall
-fcl-fpcunit_zipdistinstall:
-	$(MAKE) -C fcl-fpcunit zipdistinstall
-fcl-fpcunit_clean:
-	$(MAKE) -C fcl-fpcunit clean
-fcl-fpcunit_distclean:
-	$(MAKE) -C fcl-fpcunit distclean
-fcl-fpcunit_cleanall:
-	$(MAKE) -C fcl-fpcunit cleanall
-fcl-fpcunit_info:
-	$(MAKE) -C fcl-fpcunit info
-fcl-fpcunit_makefiles:
-	$(MAKE) -C fcl-fpcunit makefiles
-fcl-fpcunit:
-	$(MAKE) -C fcl-fpcunit all
-.PHONY: fcl-fpcunit_all fcl-fpcunit_debug fcl-fpcunit_smart fcl-fpcunit_release fcl-fpcunit_units fcl-fpcunit_examples fcl-fpcunit_shared fcl-fpcunit_install fcl-fpcunit_sourceinstall fcl-fpcunit_exampleinstall fcl-fpcunit_distinstall fcl-fpcunit_zipinstall fcl-fpcunit_zipsourceinstall fcl-fpcunit_zipexampleinstall fcl-fpcunit_zipdistinstall fcl-fpcunit_clean fcl-fpcunit_distclean fcl-fpcunit_cleanall fcl-fpcunit_info fcl-fpcunit_makefiles fcl-fpcunit
-endif
 ifdef TARGET_DIRS_FCL-IMAGE
 fcl-image_all:
 	$(MAKE) -C fcl-image all
@@ -2616,6 +2355,96 @@ fcl-xml:
 	$(MAKE) -C fcl-xml all
 .PHONY: fcl-xml_all fcl-xml_debug fcl-xml_smart fcl-xml_release fcl-xml_units fcl-xml_examples fcl-xml_shared fcl-xml_install fcl-xml_sourceinstall fcl-xml_exampleinstall fcl-xml_distinstall fcl-xml_zipinstall fcl-xml_zipsourceinstall fcl-xml_zipexampleinstall fcl-xml_zipdistinstall fcl-xml_clean fcl-xml_distclean fcl-xml_cleanall fcl-xml_info fcl-xml_makefiles fcl-xml
 endif
+ifdef TARGET_DIRS_FCL-FPCUNIT
+fcl-fpcunit_all:
+	$(MAKE) -C fcl-fpcunit all
+fcl-fpcunit_debug:
+	$(MAKE) -C fcl-fpcunit debug
+fcl-fpcunit_smart:
+	$(MAKE) -C fcl-fpcunit smart
+fcl-fpcunit_release:
+	$(MAKE) -C fcl-fpcunit release
+fcl-fpcunit_units:
+	$(MAKE) -C fcl-fpcunit units
+fcl-fpcunit_examples:
+	$(MAKE) -C fcl-fpcunit examples
+fcl-fpcunit_shared:
+	$(MAKE) -C fcl-fpcunit shared
+fcl-fpcunit_install:
+	$(MAKE) -C fcl-fpcunit install
+fcl-fpcunit_sourceinstall:
+	$(MAKE) -C fcl-fpcunit sourceinstall
+fcl-fpcunit_exampleinstall:
+	$(MAKE) -C fcl-fpcunit exampleinstall
+fcl-fpcunit_distinstall:
+	$(MAKE) -C fcl-fpcunit distinstall
+fcl-fpcunit_zipinstall:
+	$(MAKE) -C fcl-fpcunit zipinstall
+fcl-fpcunit_zipsourceinstall:
+	$(MAKE) -C fcl-fpcunit zipsourceinstall
+fcl-fpcunit_zipexampleinstall:
+	$(MAKE) -C fcl-fpcunit zipexampleinstall
+fcl-fpcunit_zipdistinstall:
+	$(MAKE) -C fcl-fpcunit zipdistinstall
+fcl-fpcunit_clean:
+	$(MAKE) -C fcl-fpcunit clean
+fcl-fpcunit_distclean:
+	$(MAKE) -C fcl-fpcunit distclean
+fcl-fpcunit_cleanall:
+	$(MAKE) -C fcl-fpcunit cleanall
+fcl-fpcunit_info:
+	$(MAKE) -C fcl-fpcunit info
+fcl-fpcunit_makefiles:
+	$(MAKE) -C fcl-fpcunit makefiles
+fcl-fpcunit:
+	$(MAKE) -C fcl-fpcunit all
+.PHONY: fcl-fpcunit_all fcl-fpcunit_debug fcl-fpcunit_smart fcl-fpcunit_release fcl-fpcunit_units fcl-fpcunit_examples fcl-fpcunit_shared fcl-fpcunit_install fcl-fpcunit_sourceinstall fcl-fpcunit_exampleinstall fcl-fpcunit_distinstall fcl-fpcunit_zipinstall fcl-fpcunit_zipsourceinstall fcl-fpcunit_zipexampleinstall fcl-fpcunit_zipdistinstall fcl-fpcunit_clean fcl-fpcunit_distclean fcl-fpcunit_cleanall fcl-fpcunit_info fcl-fpcunit_makefiles fcl-fpcunit
+endif
+ifdef TARGET_DIRS_EXTRA
+extra_all:
+	$(MAKE) -C extra all
+extra_debug:
+	$(MAKE) -C extra debug
+extra_smart:
+	$(MAKE) -C extra smart
+extra_release:
+	$(MAKE) -C extra release
+extra_units:
+	$(MAKE) -C extra units
+extra_examples:
+	$(MAKE) -C extra examples
+extra_shared:
+	$(MAKE) -C extra shared
+extra_install:
+	$(MAKE) -C extra install
+extra_sourceinstall:
+	$(MAKE) -C extra sourceinstall
+extra_exampleinstall:
+	$(MAKE) -C extra exampleinstall
+extra_distinstall:
+	$(MAKE) -C extra distinstall
+extra_zipinstall:
+	$(MAKE) -C extra zipinstall
+extra_zipsourceinstall:
+	$(MAKE) -C extra zipsourceinstall
+extra_zipexampleinstall:
+	$(MAKE) -C extra zipexampleinstall
+extra_zipdistinstall:
+	$(MAKE) -C extra zipdistinstall
+extra_clean:
+	$(MAKE) -C extra clean
+extra_distclean:
+	$(MAKE) -C extra distclean
+extra_cleanall:
+	$(MAKE) -C extra cleanall
+extra_info:
+	$(MAKE) -C extra info
+extra_makefiles:
+	$(MAKE) -C extra makefiles
+extra:
+	$(MAKE) -C extra all
+.PHONY: extra_all extra_debug extra_smart extra_release extra_units extra_examples extra_shared extra_install extra_sourceinstall extra_exampleinstall extra_distinstall extra_zipinstall extra_zipsourceinstall extra_zipexampleinstall extra_zipdistinstall extra_clean extra_distclean extra_cleanall extra_info extra_makefiles extra
+endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))