From c5eb5eb2401a539fe9635c1bc01480762e3d1bae Mon Sep 17 00:00:00 2001 From: joost Date: Wed, 22 Jun 2011 20:01:19 +0000 Subject: [PATCH] * Removed libcurl dependency from fppkg * Added fcl-web dependency of fppkg to main packages makefile git-svn-id: trunk@17801 - --- packages/Makefile | 56 +- packages/Makefile.fpc | 12 +- packages/fppkg/Makefile | 1089 +++++++++-------------------------- packages/fppkg/Makefile.fpc | 2 +- 4 files changed, 304 insertions(+), 855 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index da70a2575b..e42818c285 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/22] # 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 @@ -107,25 +107,37 @@ FPC=$(PP) endif endif ifndef FPC +DETERMINE_NATIVE_COMPILER=1 +else +ifdef CROSSCOMPILE +ifndef FPCFPMAKE +DETERMINE_NATIVE_COMPILER=1 +endif +endif +endif +ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPC:=$(shell $(FPCPROG) -PB) +FPCNATIVE:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPC)),) -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPCNATIVE)),) +override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPC))),) -FPC:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPCNATIVE))),) +FPCNATIVE:=$(firstword $(FPCPROG)) endif endif else -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif endif +ifndef FPC +FPC=$(FPCNATIVE) +endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) FOUNDFPC:=$(strip $(wildcard $(FPC))) @@ -267,24 +279,14 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F ifndef FPCFPMAKE ifdef CROSSCOMPILE ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) -FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) -ifneq ($(FPCPROG),) -FPCPROG:=$(firstword $(FPCPROG)) -FPCFPMAKE:=$(shell $(FPCPROG) -PB) -ifeq ($(strip $(wildcard $(FPCFPMAKE))),) -FPCFPMAKE:=$(firstword $(FPCPROG)) -endif -else -override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) -endif +FPCFPMAKE:=$(FPCNATIVE) else FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) -FPMAKE_SKIP_CONFIG=-n export FPCFPMAKE -export FPMAKE_SKIP_CONFIG endif else FPCFPMAKE=$(FPC) +export FPCFPMAKE endif endif ifeq ($(FULL_TARGET),i386-linux) @@ -9681,12 +9683,12 @@ cocoaint_smart: univint_smart cocoaint_release: univint_release cocoaint_shared: univint_shared endif -ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux),) -fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all libcurl_all fcl-web_all -fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug libcurl_debug fcl-web_debug -fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart libcurl_smart fcl-web_smart -fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release libcurl_release fcl-web_release -fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared libcurl_shared fcl-web_shared +ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux win32 win64 wince),) +fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all +fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug +fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart +fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release +fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared else fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug @@ -9934,7 +9936,7 @@ opencl_debug: opengl_debug opencl_smart: opengl_smart opencl_release: opengl_release opencl_shared: opengl_shared -ifeq ($(findstring $(OS_TARGET),go32v2),) +ifeq ($(findstring $(OS_TARGET),go32v2 win32 win64 wince),) fppkg_all: fcl-web_all fppkg_debug: fcl-web_debug fppkg_smart: fcl-web_smart diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 4ac1c904cb..52207de72a 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -128,12 +128,12 @@ cocoaint_release: univint_release cocoaint_shared: univint_shared endif -ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux),) -fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all libcurl_all fcl-web_all -fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug libcurl_debug fcl-web_debug -fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart libcurl_smart fcl-web_smart -fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release libcurl_release fcl-web_release -fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared libcurl_shared fcl-web_shared +ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux win32 win64 wince),) +fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all +fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug +fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart +fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release +fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared else fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug diff --git a/packages/fppkg/Makefile b/packages/fppkg/Makefile index f559f0112a..113da2c188 100644 --- a/packages/fppkg/Makefile +++ b/packages/fppkg/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/22] # 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 @@ -107,25 +107,37 @@ FPC=$(PP) endif endif ifndef FPC +DETERMINE_NATIVE_COMPILER=1 +else +ifdef CROSSCOMPILE +ifndef FPCFPMAKE +DETERMINE_NATIVE_COMPILER=1 +endif +endif +endif +ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPC:=$(shell $(FPCPROG) -PB) +FPCNATIVE:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPC)),) -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPCNATIVE)),) +override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPC))),) -FPC:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPCNATIVE))),) +FPCNATIVE:=$(firstword $(FPCPROG)) endif endif else -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif endif +ifndef FPC +FPC=$(FPCNATIVE) +endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) FOUNDFPC:=$(strip $(wildcard $(FPC))) @@ -264,6 +276,19 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCFPMAKE:=$(FPCNATIVE) +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +export FPCFPMAKE +endif +else +FPCFPMAKE=$(FPC) +export FPCFPMAKE +endif +endif override PACKAGE_NAME=fppkg override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -1829,7 +1854,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fcl-web +override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1841,19 +1866,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1865,12 +1879,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1882,19 +1892,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1906,12 +1905,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1924,19 +1919,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1949,19 +1933,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1974,14 +1947,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1993,19 +1960,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2017,13 +1973,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -2035,12 +1986,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -2052,12 +1999,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2069,19 +2012,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -2093,12 +2025,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2112,18 +2040,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -2135,12 +2053,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -2152,12 +2066,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -2169,12 +2079,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -2186,18 +2092,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2209,12 +2105,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2226,12 +2118,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -2243,12 +2131,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -2262,18 +2146,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -2286,19 +2160,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2311,19 +2174,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2335,19 +2187,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2359,12 +2200,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -2376,12 +2213,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2393,19 +2226,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2417,12 +2239,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2434,12 +2252,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2452,19 +2266,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2476,19 +2279,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2500,12 +2292,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2517,12 +2305,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2536,18 +2320,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -2559,12 +2333,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2576,12 +2346,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2593,12 +2359,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2611,19 +2373,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2635,19 +2386,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2659,13 +2399,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2677,12 +2412,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2695,19 +2426,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2720,19 +2440,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2744,13 +2453,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2764,18 +2468,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2787,16 +2481,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2808,12 +2494,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2826,19 +2508,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2850,12 +2521,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2869,18 +2536,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2892,18 +2549,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2915,12 +2562,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2932,12 +2575,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2949,12 +2588,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2966,12 +2601,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2984,19 +2615,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -3010,18 +2630,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -3033,12 +2643,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -3050,12 +2656,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -3068,19 +2670,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -3092,12 +2683,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -3110,19 +2697,8 @@ REQUIRE_PACKAGES_FCL-ASYNC=1 REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FCL-DB=1 -REQUIRE_PACKAGES_FCL-JSON=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 -REQUIRE_PACKAGES_HTTPD22=1 -REQUIRE_PACKAGES_FASTCGI=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3132,6 +2708,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -3149,6 +2734,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3158,6 +2746,15 @@ 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) @@ -3175,6 +2772,9 @@ 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_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3184,6 +2784,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -3201,6 +2810,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3210,6 +2822,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -3227,6 +2848,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-PROCESS PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3236,6 +2860,15 @@ 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) @@ -3253,6 +2886,9 @@ 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_FCL-PASSRC PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3262,6 +2898,15 @@ UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PASSRC) $(FPCMADE) @@ -3279,6 +2924,9 @@ endif ifdef UNITDIR_FCL-PASSRC override COMPILER_UNITDIR+=$(UNITDIR_FCL-PASSRC) endif +ifdef UNITDIR_FPMAKE_FCL-PASSRC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PASSRC) +endif endif ifdef REQUIRE_PACKAGES_FCL-ASYNC PACKAGEDIR_FCL-ASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-async/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3288,6 +2936,15 @@ UNITDIR_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-ASYNC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-ASYNC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-ASYNC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-ASYNC) $(FPCMADE) @@ -3305,6 +2962,9 @@ endif ifdef UNITDIR_FCL-ASYNC override COMPILER_UNITDIR+=$(UNITDIR_FCL-ASYNC) endif +ifdef UNITDIR_FPMAKE_FCL-ASYNC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-ASYNC) +endif endif ifdef REQUIRE_PACKAGES_FCL-NET PACKAGEDIR_FCL-NET:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-net/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3314,6 +2974,15 @@ UNITDIR_FCL-NET=$(PACKAGEDIR_FCL-NET)/units/$(TARGETSUFFIX) else UNITDIR_FCL-NET=$(PACKAGEDIR_FCL-NET) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-NET)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-NET=$(PACKAGEDIR_FCL-NET)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-NET)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-NET=$(PACKAGEDIR_FCL-NET)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-NET=$(PACKAGEDIR_FCL-NET) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-NET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-NET) $(FPCMADE) @@ -3331,6 +3000,9 @@ endif ifdef UNITDIR_FCL-NET override COMPILER_UNITDIR+=$(UNITDIR_FCL-NET) endif +ifdef UNITDIR_FPMAKE_FCL-NET +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-NET) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3340,6 +3012,15 @@ 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) @@ -3357,6 +3038,9 @@ 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)))))) @@ -3366,6 +3050,15 @@ 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) @@ -3383,83 +3076,46 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) endif -ifdef REQUIRE_PACKAGES_LIBCURL -PACKAGEDIR_LIBCURL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_LIBCURL),) -ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units/$(TARGETSUFFIX)),) -UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(TARGETSUFFIX) +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_LIBCURL=$(PACKAGEDIR_LIBCURL) +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_LIBCURL)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_LIBCURL) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBCURL)/$(FPCMADE) +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) endif else -PACKAGEDIR_LIBCURL= -UNITDIR_LIBCURL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_LIBCURL),) -UNITDIR_LIBCURL:=$(firstword $(UNITDIR_LIBCURL)) +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) else -UNITDIR_LIBCURL= +UNITDIR_FPMKUNIT= endif endif -ifdef UNITDIR_LIBCURL -override COMPILER_UNITDIR+=$(UNITDIR_LIBCURL) +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) endif -endif -ifdef REQUIRE_PACKAGES_FCL-DB -PACKAGEDIR_FCL-DB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-DB),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-DB)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-DB=$(PACKAGEDIR_FCL-DB)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-DB=$(PACKAGEDIR_FCL-DB) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-DB)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-DB) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-DB)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-DB= -UNITDIR_FCL-DB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-DB),) -UNITDIR_FCL-DB:=$(firstword $(UNITDIR_FCL-DB)) -else -UNITDIR_FCL-DB= -endif -endif -ifdef UNITDIR_FCL-DB -override COMPILER_UNITDIR+=$(UNITDIR_FCL-DB) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-JSON -PACKAGEDIR_FCL-JSON:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-json/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-JSON),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-JSON)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-JSON=$(PACKAGEDIR_FCL-JSON)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-JSON=$(PACKAGEDIR_FCL-JSON) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-JSON)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-JSON) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-JSON)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-JSON= -UNITDIR_FCL-JSON:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-json/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-JSON),) -UNITDIR_FCL-JSON:=$(firstword $(UNITDIR_FCL-JSON)) -else -UNITDIR_FCL-JSON= -endif -endif -ifdef UNITDIR_FCL-JSON -override COMPILER_UNITDIR+=$(UNITDIR_FCL-JSON) +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif ifdef REQUIRE_PACKAGES_FCL-WEB @@ -3470,6 +3126,15 @@ UNITDIR_FCL-WEB=$(PACKAGEDIR_FCL-WEB)/units/$(TARGETSUFFIX) else UNITDIR_FCL-WEB=$(PACKAGEDIR_FCL-WEB) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-WEB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-WEB=$(PACKAGEDIR_FCL-WEB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-WEB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-WEB=$(PACKAGEDIR_FCL-WEB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-WEB=$(PACKAGEDIR_FCL-WEB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-WEB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-WEB) $(FPCMADE) @@ -3487,239 +3152,8 @@ endif ifdef UNITDIR_FCL-WEB override COMPILER_UNITDIR+=$(UNITDIR_FCL-WEB) endif -endif -ifdef REQUIRE_PACKAGES_IBASE -PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_IBASE),) -ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX)),) -UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) -else -UNITDIR_IBASE=$(PACKAGEDIR_IBASE) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_IBASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE) -endif -else -PACKAGEDIR_IBASE= -UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_IBASE),) -UNITDIR_IBASE:=$(firstword $(UNITDIR_IBASE)) -else -UNITDIR_IBASE= -endif -endif -ifdef UNITDIR_IBASE -override COMPILER_UNITDIR+=$(UNITDIR_IBASE) -endif -endif -ifdef REQUIRE_PACKAGES_POSTGRES -PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_POSTGRES),) -ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX)),) -UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) -else -UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_POSTGRES)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_POSTGRES)/$(FPCMADE) -endif -else -PACKAGEDIR_POSTGRES= -UNITDIR_POSTGRES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /postgres/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_POSTGRES),) -UNITDIR_POSTGRES:=$(firstword $(UNITDIR_POSTGRES)) -else -UNITDIR_POSTGRES= -endif -endif -ifdef UNITDIR_POSTGRES -override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) -endif -endif -ifdef REQUIRE_PACKAGES_MYSQL -PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_MYSQL),) -ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX)),) -UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) -else -UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_MYSQL)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE) -endif -else -PACKAGEDIR_MYSQL= -UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_MYSQL),) -UNITDIR_MYSQL:=$(firstword $(UNITDIR_MYSQL)) -else -UNITDIR_MYSQL= -endif -endif -ifdef UNITDIR_MYSQL -override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) -endif -endif -ifdef REQUIRE_PACKAGES_ODBC -PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ODBC),) -ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)),) -UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) -else -UNITDIR_ODBC=$(PACKAGEDIR_ODBC) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ODBC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ODBC)/$(FPCMADE) -endif -else -PACKAGEDIR_ODBC= -UNITDIR_ODBC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /odbc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ODBC),) -UNITDIR_ODBC:=$(firstword $(UNITDIR_ODBC)) -else -UNITDIR_ODBC= -endif -endif -ifdef UNITDIR_ODBC -override COMPILER_UNITDIR+=$(UNITDIR_ODBC) -endif -endif -ifdef REQUIRE_PACKAGES_ORACLE -PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ORACLE),) -ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)),) -UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) -else -UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ORACLE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE) -endif -else -PACKAGEDIR_ORACLE= -UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ORACLE),) -UNITDIR_ORACLE:=$(firstword $(UNITDIR_ORACLE)) -else -UNITDIR_ORACLE= -endif -endif -ifdef UNITDIR_ORACLE -override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) -endif -endif -ifdef REQUIRE_PACKAGES_SQLITE -PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_SQLITE),) -ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX)),) -UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) -else -UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_SQLITE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_SQLITE)/$(FPCMADE) -endif -else -PACKAGEDIR_SQLITE= -UNITDIR_SQLITE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_SQLITE),) -UNITDIR_SQLITE:=$(firstword $(UNITDIR_SQLITE)) -else -UNITDIR_SQLITE= -endif -endif -ifdef UNITDIR_SQLITE -override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) -endif -endif -ifdef REQUIRE_PACKAGES_PXLIB -PACKAGEDIR_PXLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_PXLIB),) -ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX)),) -UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX) -else -UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_PXLIB)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_PXLIB) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_PXLIB)/$(FPCMADE) -endif -else -PACKAGEDIR_PXLIB= -UNITDIR_PXLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_PXLIB),) -UNITDIR_PXLIB:=$(firstword $(UNITDIR_PXLIB)) -else -UNITDIR_PXLIB= -endif -endif -ifdef UNITDIR_PXLIB -override COMPILER_UNITDIR+=$(UNITDIR_PXLIB) -endif -endif -ifdef REQUIRE_PACKAGES_HTTPD22 -PACKAGEDIR_HTTPD22:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /httpd22/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_HTTPD22),) -ifneq ($(wildcard $(PACKAGEDIR_HTTPD22)/units/$(TARGETSUFFIX)),) -UNITDIR_HTTPD22=$(PACKAGEDIR_HTTPD22)/units/$(TARGETSUFFIX) -else -UNITDIR_HTTPD22=$(PACKAGEDIR_HTTPD22) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_HTTPD22)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_HTTPD22) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_HTTPD22)/$(FPCMADE) -endif -else -PACKAGEDIR_HTTPD22= -UNITDIR_HTTPD22:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /httpd22/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_HTTPD22),) -UNITDIR_HTTPD22:=$(firstword $(UNITDIR_HTTPD22)) -else -UNITDIR_HTTPD22= -endif -endif -ifdef UNITDIR_HTTPD22 -override COMPILER_UNITDIR+=$(UNITDIR_HTTPD22) -endif -endif -ifdef REQUIRE_PACKAGES_FASTCGI -PACKAGEDIR_FASTCGI:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fastcgi/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FASTCGI),) -ifneq ($(wildcard $(PACKAGEDIR_FASTCGI)/units/$(TARGETSUFFIX)),) -UNITDIR_FASTCGI=$(PACKAGEDIR_FASTCGI)/units/$(TARGETSUFFIX) -else -UNITDIR_FASTCGI=$(PACKAGEDIR_FASTCGI) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FASTCGI)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FASTCGI) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FASTCGI)/$(FPCMADE) -endif -else -PACKAGEDIR_FASTCGI= -UNITDIR_FASTCGI:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fastcgi/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FASTCGI),) -UNITDIR_FASTCGI:=$(firstword $(UNITDIR_FASTCGI)) -else -UNITDIR_FASTCGI= -endif -endif -ifdef UNITDIR_FASTCGI -override COMPILER_UNITDIR+=$(UNITDIR_FASTCGI) +ifdef UNITDIR_FPMAKE_FCL-WEB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-WEB) endif endif ifdef REQUIRE_PACKAGES_UNIVINT @@ -3730,6 +3164,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -3747,6 +3190,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -4242,6 +3688,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/packages/fppkg/Makefile.fpc b/packages/fppkg/Makefile.fpc index 94b46037ac..391a109471 100644 --- a/packages/fppkg/Makefile.fpc +++ b/packages/fppkg/Makefile.fpc @@ -35,7 +35,7 @@ fpcpackage=y fpcdir=../.. [require] -packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fcl-web +packages=fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web tools=data2inc packages_darwin=univint packages_iphonesim=univint