From b1cda73a9a415f22cbfb9cd0d33626e07b1a5583 Mon Sep 17 00:00:00 2001 From: joost Date: Sat, 24 Mar 2012 10:15:21 +0000 Subject: [PATCH] * Replaced fpcmake building by fpmake building git-svn-id: trunk@20612 - --- .gitattributes | 1 + utils/fppkg/Makefile | 1616 ++---------------------------- utils/fppkg/Makefile.fpc | 107 +- utils/fppkg/Makefile.fpc.fpcmake | 53 + 4 files changed, 188 insertions(+), 1589 deletions(-) create mode 100644 utils/fppkg/Makefile.fpc.fpcmake diff --git a/.gitattributes b/.gitattributes index c119f68b60..78f9815254 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13310,6 +13310,7 @@ utils/fpmc/readmsg.pp svneol=native#text/plain utils/fpmc/test.mc -text utils/fppkg/Makefile svneol=native#text/plain utils/fppkg/Makefile.fpc svneol=native#text/plain +utils/fppkg/Makefile.fpc.fpcmake svneol=native#text/plain utils/fppkg/README.txt svneol=native#text/plain utils/fppkg/examples/pkglibcurl.pp svneol=native#text/plain utils/fppkg/examples/pkgocurl.pp svneol=native#text/plain diff --git a/utils/fppkg/Makefile b/utils/fppkg/Makefile index 6db151f92a..785001ff45 100644 --- a/utils/fppkg/Makefile +++ b/utils/fppkg/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/02/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/17] # 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 mips-linux mipsel-linux @@ -292,879 +292,17 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -override PACKAGE_NAME=fppkg +override PACKAGE_NAME=fppkg-util override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fppkg +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fppkg -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=pkglnet -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=lnet/sys -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_UNITDIR+=lnet -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_UNITDIR+=lnet -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1758,18 +896,13 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fppkg +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1777,11 +910,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1789,11 +917,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1801,11 +924,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1813,11 +931,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1825,11 +938,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1837,11 +945,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1849,11 +952,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1861,11 +959,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1873,11 +966,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1885,11 +973,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1897,11 +980,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1909,11 +987,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1921,12 +994,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1934,11 +1001,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1946,11 +1008,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1958,11 +1015,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1970,11 +1022,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1982,11 +1029,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1994,11 +1036,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -2006,11 +1043,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -2018,12 +1050,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -2031,11 +1057,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2043,11 +1064,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2055,11 +1071,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2067,11 +1078,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -2079,11 +1085,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2091,11 +1092,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2103,11 +1099,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2115,11 +1106,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2127,11 +1113,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2139,11 +1120,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2151,11 +1127,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2163,11 +1134,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2175,12 +1141,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -2188,11 +1148,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2200,11 +1155,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2212,11 +1162,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2224,11 +1169,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2236,11 +1176,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2248,11 +1183,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2260,11 +1190,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2272,11 +1197,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2284,11 +1204,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2296,11 +1211,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2308,12 +1218,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2321,11 +1225,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2333,11 +1232,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2345,11 +1239,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2357,11 +1246,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2369,12 +1253,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2382,11 +1260,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2394,11 +1267,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2406,11 +1274,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2418,11 +1281,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2430,11 +1288,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2442,11 +1295,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2454,12 +1302,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2467,11 +1309,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2479,11 +1316,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2491,11 +1323,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2503,11 +1330,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2515,11 +1337,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2527,11 +1344,6 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-NET=1 -REQUIRE_PACKAGES_LIBCURL=1 -REQUIRE_PACKAGES_FPPKG=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2723,234 +1535,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-XML -PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-XML),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX)),) -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) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-XML)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-XML= -UNITDIR_FCL-XML:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-XML),) -UNITDIR_FCL-XML:=$(firstword $(UNITDIR_FCL-XML)) -else -UNITDIR_FCL-XML= -endif -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-NET -PACKAGEDIR_FCL-NET:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-net/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-NET),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-NET)/units/$(TARGETSUFFIX)),) -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) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-NET)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-NET= -UNITDIR_FCL-NET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-net/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-NET),) -UNITDIR_FCL-NET:=$(firstword $(UNITDIR_FCL-NET)) -else -UNITDIR_FCL-NET= -endif -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_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) -else -UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL) -endif -ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_LIBCURL)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_LIBCURL) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBCURL)/$(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)) -else -UNITDIR_LIBCURL= -endif -endif -ifdef UNITDIR_LIBCURL -override COMPILER_UNITDIR+=$(UNITDIR_LIBCURL) -endif -ifdef UNITDIR_FPMAKE_LIBCURL -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBCURL) -endif -endif -ifdef REQUIRE_PACKAGES_FPPKG -PACKAGEDIR_FPPKG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fppkg/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FPPKG),) -ifneq ($(wildcard $(PACKAGEDIR_FPPKG)/units/$(TARGETSUFFIX)),) -UNITDIR_FPPKG=$(PACKAGEDIR_FPPKG)/units/$(TARGETSUFFIX) -else -UNITDIR_FPPKG=$(PACKAGEDIR_FPPKG) -endif -ifneq ($(wildcard $(PACKAGEDIR_FPPKG)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FPPKG=$(PACKAGEDIR_FPPKG)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FPPKG)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FPPKG=$(PACKAGEDIR_FPPKG)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FPPKG=$(PACKAGEDIR_FPPKG) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FPPKG)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FPPKG) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FPPKG)/$(FPCMADE) -endif -else -PACKAGEDIR_FPPKG= -UNITDIR_FPPKG:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fppkg/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FPPKG),) -UNITDIR_FPPKG:=$(firstword $(UNITDIR_FPPKG)) -else -UNITDIR_FPPKG= -endif -endif -ifdef UNITDIR_FPPKG -override COMPILER_UNITDIR+=$(UNITDIR_FPPKG) -endif -ifdef UNITDIR_FPMAKE_FPPKG -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPPKG) -endif -endif -ifdef REQUIRE_PACKAGES_UNIVINT -PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_UNIVINT),) -ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX)),) -UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) -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) -override ALLDEPENDENCIES+=$(PACKAGEDIR_UNIVINT)/$(FPCMADE) -endif -else -PACKAGEDIR_UNIVINT= -UNITDIR_UNIVINT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /univint/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_UNIVINT),) -UNITDIR_UNIVINT:=$(firstword $(UNITDIR_UNIVINT)) -else -UNITDIR_UNIVINT= -endif -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) endif @@ -3110,112 +1694,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) -override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) -override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -endif -fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES) -.PHONY: fpc_exes -ifndef CROSSINSTALL -ifneq ($(TARGET_PROGRAMS),) -override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) -override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) -override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS)) -override ALLTARGET+=fpc_exes -override INSTALLEXEFILES+=$(EXEFILES) -override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES) -override CLEANEXEDBGFILES+=$(EXEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)) -endif -endif -endif -fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES) ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) endif -.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared -$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET) - @$(ECHOREDIR) Compiled > $(FPCMADE) -fpc_all: $(FPCMADE) -fpc_smart: - $(MAKE) all LINKSMART=1 CREATESMART=1 -fpc_debug: - $(MAKE) all DEBUG=1 -fpc_release: - $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res -$(COMPILER_UNITTARGETDIR): - $(MKDIRTREE) $(COMPILER_UNITTARGETDIR) -$(COMPILER_TARGETDIR): - $(MKDIRTREE) $(COMPILER_TARGETDIR) -%$(PPUEXT): %.pp - $(COMPILER) $< - $(EXECPPAS) -%$(PPUEXT): %.pas - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.pp - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.pas - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.lpr - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.dpr - $(COMPILER) $< - $(EXECPPAS) -%.res: %.rc - windres -i $< -o $@ -vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.inc $(COMPILER_INCLUDEDIR) -vpath %$(OEXT) $(COMPILER_UNITTARGETDIR) -vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) -.PHONY: fpc_shared -override INSTALLTARGET+=fpc_shared_install -ifndef SHARED_LIBVERSION -SHARED_LIBVERSION=$(FPC_VERSION) -endif -ifndef SHARED_LIBNAME -SHARED_LIBNAME=$(PACKAGE_NAME) -endif -ifndef SHARED_FULLNAME -SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT) -endif -ifndef SHARED_LIBUNITS -SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS) -override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS)) -endif -fpc_shared: -ifdef HASSHAREDLIB - $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1 -ifneq ($(SHARED_BUILD),n) - $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -endif -else - @$(ECHO) Shared Libraries not supported -endif -fpc_shared_install: -ifneq ($(SHARED_BUILD),n) -ifneq ($(SHARED_LIBUNITS),) -ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),) - $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR) -endif -endif -endif .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall ifdef INSTALL_UNITS override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) @@ -3553,42 +2035,70 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifndef DATA2INC -DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(DATA2INC),) -DATA2INC= __missing_command_DATA2INC -else -DATA2INC:=$(firstword $(DATA2INC)) -endif -endif -export DATA2INC -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -.NOTPARALLEL: -ifneq ($(DATA2INC),) -fpmkunitsrc.inc: $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp - $(DATA2INC) -b -s $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp fpmkunitsrc.inc fpmkunitsrc +override FPCOPT:=$(filter-out -FU%,$(FPCOPT)) +override FPCOPT:=$(filter-out -FE%,$(FPCOPT)) +ifdef FPMAKEOPT +FPMAKE_OPT+=$(FPMAKEOPT) +endif +FPMAKE_OPT+=--localunitdir=../.. +FPMAKE_OPT+=--globalunitdir=../../packages +FPMAKE_OPT+=$(FPC_TARGETOPT) +FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT)) +FPMAKE_OPT+=--compiler=$(FPC) +FPMAKE_OPT+=-bu +.NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie endif -fppkg$(EXEEXT): $(wildcard pkg*.pp) diff --git a/utils/fppkg/Makefile.fpc b/utils/fppkg/Makefile.fpc index a4824defa5..e387ac1ab2 100644 --- a/utils/fppkg/Makefile.fpc +++ b/utils/fppkg/Makefile.fpc @@ -1,33 +1,13 @@ # -# Makefile.fpc for fppkg +# Makefile.fpc for running fpmake # [package] -name=fppkg +name=fppkg-util version=2.7.1 -[target] -programs=fppkg - -units_linux=pkglnet -units_beos=pkglnet -units_haiku=pkglnet -units_freebsd=pkglnet -units_netbsd=pkglnet -units_openbsd=pkglnet -units_darwin=pkglnet -units_iphonesim=pkglnet -units_solaris=pkglnet -units_win32=pkglnet -units_win64=pkglnet -units_wince=pkglnet - -[compiler] -unitdir=lnet -includedir=lnet/sys - -[clean] -units=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -35,19 +15,74 @@ fpcpackage=y [default] fpcdir=../.. -[require] -packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fppkg -tools=data2inc -packages_darwin=univint -packages_iphonesim=univint +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] -.NOTPARALLEL: -ifneq ($(DATA2INC),) -fpmkunitsrc.inc: $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp - $(DATA2INC) -b -s $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp fpmkunitsrc.inc fpmkunitsrc +# Do not pass the Makefile's unit and binary target locations. fpmake uses it's own. +override FPCOPT:=$(filter-out -FU%,$(FPCOPT)) +override FPCOPT:=$(filter-out -FE%,$(FPCOPT)) +# Compose general fpmake-parameters +ifdef FPMAKEOPT +FPMAKE_OPT+=$(FPMAKEOPT) endif +FPMAKE_OPT+=--localunitdir=../.. +FPMAKE_OPT+=--globalunitdir=../../packages +FPMAKE_OPT+=$(FPC_TARGETOPT) +FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT)) +FPMAKE_OPT+=--compiler=$(FPC) +FPMAKE_OPT+=-bu +.NOTPARALLEL: -# Don't include the dependency on fpmkunitsrc.inc by default so we can control -# better when we want to update the internal fpmkunitsrc -fppkg$(EXEEXT): $(wildcard pkg*.pp) +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/utils/fppkg/Makefile.fpc.fpcmake b/utils/fppkg/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..a4824defa5 --- /dev/null +++ b/utils/fppkg/Makefile.fpc.fpcmake @@ -0,0 +1,53 @@ +# +# Makefile.fpc for fppkg +# + +[package] +name=fppkg +version=2.7.1 + +[target] +programs=fppkg + +units_linux=pkglnet +units_beos=pkglnet +units_haiku=pkglnet +units_freebsd=pkglnet +units_netbsd=pkglnet +units_openbsd=pkglnet +units_darwin=pkglnet +units_iphonesim=pkglnet +units_solaris=pkglnet +units_win32=pkglnet +units_win64=pkglnet +units_wince=pkglnet + +[compiler] +unitdir=lnet +includedir=lnet/sys + +[clean] +units=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[require] +packages=fcl-base fcl-xml fcl-process fcl-net paszlib libcurl fppkg +tools=data2inc +packages_darwin=univint +packages_iphonesim=univint + +[rules] +.NOTPARALLEL: +ifneq ($(DATA2INC),) +fpmkunitsrc.inc: $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp + $(DATA2INC) -b -s $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp fpmkunitsrc.inc fpmkunitsrc +endif + +# Don't include the dependency on fpmkunitsrc.inc by default so we can control +# better when we want to update the internal fpmkunitsrc +fppkg$(EXEEXT): $(wildcard pkg*.pp)