Merged revisions 7541 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
r7541 | peter | 2007-05-31 21:59:21 +0200 (Thu, 31 May 2007) | 2 lines

  * fpmkunit added

........

git-svn-id: branches/fixes_2_2@7709 -

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/04/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/05/31]
 #
 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-darwin powerpc64-embedded
@@ -231,160 +231,160 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra  fcl-web
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_DIRS+=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+override TARGET_DIRS+=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages
@@ -1149,7 +1149,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+override FPCOPT+=-XP$(BINUTILSPREFIX) 
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1463,6 +1463,7 @@ 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_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1476,6 +1477,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1488,6 +1490,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1501,6 +1504,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1513,6 +1517,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1526,6 +1531,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1538,6 +1544,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1551,6 +1558,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1564,6 +1572,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1576,6 +1585,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1588,6 +1598,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1601,6 +1612,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1613,6 +1625,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1626,6 +1639,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1638,6 +1652,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1650,6 +1665,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1662,6 +1678,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1675,6 +1692,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1687,6 +1705,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1699,6 +1718,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1712,6 +1732,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1725,6 +1746,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1738,6 +1760,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1750,6 +1773,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1762,6 +1786,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1775,6 +1800,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1787,6 +1813,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1799,6 +1826,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1812,6 +1840,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1825,6 +1854,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1837,6 +1867,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1849,6 +1880,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1862,6 +1894,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1874,6 +1907,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1886,6 +1920,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1899,6 +1934,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1912,6 +1948,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1925,6 +1962,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1937,6 +1975,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1950,6 +1989,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1963,6 +2003,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1976,6 +2017,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -1988,6 +2030,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2001,6 +2044,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2013,6 +2057,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2026,6 +2071,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2038,6 +2084,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2050,6 +2097,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2062,6 +2110,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2074,6 +2123,7 @@ TARGET_DIRS_EXTRA=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2087,6 +2137,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2100,6 +2151,7 @@ TARGET_DIRS_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 TARGET_DIRS_BASE=1
+TARGET_DIRS_FPMKUNIT=1
 TARGET_DIRS_FCL-BASE=1
 TARGET_DIRS_FCL-DB=1
 TARGET_DIRS_FCL-IMAGE=1
@@ -2155,6 +2207,51 @@ 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_FPMKUNIT
+fpmkunit_all:
+	$(MAKE) -C fpmkunit all
+fpmkunit_debug:
+	$(MAKE) -C fpmkunit debug
+fpmkunit_smart:
+	$(MAKE) -C fpmkunit smart
+fpmkunit_release:
+	$(MAKE) -C fpmkunit release
+fpmkunit_units:
+	$(MAKE) -C fpmkunit units
+fpmkunit_examples:
+	$(MAKE) -C fpmkunit examples
+fpmkunit_shared:
+	$(MAKE) -C fpmkunit shared
+fpmkunit_install:
+	$(MAKE) -C fpmkunit install
+fpmkunit_sourceinstall:
+	$(MAKE) -C fpmkunit sourceinstall
+fpmkunit_exampleinstall:
+	$(MAKE) -C fpmkunit exampleinstall
+fpmkunit_distinstall:
+	$(MAKE) -C fpmkunit distinstall
+fpmkunit_zipinstall:
+	$(MAKE) -C fpmkunit zipinstall
+fpmkunit_zipsourceinstall:
+	$(MAKE) -C fpmkunit zipsourceinstall
+fpmkunit_zipexampleinstall:
+	$(MAKE) -C fpmkunit zipexampleinstall
+fpmkunit_zipdistinstall:
+	$(MAKE) -C fpmkunit zipdistinstall
+fpmkunit_clean:
+	$(MAKE) -C fpmkunit clean
+fpmkunit_distclean:
+	$(MAKE) -C fpmkunit distclean
+fpmkunit_cleanall:
+	$(MAKE) -C fpmkunit cleanall
+fpmkunit_info:
+	$(MAKE) -C fpmkunit info
+fpmkunit_makefiles:
+	$(MAKE) -C fpmkunit makefiles
+fpmkunit:
+	$(MAKE) -C fpmkunit all
+.PHONY: fpmkunit_all fpmkunit_debug fpmkunit_smart fpmkunit_release fpmkunit_units fpmkunit_examples fpmkunit_shared fpmkunit_install fpmkunit_sourceinstall fpmkunit_exampleinstall fpmkunit_distinstall fpmkunit_zipinstall fpmkunit_zipsourceinstall fpmkunit_zipexampleinstall fpmkunit_zipdistinstall fpmkunit_clean fpmkunit_distclean fpmkunit_cleanall fpmkunit_info fpmkunit_makefiles fpmkunit
+endif
 ifdef TARGET_DIRS_FCL-BASE
 fcl-base_all:
 	$(MAKE) -C fcl-base all

packages/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [target]
-dirs=base fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
+dirs=base fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit extra
 dirs_freebsd=fcl-web
 dirs_darwin=fcl-web
 dirs_solaris=fcl-web