diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-05-26 19:05:11 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-05-26 19:05:11 +0000 |
| commit | 95c477303e5285f7a0e1bf99e60c6d0b2faeb995 (patch) | |
| tree | 3e5912874a9ae56331f200c6adedf220b6ab43d1 /utils | |
| parent | 0dbba5a4b339fe2ffba5ab53b3a3ccb5b6a4f025 (diff) | |
| download | fpc-95c477303e5285f7a0e1bf99e60c6d0b2faeb995.tar.gz | |
* Switched utils to fpmake building
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@24621 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'utils')
62 files changed, 9192 insertions, 18272 deletions
diff --git a/utils/Makefile b/utils/Makefile index c2417f3934..1196296d82 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -319,885 +319,19 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -override PACKAGE_NAME=utils -override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni rmwait -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpmc fpcres rmwait instantfpc importtl unicode -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpmc fpcres rmwait -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres fpcreslipo instantfpc unicode -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpmc fpcres rmwait -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres rmwait instantfpc -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres fpcreslipo instantfpc -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres fpcreslipo instantfpc unicode -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres fpcreslipo instantfpc unicode -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpmc fpcres rmwait instantfpc importtl unicode -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres fpcreslipo instantfpc unicode -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres rmwait instantfpc -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres fpcreslipo instantfpc unicode -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni fpcres instantfpc unicode -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir +ifdef INSTALL_UNITDIR +FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR) endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_RSTS+=rstconv -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=ptopu -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=ptopu +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y +override INSTALL_FPCSUBDIR=utils ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1827,7 +961,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base paszlib hash +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1835,7 +969,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1844,7 +977,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1853,7 +985,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1862,7 +993,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1871,7 +1001,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1880,7 +1009,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1889,7 +1017,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1898,7 +1025,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1907,7 +1033,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1916,7 +1041,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1925,7 +1049,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1934,7 +1057,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1943,7 +1065,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1952,8 +1073,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1962,7 +1081,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1971,7 +1089,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1980,7 +1097,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1989,7 +1105,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1998,7 +1113,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2007,7 +1121,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -2016,7 +1129,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -2025,8 +1137,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -2035,7 +1145,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -2044,7 +1153,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2053,7 +1161,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2062,7 +1169,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2071,7 +1177,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -2080,7 +1185,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2089,7 +1193,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2098,7 +1201,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2107,7 +1209,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2116,7 +1217,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2125,7 +1225,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2134,7 +1233,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2143,7 +1241,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2152,8 +1249,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -2162,7 +1257,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2171,7 +1265,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2180,7 +1273,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -2189,7 +1281,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2198,7 +1289,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2207,7 +1297,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2216,7 +1305,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2225,7 +1313,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2234,7 +1321,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2243,7 +1329,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2252,7 +1337,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2261,7 +1345,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2270,7 +1353,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2279,8 +1361,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2289,7 +1369,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2298,7 +1377,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2307,7 +1385,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2316,7 +1393,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2325,8 +1401,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2335,7 +1409,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2344,7 +1417,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2353,7 +1425,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2362,7 +1433,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2371,7 +1441,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -2380,7 +1449,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2389,7 +1457,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2398,8 +1465,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2408,7 +1473,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2417,7 +1481,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2426,7 +1489,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2435,7 +1497,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2444,7 +1505,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2453,7 +1513,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2462,7 +1521,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2471,7 +1529,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2480,7 +1537,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2489,7 +1545,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2719,82 +1774,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_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 @@ -2949,256 +1928,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) -endif -ifdef INSTALL_BUILDUNIT -override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) -endif -ifdef INSTALLPPUFILES -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) -ifneq ($(UNITTARGETDIRPREFIX),) -override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) -override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) -endif -override INSTALL_CREATEPACKAGEFPC=1 -endif -ifdef INSTALLEXEFILES -ifneq ($(TARGETDIRPREFIX),) -override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES))) -endif -endif -fpc_install: all $(INSTALLTARGET) -ifdef INSTALLEXEFILES - $(MKDIR) $(INSTALL_BINDIR) - $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) -endif -ifdef INSTALL_CREATEPACKAGEFPC -ifdef FPCMAKE -ifdef PACKAGE_VERSION -ifneq ($(wildcard Makefile.fpc),) - $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc - $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) Package.fpc $(INSTALL_UNITDIR) -endif -endif -endif -endif -ifdef INSTALLPPUFILES - $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) -ifneq ($(INSTALLPPULINKFILES),) - $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR) -endif -ifneq ($(wildcard $(LIB_FULLNAME)),) - $(MKDIR) $(INSTALL_LIBDIR) - $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR) -ifdef inUnix - ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME) -endif -endif -endif -ifdef INSTALL_FILES - $(MKDIR) $(INSTALL_DATADIR) - $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR) -endif -fpc_sourceinstall: distclean - $(MKDIR) $(INSTALL_SOURCEDIR) - $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) -ifdef HASEXAMPLES - $(MKDIR) $(INSTALL_EXAMPLEDIR) -endif -ifdef EXAMPLESOURCEFILES - $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR) -endif -ifdef TARGET_EXAMPLEDIRS - $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) -endif -.PHONY: fpc_distinstall -fpc_distinstall: install exampleinstall -.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall -ifndef PACKDIR -ifndef inUnix -PACKDIR=$(BASEDIR)/../fpc-pack -else -PACKDIR=/tmp/fpc-pack -endif -endif -ifndef ZIPNAME -ifdef DIST_ZIPNAME -ZIPNAME=$(DIST_ZIPNAME) -else -ZIPNAME=$(PACKAGE_NAME) -endif -endif -ifndef FULLZIPNAME -FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) -endif -ifndef ZIPTARGET -ifdef DIST_ZIPTARGET -ZIPTARGET=DIST_ZIPTARGET -else -ZIPTARGET=install -endif -endif -ifndef USEZIP -ifdef inUnix -USETAR=1 -endif -endif -ifndef inUnix -USEZIPWRAPPER=1 -endif -ifdef USEZIPWRAPPER -ZIPPATHSEP=$(PATHSEP) -ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) -else -ZIPPATHSEP=/ -endif -ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) -ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) -ifdef USETAR -ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) -ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * -else -ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) -ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * -endif -fpc_zipinstall: - $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 - $(MKDIR) $(DIST_DESTDIR) - $(DEL) $(ZIPDESTFILE) -ifdef USEZIPWRAPPER -ifneq ($(ECHOREDIR),echo) - $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) - $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) - $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) -else - echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) - echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) - echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) -endif -ifdef inUnix - /bin/sh $(ZIPWRAPPER) -else -ifdef RUNBATCH - $(RUNBATCH) $(ZIPWRAPPER) -else - $(ZIPWRAPPER) -endif -endif - $(DEL) $(ZIPWRAPPER) -else - $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) -endif - $(DELTREE) $(PACKDIR) -fpc_zipsourceinstall: - $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) -fpc_zipexampleinstall: -ifdef HASEXAMPLES - $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) -endif -fpc_zipdistinstall: - $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -3383,1903 +2116,80 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifeq ($(FULL_TARGET),i386-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_RMWAIT=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPMC=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_RMWAIT=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_IMPORTTL=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPMC=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_RMWAIT=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_FPCRESLIPO=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPMC=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_RMWAIT=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_RMWAIT=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_FPCRESLIPO=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),i386-android) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_FPCRESLIPO=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc-aix) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_FPCRESLIPO=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPMC=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_RMWAIT=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_IMPORTTL=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_FPCRESLIPO=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_RMWAIT=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),arm-android) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_FPCRESLIPO=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 +units: +examples: +shared: +sourceinstall: +exampleinstall: +zipsourceinstall: +zipexampleinstall: +info: fpc_info +makefiles: fpc_makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipsourceinstall zipexampleinstall info makefiles +ifneq ($(wildcard fpcmake.loc),) +include fpcmake.loc endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 +override FPCOPT:=$(filter-out -FU%,$(FPCOPT)) +override FPCOPT:=$(filter-out -FE%,$(FPCOPT)) +ifdef FPMAKEOPT +FPMAKE_OPT+=$(FPMAKEOPT) endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 +FPMAKE_OPT+=--localunitdir=.. +FPMAKE_OPT+=--globalunitdir=../packages +FPMAKE_OPT+=$(FPC_TARGETOPT) +FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT)) +FPMAKE_OPT+=--compiler=$(FPC) +FPMAKE_OPT+=-bu +ifndef BUILDFULLNATIVE +FPMAKE_OPT+=-sp endif -ifeq ($(FULL_TARGET),mips-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 +.NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +CLEAN_TARGET_DIRS=$(subst /Makefile.fpc, ,$(wildcard */Makefile.fpc)) +%_distclean: + $(MAKE) -C $* distclean +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: fpc_cleanall $(addsuffix _distclean,$(CLEAN_TARGET_DIRS)) +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 -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -TARGET_DIRS_FPCRES=1 -TARGET_DIRS_INSTANTFPC=1 -TARGET_DIRS_UNICODE=1 + -$(DEL) $(LOCALFPMAKE) + -$(DEL) fpmake.o + -$(DEL) fpmake.dbg endif -ifeq ($(FULL_TARGET),jvm-java) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 +cleanall: distclean +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) $(FPMAKE_INSTALL_OPT) +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) $(FPMAKE_INSTALL_OPT) endif -ifeq ($(FULL_TARGET),i8086-msdos) -TARGET_DIRS_FPPKG=1 -TARGET_DIRS_FPCM=1 -TARGET_DIRS_TPLY=1 -TARGET_DIRS_H2PAS=1 -TARGET_DIRS_FPRCP=1 -TARGET_DIRS_DXEGEN=1 -TARGET_DIRS_FPDOC=1 -TARGET_DIRS_FPCMKCFG=1 -TARGET_DIRS_PAS2UT=1 -TARGET_DIRS_PAS2FPM=1 -TARGET_DIRS_PAS2JNI=1 -endif -ifdef TARGET_DIRS_FPPKG -fppkg_all: - $(MAKE) -C fppkg all -fppkg_debug: - $(MAKE) -C fppkg debug -fppkg_smart: - $(MAKE) -C fppkg smart -fppkg_release: - $(MAKE) -C fppkg release -fppkg_units: - $(MAKE) -C fppkg units -fppkg_examples: - $(MAKE) -C fppkg examples -fppkg_shared: - $(MAKE) -C fppkg shared -fppkg_install: - $(MAKE) -C fppkg install -fppkg_sourceinstall: - $(MAKE) -C fppkg sourceinstall -fppkg_exampleinstall: - $(MAKE) -C fppkg exampleinstall -fppkg_distinstall: - $(MAKE) -C fppkg distinstall -fppkg_zipinstall: - $(MAKE) -C fppkg zipinstall -fppkg_zipsourceinstall: - $(MAKE) -C fppkg zipsourceinstall -fppkg_zipexampleinstall: - $(MAKE) -C fppkg zipexampleinstall -fppkg_zipdistinstall: - $(MAKE) -C fppkg zipdistinstall -fppkg_clean: - $(MAKE) -C fppkg clean -fppkg_distclean: - $(MAKE) -C fppkg distclean -fppkg_cleanall: - $(MAKE) -C fppkg cleanall -fppkg_info: - $(MAKE) -C fppkg info -fppkg_makefiles: - $(MAKE) -C fppkg makefiles -fppkg: - $(MAKE) -C fppkg all -.PHONY: fppkg_all fppkg_debug fppkg_smart fppkg_release fppkg_units fppkg_examples fppkg_shared fppkg_install fppkg_sourceinstall fppkg_exampleinstall fppkg_distinstall fppkg_zipinstall fppkg_zipsourceinstall fppkg_zipexampleinstall fppkg_zipdistinstall fppkg_clean fppkg_distclean fppkg_cleanall fppkg_info fppkg_makefiles fppkg -endif -ifdef TARGET_DIRS_FPCM -fpcm_all: - $(MAKE) -C fpcm all -fpcm_debug: - $(MAKE) -C fpcm debug -fpcm_smart: - $(MAKE) -C fpcm smart -fpcm_release: - $(MAKE) -C fpcm release -fpcm_units: - $(MAKE) -C fpcm units -fpcm_examples: - $(MAKE) -C fpcm examples -fpcm_shared: - $(MAKE) -C fpcm shared -fpcm_install: - $(MAKE) -C fpcm install -fpcm_sourceinstall: - $(MAKE) -C fpcm sourceinstall -fpcm_exampleinstall: - $(MAKE) -C fpcm exampleinstall -fpcm_distinstall: - $(MAKE) -C fpcm distinstall -fpcm_zipinstall: - $(MAKE) -C fpcm zipinstall -fpcm_zipsourceinstall: - $(MAKE) -C fpcm zipsourceinstall -fpcm_zipexampleinstall: - $(MAKE) -C fpcm zipexampleinstall -fpcm_zipdistinstall: - $(MAKE) -C fpcm zipdistinstall -fpcm_clean: - $(MAKE) -C fpcm clean -fpcm_distclean: - $(MAKE) -C fpcm distclean -fpcm_cleanall: - $(MAKE) -C fpcm cleanall -fpcm_info: - $(MAKE) -C fpcm info -fpcm_makefiles: - $(MAKE) -C fpcm makefiles -fpcm: - $(MAKE) -C fpcm all -.PHONY: fpcm_all fpcm_debug fpcm_smart fpcm_release fpcm_units fpcm_examples fpcm_shared fpcm_install fpcm_sourceinstall fpcm_exampleinstall fpcm_distinstall fpcm_zipinstall fpcm_zipsourceinstall fpcm_zipexampleinstall fpcm_zipdistinstall fpcm_clean fpcm_distclean fpcm_cleanall fpcm_info fpcm_makefiles fpcm -endif -ifdef TARGET_DIRS_TPLY -tply_all: - $(MAKE) -C tply all -tply_debug: - $(MAKE) -C tply debug -tply_smart: - $(MAKE) -C tply smart -tply_release: - $(MAKE) -C tply release -tply_units: - $(MAKE) -C tply units -tply_examples: - $(MAKE) -C tply examples -tply_shared: - $(MAKE) -C tply shared -tply_install: - $(MAKE) -C tply install -tply_sourceinstall: - $(MAKE) -C tply sourceinstall -tply_exampleinstall: - $(MAKE) -C tply exampleinstall -tply_distinstall: - $(MAKE) -C tply distinstall -tply_zipinstall: - $(MAKE) -C tply zipinstall -tply_zipsourceinstall: - $(MAKE) -C tply zipsourceinstall -tply_zipexampleinstall: - $(MAKE) -C tply zipexampleinstall -tply_zipdistinstall: - $(MAKE) -C tply zipdistinstall -tply_clean: - $(MAKE) -C tply clean -tply_distclean: - $(MAKE) -C tply distclean -tply_cleanall: - $(MAKE) -C tply cleanall -tply_info: - $(MAKE) -C tply info -tply_makefiles: - $(MAKE) -C tply makefiles -tply: - $(MAKE) -C tply all -.PHONY: tply_all tply_debug tply_smart tply_release tply_units tply_examples tply_shared tply_install tply_sourceinstall tply_exampleinstall tply_distinstall tply_zipinstall tply_zipsourceinstall tply_zipexampleinstall tply_zipdistinstall tply_clean tply_distclean tply_cleanall tply_info tply_makefiles tply -endif -ifdef TARGET_DIRS_H2PAS -h2pas_all: - $(MAKE) -C h2pas all -h2pas_debug: - $(MAKE) -C h2pas debug -h2pas_smart: - $(MAKE) -C h2pas smart -h2pas_release: - $(MAKE) -C h2pas release -h2pas_units: - $(MAKE) -C h2pas units -h2pas_examples: - $(MAKE) -C h2pas examples -h2pas_shared: - $(MAKE) -C h2pas shared -h2pas_install: - $(MAKE) -C h2pas install -h2pas_sourceinstall: - $(MAKE) -C h2pas sourceinstall -h2pas_exampleinstall: - $(MAKE) -C h2pas exampleinstall -h2pas_distinstall: - $(MAKE) -C h2pas distinstall -h2pas_zipinstall: - $(MAKE) -C h2pas zipinstall -h2pas_zipsourceinstall: - $(MAKE) -C h2pas zipsourceinstall -h2pas_zipexampleinstall: - $(MAKE) -C h2pas zipexampleinstall -h2pas_zipdistinstall: - $(MAKE) -C h2pas zipdistinstall -h2pas_clean: - $(MAKE) -C h2pas clean -h2pas_distclean: - $(MAKE) -C h2pas distclean -h2pas_cleanall: - $(MAKE) -C h2pas cleanall -h2pas_info: - $(MAKE) -C h2pas info -h2pas_makefiles: - $(MAKE) -C h2pas makefiles -h2pas: - $(MAKE) -C h2pas all -.PHONY: h2pas_all h2pas_debug h2pas_smart h2pas_release h2pas_units h2pas_examples h2pas_shared h2pas_install h2pas_sourceinstall h2pas_exampleinstall h2pas_distinstall h2pas_zipinstall h2pas_zipsourceinstall h2pas_zipexampleinstall h2pas_zipdistinstall h2pas_clean h2pas_distclean h2pas_cleanall h2pas_info h2pas_makefiles h2pas -endif -ifdef TARGET_DIRS_FPRCP -fprcp_all: - $(MAKE) -C fprcp all -fprcp_debug: - $(MAKE) -C fprcp debug -fprcp_smart: - $(MAKE) -C fprcp smart -fprcp_release: - $(MAKE) -C fprcp release -fprcp_units: - $(MAKE) -C fprcp units -fprcp_examples: - $(MAKE) -C fprcp examples -fprcp_shared: - $(MAKE) -C fprcp shared -fprcp_install: - $(MAKE) -C fprcp install -fprcp_sourceinstall: - $(MAKE) -C fprcp sourceinstall -fprcp_exampleinstall: - $(MAKE) -C fprcp exampleinstall -fprcp_distinstall: - $(MAKE) -C fprcp distinstall -fprcp_zipinstall: - $(MAKE) -C fprcp zipinstall -fprcp_zipsourceinstall: - $(MAKE) -C fprcp zipsourceinstall -fprcp_zipexampleinstall: - $(MAKE) -C fprcp zipexampleinstall -fprcp_zipdistinstall: - $(MAKE) -C fprcp zipdistinstall -fprcp_clean: - $(MAKE) -C fprcp clean -fprcp_distclean: - $(MAKE) -C fprcp distclean -fprcp_cleanall: - $(MAKE) -C fprcp cleanall -fprcp_info: - $(MAKE) -C fprcp info -fprcp_makefiles: - $(MAKE) -C fprcp makefiles -fprcp: - $(MAKE) -C fprcp all -.PHONY: fprcp_all fprcp_debug fprcp_smart fprcp_release fprcp_units fprcp_examples fprcp_shared fprcp_install fprcp_sourceinstall fprcp_exampleinstall fprcp_distinstall fprcp_zipinstall fprcp_zipsourceinstall fprcp_zipexampleinstall fprcp_zipdistinstall fprcp_clean fprcp_distclean fprcp_cleanall fprcp_info fprcp_makefiles fprcp -endif -ifdef TARGET_DIRS_DXEGEN -dxegen_all: - $(MAKE) -C dxegen all -dxegen_debug: - $(MAKE) -C dxegen debug -dxegen_smart: - $(MAKE) -C dxegen smart -dxegen_release: - $(MAKE) -C dxegen release -dxegen_units: - $(MAKE) -C dxegen units -dxegen_examples: - $(MAKE) -C dxegen examples -dxegen_shared: - $(MAKE) -C dxegen shared -dxegen_install: - $(MAKE) -C dxegen install -dxegen_sourceinstall: - $(MAKE) -C dxegen sourceinstall -dxegen_exampleinstall: - $(MAKE) -C dxegen exampleinstall -dxegen_distinstall: - $(MAKE) -C dxegen distinstall -dxegen_zipinstall: - $(MAKE) -C dxegen zipinstall -dxegen_zipsourceinstall: - $(MAKE) -C dxegen zipsourceinstall -dxegen_zipexampleinstall: - $(MAKE) -C dxegen zipexampleinstall -dxegen_zipdistinstall: - $(MAKE) -C dxegen zipdistinstall -dxegen_clean: - $(MAKE) -C dxegen clean -dxegen_distclean: - $(MAKE) -C dxegen distclean -dxegen_cleanall: - $(MAKE) -C dxegen cleanall -dxegen_info: - $(MAKE) -C dxegen info -dxegen_makefiles: - $(MAKE) -C dxegen makefiles -dxegen: - $(MAKE) -C dxegen all -.PHONY: dxegen_all dxegen_debug dxegen_smart dxegen_release dxegen_units dxegen_examples dxegen_shared dxegen_install dxegen_sourceinstall dxegen_exampleinstall dxegen_distinstall dxegen_zipinstall dxegen_zipsourceinstall dxegen_zipexampleinstall dxegen_zipdistinstall dxegen_clean dxegen_distclean dxegen_cleanall dxegen_info dxegen_makefiles dxegen -endif -ifdef TARGET_DIRS_FPDOC -fpdoc_all: - $(MAKE) -C fpdoc all -fpdoc_debug: - $(MAKE) -C fpdoc debug -fpdoc_smart: - $(MAKE) -C fpdoc smart -fpdoc_release: - $(MAKE) -C fpdoc release -fpdoc_units: - $(MAKE) -C fpdoc units -fpdoc_examples: - $(MAKE) -C fpdoc examples -fpdoc_shared: - $(MAKE) -C fpdoc shared -fpdoc_install: - $(MAKE) -C fpdoc install -fpdoc_sourceinstall: - $(MAKE) -C fpdoc sourceinstall -fpdoc_exampleinstall: - $(MAKE) -C fpdoc exampleinstall -fpdoc_distinstall: - $(MAKE) -C fpdoc distinstall -fpdoc_zipinstall: - $(MAKE) -C fpdoc zipinstall -fpdoc_zipsourceinstall: - $(MAKE) -C fpdoc zipsourceinstall -fpdoc_zipexampleinstall: - $(MAKE) -C fpdoc zipexampleinstall -fpdoc_zipdistinstall: - $(MAKE) -C fpdoc zipdistinstall -fpdoc_clean: - $(MAKE) -C fpdoc clean -fpdoc_distclean: - $(MAKE) -C fpdoc distclean -fpdoc_cleanall: - $(MAKE) -C fpdoc cleanall -fpdoc_info: - $(MAKE) -C fpdoc info -fpdoc_makefiles: - $(MAKE) -C fpdoc makefiles -fpdoc: - $(MAKE) -C fpdoc all -.PHONY: fpdoc_all fpdoc_debug fpdoc_smart fpdoc_release fpdoc_units fpdoc_examples fpdoc_shared fpdoc_install fpdoc_sourceinstall fpdoc_exampleinstall fpdoc_distinstall fpdoc_zipinstall fpdoc_zipsourceinstall fpdoc_zipexampleinstall fpdoc_zipdistinstall fpdoc_clean fpdoc_distclean fpdoc_cleanall fpdoc_info fpdoc_makefiles fpdoc -endif -ifdef TARGET_DIRS_FPCMKCFG -fpcmkcfg_all: - $(MAKE) -C fpcmkcfg all -fpcmkcfg_debug: - $(MAKE) -C fpcmkcfg debug -fpcmkcfg_smart: - $(MAKE) -C fpcmkcfg smart -fpcmkcfg_release: - $(MAKE) -C fpcmkcfg release -fpcmkcfg_units: - $(MAKE) -C fpcmkcfg units -fpcmkcfg_examples: - $(MAKE) -C fpcmkcfg examples -fpcmkcfg_shared: - $(MAKE) -C fpcmkcfg shared -fpcmkcfg_install: - $(MAKE) -C fpcmkcfg install -fpcmkcfg_sourceinstall: - $(MAKE) -C fpcmkcfg sourceinstall -fpcmkcfg_exampleinstall: - $(MAKE) -C fpcmkcfg exampleinstall -fpcmkcfg_distinstall: - $(MAKE) -C fpcmkcfg distinstall -fpcmkcfg_zipinstall: - $(MAKE) -C fpcmkcfg zipinstall -fpcmkcfg_zipsourceinstall: - $(MAKE) -C fpcmkcfg zipsourceinstall -fpcmkcfg_zipexampleinstall: - $(MAKE) -C fpcmkcfg zipexampleinstall -fpcmkcfg_zipdistinstall: - $(MAKE) -C fpcmkcfg zipdistinstall -fpcmkcfg_clean: - $(MAKE) -C fpcmkcfg clean -fpcmkcfg_distclean: - $(MAKE) -C fpcmkcfg distclean -fpcmkcfg_cleanall: - $(MAKE) -C fpcmkcfg cleanall -fpcmkcfg_info: - $(MAKE) -C fpcmkcfg info -fpcmkcfg_makefiles: - $(MAKE) -C fpcmkcfg makefiles -fpcmkcfg: - $(MAKE) -C fpcmkcfg all -.PHONY: fpcmkcfg_all fpcmkcfg_debug fpcmkcfg_smart fpcmkcfg_release fpcmkcfg_units fpcmkcfg_examples fpcmkcfg_shared fpcmkcfg_install fpcmkcfg_sourceinstall fpcmkcfg_exampleinstall fpcmkcfg_distinstall fpcmkcfg_zipinstall fpcmkcfg_zipsourceinstall fpcmkcfg_zipexampleinstall fpcmkcfg_zipdistinstall fpcmkcfg_clean fpcmkcfg_distclean fpcmkcfg_cleanall fpcmkcfg_info fpcmkcfg_makefiles fpcmkcfg -endif -ifdef TARGET_DIRS_PAS2UT -pas2ut_all: - $(MAKE) -C pas2ut all -pas2ut_debug: - $(MAKE) -C pas2ut debug -pas2ut_smart: - $(MAKE) -C pas2ut smart -pas2ut_release: - $(MAKE) -C pas2ut release -pas2ut_units: - $(MAKE) -C pas2ut units -pas2ut_examples: - $(MAKE) -C pas2ut examples -pas2ut_shared: - $(MAKE) -C pas2ut shared -pas2ut_install: - $(MAKE) -C pas2ut install -pas2ut_sourceinstall: - $(MAKE) -C pas2ut sourceinstall -pas2ut_exampleinstall: - $(MAKE) -C pas2ut exampleinstall -pas2ut_distinstall: - $(MAKE) -C pas2ut distinstall -pas2ut_zipinstall: - $(MAKE) -C pas2ut zipinstall -pas2ut_zipsourceinstall: - $(MAKE) -C pas2ut zipsourceinstall -pas2ut_zipexampleinstall: - $(MAKE) -C pas2ut zipexampleinstall -pas2ut_zipdistinstall: - $(MAKE) -C pas2ut zipdistinstall -pas2ut_clean: - $(MAKE) -C pas2ut clean -pas2ut_distclean: - $(MAKE) -C pas2ut distclean -pas2ut_cleanall: - $(MAKE) -C pas2ut cleanall -pas2ut_info: - $(MAKE) -C pas2ut info -pas2ut_makefiles: - $(MAKE) -C pas2ut makefiles -pas2ut: - $(MAKE) -C pas2ut all -.PHONY: pas2ut_all pas2ut_debug pas2ut_smart pas2ut_release pas2ut_units pas2ut_examples pas2ut_shared pas2ut_install pas2ut_sourceinstall pas2ut_exampleinstall pas2ut_distinstall pas2ut_zipinstall pas2ut_zipsourceinstall pas2ut_zipexampleinstall pas2ut_zipdistinstall pas2ut_clean pas2ut_distclean pas2ut_cleanall pas2ut_info pas2ut_makefiles pas2ut -endif -ifdef TARGET_DIRS_PAS2FPM -pas2fpm_all: - $(MAKE) -C pas2fpm all -pas2fpm_debug: - $(MAKE) -C pas2fpm debug -pas2fpm_smart: - $(MAKE) -C pas2fpm smart -pas2fpm_release: - $(MAKE) -C pas2fpm release -pas2fpm_units: - $(MAKE) -C pas2fpm units -pas2fpm_examples: - $(MAKE) -C pas2fpm examples -pas2fpm_shared: - $(MAKE) -C pas2fpm shared -pas2fpm_install: - $(MAKE) -C pas2fpm install -pas2fpm_sourceinstall: - $(MAKE) -C pas2fpm sourceinstall -pas2fpm_exampleinstall: - $(MAKE) -C pas2fpm exampleinstall -pas2fpm_distinstall: - $(MAKE) -C pas2fpm distinstall -pas2fpm_zipinstall: - $(MAKE) -C pas2fpm zipinstall -pas2fpm_zipsourceinstall: - $(MAKE) -C pas2fpm zipsourceinstall -pas2fpm_zipexampleinstall: - $(MAKE) -C pas2fpm zipexampleinstall -pas2fpm_zipdistinstall: - $(MAKE) -C pas2fpm zipdistinstall -pas2fpm_clean: - $(MAKE) -C pas2fpm clean -pas2fpm_distclean: - $(MAKE) -C pas2fpm distclean -pas2fpm_cleanall: - $(MAKE) -C pas2fpm cleanall -pas2fpm_info: - $(MAKE) -C pas2fpm info -pas2fpm_makefiles: - $(MAKE) -C pas2fpm makefiles -pas2fpm: - $(MAKE) -C pas2fpm all -.PHONY: pas2fpm_all pas2fpm_debug pas2fpm_smart pas2fpm_release pas2fpm_units pas2fpm_examples pas2fpm_shared pas2fpm_install pas2fpm_sourceinstall pas2fpm_exampleinstall pas2fpm_distinstall pas2fpm_zipinstall pas2fpm_zipsourceinstall pas2fpm_zipexampleinstall pas2fpm_zipdistinstall pas2fpm_clean pas2fpm_distclean pas2fpm_cleanall pas2fpm_info pas2fpm_makefiles pas2fpm -endif -ifdef TARGET_DIRS_PAS2JNI -pas2jni_all: - $(MAKE) -C pas2jni all -pas2jni_debug: - $(MAKE) -C pas2jni debug -pas2jni_smart: - $(MAKE) -C pas2jni smart -pas2jni_release: - $(MAKE) -C pas2jni release -pas2jni_units: - $(MAKE) -C pas2jni units -pas2jni_examples: - $(MAKE) -C pas2jni examples -pas2jni_shared: - $(MAKE) -C pas2jni shared -pas2jni_install: - $(MAKE) -C pas2jni install -pas2jni_sourceinstall: - $(MAKE) -C pas2jni sourceinstall -pas2jni_exampleinstall: - $(MAKE) -C pas2jni exampleinstall -pas2jni_distinstall: - $(MAKE) -C pas2jni distinstall -pas2jni_zipinstall: - $(MAKE) -C pas2jni zipinstall -pas2jni_zipsourceinstall: - $(MAKE) -C pas2jni zipsourceinstall -pas2jni_zipexampleinstall: - $(MAKE) -C pas2jni zipexampleinstall -pas2jni_zipdistinstall: - $(MAKE) -C pas2jni zipdistinstall -pas2jni_clean: - $(MAKE) -C pas2jni clean -pas2jni_distclean: - $(MAKE) -C pas2jni distclean -pas2jni_cleanall: - $(MAKE) -C pas2jni cleanall -pas2jni_info: - $(MAKE) -C pas2jni info -pas2jni_makefiles: - $(MAKE) -C pas2jni makefiles -pas2jni: - $(MAKE) -C pas2jni all -.PHONY: pas2jni_all pas2jni_debug pas2jni_smart pas2jni_release pas2jni_units pas2jni_examples pas2jni_shared pas2jni_install pas2jni_sourceinstall pas2jni_exampleinstall pas2jni_distinstall pas2jni_zipinstall pas2jni_zipsourceinstall pas2jni_zipexampleinstall pas2jni_zipdistinstall pas2jni_clean pas2jni_distclean pas2jni_cleanall pas2jni_info pas2jni_makefiles pas2jni -endif -ifdef TARGET_DIRS_FPCRES -fpcres_all: - $(MAKE) -C fpcres all -fpcres_debug: - $(MAKE) -C fpcres debug -fpcres_smart: - $(MAKE) -C fpcres smart -fpcres_release: - $(MAKE) -C fpcres release -fpcres_units: - $(MAKE) -C fpcres units -fpcres_examples: - $(MAKE) -C fpcres examples -fpcres_shared: - $(MAKE) -C fpcres shared -fpcres_install: - $(MAKE) -C fpcres install -fpcres_sourceinstall: - $(MAKE) -C fpcres sourceinstall -fpcres_exampleinstall: - $(MAKE) -C fpcres exampleinstall -fpcres_distinstall: - $(MAKE) -C fpcres distinstall -fpcres_zipinstall: - $(MAKE) -C fpcres zipinstall -fpcres_zipsourceinstall: - $(MAKE) -C fpcres zipsourceinstall -fpcres_zipexampleinstall: - $(MAKE) -C fpcres zipexampleinstall -fpcres_zipdistinstall: - $(MAKE) -C fpcres zipdistinstall -fpcres_clean: - $(MAKE) -C fpcres clean -fpcres_distclean: - $(MAKE) -C fpcres distclean -fpcres_cleanall: - $(MAKE) -C fpcres cleanall -fpcres_info: - $(MAKE) -C fpcres info -fpcres_makefiles: - $(MAKE) -C fpcres makefiles -fpcres: - $(MAKE) -C fpcres all -.PHONY: fpcres_all fpcres_debug fpcres_smart fpcres_release fpcres_units fpcres_examples fpcres_shared fpcres_install fpcres_sourceinstall fpcres_exampleinstall fpcres_distinstall fpcres_zipinstall fpcres_zipsourceinstall fpcres_zipexampleinstall fpcres_zipdistinstall fpcres_clean fpcres_distclean fpcres_cleanall fpcres_info fpcres_makefiles fpcres -endif -ifdef TARGET_DIRS_INSTANTFPC -instantfpc_all: - $(MAKE) -C instantfpc all -instantfpc_debug: - $(MAKE) -C instantfpc debug -instantfpc_smart: - $(MAKE) -C instantfpc smart -instantfpc_release: - $(MAKE) -C instantfpc release -instantfpc_units: - $(MAKE) -C instantfpc units -instantfpc_examples: - $(MAKE) -C instantfpc examples -instantfpc_shared: - $(MAKE) -C instantfpc shared -instantfpc_install: - $(MAKE) -C instantfpc install -instantfpc_sourceinstall: - $(MAKE) -C instantfpc sourceinstall -instantfpc_exampleinstall: - $(MAKE) -C instantfpc exampleinstall -instantfpc_distinstall: - $(MAKE) -C instantfpc distinstall -instantfpc_zipinstall: - $(MAKE) -C instantfpc zipinstall -instantfpc_zipsourceinstall: - $(MAKE) -C instantfpc zipsourceinstall -instantfpc_zipexampleinstall: - $(MAKE) -C instantfpc zipexampleinstall -instantfpc_zipdistinstall: - $(MAKE) -C instantfpc zipdistinstall -instantfpc_clean: - $(MAKE) -C instantfpc clean -instantfpc_distclean: - $(MAKE) -C instantfpc distclean -instantfpc_cleanall: - $(MAKE) -C instantfpc cleanall -instantfpc_info: - $(MAKE) -C instantfpc info -instantfpc_makefiles: - $(MAKE) -C instantfpc makefiles -instantfpc: - $(MAKE) -C instantfpc all -.PHONY: instantfpc_all instantfpc_debug instantfpc_smart instantfpc_release instantfpc_units instantfpc_examples instantfpc_shared instantfpc_install instantfpc_sourceinstall instantfpc_exampleinstall instantfpc_distinstall instantfpc_zipinstall instantfpc_zipsourceinstall instantfpc_zipexampleinstall instantfpc_zipdistinstall instantfpc_clean instantfpc_distclean instantfpc_cleanall instantfpc_info instantfpc_makefiles instantfpc -endif -ifdef TARGET_DIRS_UNICODE -unicode_all: - $(MAKE) -C unicode all -unicode_debug: - $(MAKE) -C unicode debug -unicode_smart: - $(MAKE) -C unicode smart -unicode_release: - $(MAKE) -C unicode release -unicode_units: - $(MAKE) -C unicode units -unicode_examples: - $(MAKE) -C unicode examples -unicode_shared: - $(MAKE) -C unicode shared -unicode_install: - $(MAKE) -C unicode install -unicode_sourceinstall: - $(MAKE) -C unicode sourceinstall -unicode_exampleinstall: - $(MAKE) -C unicode exampleinstall -unicode_distinstall: - $(MAKE) -C unicode distinstall -unicode_zipinstall: - $(MAKE) -C unicode zipinstall -unicode_zipsourceinstall: - $(MAKE) -C unicode zipsourceinstall -unicode_zipexampleinstall: - $(MAKE) -C unicode zipexampleinstall -unicode_zipdistinstall: - $(MAKE) -C unicode zipdistinstall -unicode_clean: - $(MAKE) -C unicode clean -unicode_distclean: - $(MAKE) -C unicode distclean -unicode_cleanall: - $(MAKE) -C unicode cleanall -unicode_info: - $(MAKE) -C unicode info -unicode_makefiles: - $(MAKE) -C unicode makefiles -unicode: - $(MAKE) -C unicode all -.PHONY: unicode_all unicode_debug unicode_smart unicode_release unicode_units unicode_examples unicode_shared unicode_install unicode_sourceinstall unicode_exampleinstall unicode_distinstall unicode_zipinstall unicode_zipsourceinstall unicode_zipexampleinstall unicode_zipdistinstall unicode_clean unicode_distclean unicode_cleanall unicode_info unicode_makefiles unicode -endif -ifdef TARGET_DIRS_RMWAIT -rmwait_all: - $(MAKE) -C rmwait all -rmwait_debug: - $(MAKE) -C rmwait debug -rmwait_smart: - $(MAKE) -C rmwait smart -rmwait_release: - $(MAKE) -C rmwait release -rmwait_units: - $(MAKE) -C rmwait units -rmwait_examples: - $(MAKE) -C rmwait examples -rmwait_shared: - $(MAKE) -C rmwait shared -rmwait_install: - $(MAKE) -C rmwait install -rmwait_sourceinstall: - $(MAKE) -C rmwait sourceinstall -rmwait_exampleinstall: - $(MAKE) -C rmwait exampleinstall -rmwait_distinstall: - $(MAKE) -C rmwait distinstall -rmwait_zipinstall: - $(MAKE) -C rmwait zipinstall -rmwait_zipsourceinstall: - $(MAKE) -C rmwait zipsourceinstall -rmwait_zipexampleinstall: - $(MAKE) -C rmwait zipexampleinstall -rmwait_zipdistinstall: - $(MAKE) -C rmwait zipdistinstall -rmwait_clean: - $(MAKE) -C rmwait clean -rmwait_distclean: - $(MAKE) -C rmwait distclean -rmwait_cleanall: - $(MAKE) -C rmwait cleanall -rmwait_info: - $(MAKE) -C rmwait info -rmwait_makefiles: - $(MAKE) -C rmwait makefiles -rmwait: - $(MAKE) -C rmwait all -.PHONY: rmwait_all rmwait_debug rmwait_smart rmwait_release rmwait_units rmwait_examples rmwait_shared rmwait_install rmwait_sourceinstall rmwait_exampleinstall rmwait_distinstall rmwait_zipinstall rmwait_zipsourceinstall rmwait_zipexampleinstall rmwait_zipdistinstall rmwait_clean rmwait_distclean rmwait_cleanall rmwait_info rmwait_makefiles rmwait -endif -ifdef TARGET_DIRS_FPMC -fpmc_all: - $(MAKE) -C fpmc all -fpmc_debug: - $(MAKE) -C fpmc debug -fpmc_smart: - $(MAKE) -C fpmc smart -fpmc_release: - $(MAKE) -C fpmc release -fpmc_units: - $(MAKE) -C fpmc units -fpmc_examples: - $(MAKE) -C fpmc examples -fpmc_shared: - $(MAKE) -C fpmc shared -fpmc_install: - $(MAKE) -C fpmc install -fpmc_sourceinstall: - $(MAKE) -C fpmc sourceinstall -fpmc_exampleinstall: - $(MAKE) -C fpmc exampleinstall -fpmc_distinstall: - $(MAKE) -C fpmc distinstall -fpmc_zipinstall: - $(MAKE) -C fpmc zipinstall -fpmc_zipsourceinstall: - $(MAKE) -C fpmc zipsourceinstall -fpmc_zipexampleinstall: - $(MAKE) -C fpmc zipexampleinstall -fpmc_zipdistinstall: - $(MAKE) -C fpmc zipdistinstall -fpmc_clean: - $(MAKE) -C fpmc clean -fpmc_distclean: - $(MAKE) -C fpmc distclean -fpmc_cleanall: - $(MAKE) -C fpmc cleanall -fpmc_info: - $(MAKE) -C fpmc info -fpmc_makefiles: - $(MAKE) -C fpmc makefiles -fpmc: - $(MAKE) -C fpmc all -.PHONY: fpmc_all fpmc_debug fpmc_smart fpmc_release fpmc_units fpmc_examples fpmc_shared fpmc_install fpmc_sourceinstall fpmc_exampleinstall fpmc_distinstall fpmc_zipinstall fpmc_zipsourceinstall fpmc_zipexampleinstall fpmc_zipdistinstall fpmc_clean fpmc_distclean fpmc_cleanall fpmc_info fpmc_makefiles fpmc -endif -ifdef TARGET_DIRS_IMPORTTL -importtl_all: - $(MAKE) -C importtl all -importtl_debug: - $(MAKE) -C importtl debug -importtl_smart: - $(MAKE) -C importtl smart -importtl_release: - $(MAKE) -C importtl release -importtl_units: - $(MAKE) -C importtl units -importtl_examples: - $(MAKE) -C importtl examples -importtl_shared: - $(MAKE) -C importtl shared -importtl_install: - $(MAKE) -C importtl install -importtl_sourceinstall: - $(MAKE) -C importtl sourceinstall -importtl_exampleinstall: - $(MAKE) -C importtl exampleinstall -importtl_distinstall: - $(MAKE) -C importtl distinstall -importtl_zipinstall: - $(MAKE) -C importtl zipinstall -importtl_zipsourceinstall: - $(MAKE) -C importtl zipsourceinstall -importtl_zipexampleinstall: - $(MAKE) -C importtl zipexampleinstall -importtl_zipdistinstall: - $(MAKE) -C importtl zipdistinstall -importtl_clean: - $(MAKE) -C importtl clean -importtl_distclean: - $(MAKE) -C importtl distclean -importtl_cleanall: - $(MAKE) -C importtl cleanall -importtl_info: - $(MAKE) -C importtl info -importtl_makefiles: - $(MAKE) -C importtl makefiles -importtl: - $(MAKE) -C importtl all -.PHONY: importtl_all importtl_debug importtl_smart importtl_release importtl_units importtl_examples importtl_shared importtl_install importtl_sourceinstall importtl_exampleinstall importtl_distinstall importtl_zipinstall importtl_zipsourceinstall importtl_zipexampleinstall importtl_zipdistinstall importtl_clean importtl_distclean importtl_cleanall importtl_info importtl_makefiles importtl -endif -ifdef TARGET_DIRS_FPCRESLIPO -fpcreslipo_all: - $(MAKE) -C fpcreslipo all -fpcreslipo_debug: - $(MAKE) -C fpcreslipo debug -fpcreslipo_smart: - $(MAKE) -C fpcreslipo smart -fpcreslipo_release: - $(MAKE) -C fpcreslipo release -fpcreslipo_units: - $(MAKE) -C fpcreslipo units -fpcreslipo_examples: - $(MAKE) -C fpcreslipo examples -fpcreslipo_shared: - $(MAKE) -C fpcreslipo shared -fpcreslipo_install: - $(MAKE) -C fpcreslipo install -fpcreslipo_sourceinstall: - $(MAKE) -C fpcreslipo sourceinstall -fpcreslipo_exampleinstall: - $(MAKE) -C fpcreslipo exampleinstall -fpcreslipo_distinstall: - $(MAKE) -C fpcreslipo distinstall -fpcreslipo_zipinstall: - $(MAKE) -C fpcreslipo zipinstall -fpcreslipo_zipsourceinstall: - $(MAKE) -C fpcreslipo zipsourceinstall -fpcreslipo_zipexampleinstall: - $(MAKE) -C fpcreslipo zipexampleinstall -fpcreslipo_zipdistinstall: - $(MAKE) -C fpcreslipo zipdistinstall -fpcreslipo_clean: - $(MAKE) -C fpcreslipo clean -fpcreslipo_distclean: - $(MAKE) -C fpcreslipo distclean -fpcreslipo_cleanall: - $(MAKE) -C fpcreslipo cleanall -fpcreslipo_info: - $(MAKE) -C fpcreslipo info -fpcreslipo_makefiles: - $(MAKE) -C fpcreslipo makefiles -fpcreslipo: - $(MAKE) -C fpcreslipo all -.PHONY: fpcreslipo_all fpcreslipo_debug fpcreslipo_smart fpcreslipo_release fpcreslipo_units fpcreslipo_examples fpcreslipo_shared fpcreslipo_install fpcreslipo_sourceinstall fpcreslipo_exampleinstall fpcreslipo_distinstall fpcreslipo_zipinstall fpcreslipo_zipsourceinstall fpcreslipo_zipexampleinstall fpcreslipo_zipdistinstall fpcreslipo_clean fpcreslipo_distclean fpcreslipo_cleanall fpcreslipo_info fpcreslipo_makefiles fpcreslipo -endif -all: fpc_all $(addsuffix _all,$(TARGET_DIRS)) -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units $(addsuffix _units,$(TARGET_DIRS)) -examples: $(addsuffix _examples,$(TARGET_DIRS)) -shared: fpc_shared -install: fpc_install $(addsuffix _install,$(TARGET_DIRS)) -sourceinstall: fpc_sourceinstall -exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS)) -distinstall: fpc_distinstall -zipinstall: fpc_zipinstall -zipsourceinstall: fpc_zipsourceinstall -zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) -zipdistinstall: fpc_zipdistinstall -clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) -distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS)) -cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS)) -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 -ifneq ($(wildcard fpcmake.loc),) -include fpcmake.loc +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) $(FPMAKE_INSTALL_OPT) -ie +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) $(FPMAKE_INSTALL_OPT) -ie endif -ptop$(EXEEXT): ptop.pp ptopu$(PPUEXT) -ptopu$(PPUEXT): ptopu.pp -ppdep$(EXEEXT): ppdep.pp -unexport DATA2INC -.NOTPARALLEL: +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/Makefile.fpc b/utils/Makefile.fpc index e2c45900e7..fbf7c3d8ab 100644 --- a/utils/Makefile.fpc +++ b/utils/Makefile.fpc @@ -1,84 +1,104 @@ # -# Makefile.fpc for Free Pascal Utils +# Makefile.fpc for running fpmake # - -[package] -name=utils -version=2.7.1 - -[target] -dirs=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni -programs=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir -programs_linux=grab_vcsa -dirs_win32=fpmc fpcres rmwait instantfpc importtl unicode -dirs_win64=fpmc fpcres rmwait instantfpc importtl unicode -dirs_wince=fpcres rmwait instantfpc -dirs_haiku=fpcres instantfpc -dirs_linux=fpcres instantfpc unicode -dirs_freebsd=fpcres instantfpc -dirs_openbsd=fpcres instantfpc -dirs_netbsd=fpcres instantfpc -dirs_darwin=fpcres fpcreslipo instantfpc unicode -dirs_iphonesim=fpcres fpcreslipo instantfpc -dirs_solaris=fpcres instantfpc -dirs_os2=fpmc fpcres rmwait -dirs_emx=fpmc fpcres rmwait -dirs_go32v2=rmwait -dirs_aix=fpcres instantfpc -rsts=rstconv - [require] -packages=fcl-base paszlib hash -packages_darwin=univint -packages_iphonesim=univint - -[clean] -units=ptopu +packages=rtl fpmkunit [install] fpcpackage=y +fpcsubdir=utils [default] fpcdir=.. +[prerules] +# Translate INSTALL_UNITDIR to fpmake's --unitinstalldir parameter +ifdef INSTALL_UNITDIR +FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR) +endif +# Translate OS_TARGET and CPU_TARGET to fpmake's --os and --cpu parameters +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] -# -# Pascal beautifier -# -ptop$(EXEEXT): ptop.pp ptopu$(PPUEXT) - -ptopu$(PPUEXT): ptopu.pp - -# -# Other -# - -ppdep$(EXEEXT): ppdep.pp - -# -# Don't export some tools, which are found in the current dir if it's in -# the path, so are not valid for the subdirs -# +# 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 +ifndef BUILDFULLNATIVE +FPMAKE_OPT+=-sp +endif +.NOTPARALLEL: -unexport DATA2INC +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 -# order dependencies to avoid link.res clashes -# -- only supported as of Make 3.80, which is not available for go32v2 -> -# no parallel making here... -# -#grab_vcsa$(EXEEXT): | ppdep$(EXEEXT) -# -#ppdep$(EXEEXT): | ptop$(EXEEXT) -# -#ptop$(EXEEXT): | postw32$(EXEEXT) -# -#postw32$(EXEEXT): | rstconv$(EXEEXT) -# -#rstconv$(EXEEXT): | data2inc$(EXEEXT) -# -#data2inc$(EXEEXT): | delp$(EXEEXT) -# -#delp$(EXEEXT): | bin2obj$(EXEEXT) +CLEAN_TARGET_DIRS=$(subst /Makefile.fpc, ,$(wildcard */Makefile.fpc)) +%_distclean: + $(MAKE) -C $* distclean -.NOTPARALLEL: +# 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: fpc_cleanall $(addsuffix _distclean,$(CLEAN_TARGET_DIRS)) +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) + -$(DEL) fpmake.o + -$(DEL) fpmake.dbg +endif +cleanall: distclean +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) $(FPMAKE_INSTALL_OPT) +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) $(FPMAKE_INSTALL_OPT) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) $(FPMAKE_INSTALL_OPT) -ie +else + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) $(FPMAKE_INSTALL_OPT) -ie +endif +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/Makefile.fpc.fpcmake b/utils/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..e2c45900e7 --- /dev/null +++ b/utils/Makefile.fpc.fpcmake @@ -0,0 +1,84 @@ +# +# Makefile.fpc for Free Pascal Utils +# + +[package] +name=utils +version=2.7.1 + +[target] +dirs=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg pas2ut pas2fpm pas2jni +programs=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir +programs_linux=grab_vcsa +dirs_win32=fpmc fpcres rmwait instantfpc importtl unicode +dirs_win64=fpmc fpcres rmwait instantfpc importtl unicode +dirs_wince=fpcres rmwait instantfpc +dirs_haiku=fpcres instantfpc +dirs_linux=fpcres instantfpc unicode +dirs_freebsd=fpcres instantfpc +dirs_openbsd=fpcres instantfpc +dirs_netbsd=fpcres instantfpc +dirs_darwin=fpcres fpcreslipo instantfpc unicode +dirs_iphonesim=fpcres fpcreslipo instantfpc +dirs_solaris=fpcres instantfpc +dirs_os2=fpmc fpcres rmwait +dirs_emx=fpmc fpcres rmwait +dirs_go32v2=rmwait +dirs_aix=fpcres instantfpc +rsts=rstconv + +[require] +packages=fcl-base paszlib hash +packages_darwin=univint +packages_iphonesim=univint + +[clean] +units=ptopu + +[install] +fpcpackage=y + +[default] +fpcdir=.. + + +[rules] +# +# Pascal beautifier +# +ptop$(EXEEXT): ptop.pp ptopu$(PPUEXT) + +ptopu$(PPUEXT): ptopu.pp + +# +# Other +# + +ppdep$(EXEEXT): ppdep.pp + +# +# Don't export some tools, which are found in the current dir if it's in +# the path, so are not valid for the subdirs +# + +unexport DATA2INC + +# order dependencies to avoid link.res clashes +# -- only supported as of Make 3.80, which is not available for go32v2 -> +# no parallel making here... +# +#grab_vcsa$(EXEEXT): | ppdep$(EXEEXT) +# +#ppdep$(EXEEXT): | ptop$(EXEEXT) +# +#ptop$(EXEEXT): | postw32$(EXEEXT) +# +#postw32$(EXEEXT): | rstconv$(EXEEXT) +# +#rstconv$(EXEEXT): | data2inc$(EXEEXT) +# +#data2inc$(EXEEXT): | delp$(EXEEXT) +# +#delp$(EXEEXT): | bin2obj$(EXEEXT) + +.NOTPARALLEL: diff --git a/utils/debugsvr/Makefile b/utils/debugsvr/Makefile index f4067fb913..81ca84f0ac 100644 --- a/utils/debugsvr/Makefile +++ b/utils/debugsvr/Makefile @@ -319,882 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_DIRS+=gtk console -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=msgintf debugserverintf dbugintf +override PACKAGE_NAME=debugsvr +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_UNITS+=msgintf debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_RSTS+=debugserverintf dbugintf -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_EXAMPLES+=testdebug speeddebug -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_EXAMPLES+=testdebug speeddebug +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1825,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2083,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2237,113 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) -override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) -override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -endif -fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES) ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) endif -.PHONY: fpc_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared -$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET) - @$(ECHOREDIR) Compiled > $(FPCMADE) -fpc_all: $(FPCMADE) -fpc_smart: - $(MAKE) all LINKSMART=1 CREATESMART=1 -fpc_debug: - $(MAKE) all DEBUG=1 -fpc_release: - $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res -$(COMPILER_UNITTARGETDIR): - $(MKDIRTREE) $(COMPILER_UNITTARGETDIR) -$(COMPILER_TARGETDIR): - $(MKDIRTREE) $(COMPILER_TARGETDIR) -%$(PPUEXT): %.pp - $(COMPILER) $< - $(EXECPPAS) -%$(PPUEXT): %.pas - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.pp - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.pas - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.lpr - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.dpr - $(COMPILER) $< - $(EXECPPAS) -%.res: %.rc - windres -i $< -o $@ -vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.inc $(COMPILER_INCLUDEDIR) -vpath %$(OEXT) $(COMPILER_UNITTARGETDIR) -vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) -.PHONY: fpc_shared -override INSTALLTARGET+=fpc_shared_install -ifndef SHARED_LIBVERSION -SHARED_LIBVERSION=$(FPC_VERSION) -endif -ifndef SHARED_LIBNAME -SHARED_LIBNAME=$(PACKAGE_NAME) -endif -ifndef SHARED_FULLNAME -SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT) -endif -ifndef SHARED_LIBUNITS -SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS) -override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS)) -endif -fpc_shared: -ifdef HASSHAREDLIB - $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1 -ifneq ($(SHARED_BUILD),n) - $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -endif -else - @$(ECHO) Shared Libraries not supported -endif -fpc_shared_install: -ifneq ($(SHARED_BUILD),n) -ifneq ($(SHARED_LIBUNITS),) -ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),) - $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR) -endif -endif -endif .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall ifdef INSTALL_UNITS override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) @@ -2411,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2595,414 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifeq ($(FULL_TARGET),i386-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i386-android) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-aix) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),arm-android) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),mips-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),jvm-java) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),jvm-android) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifeq ($(FULL_TARGET),i8086-msdos) -TARGET_DIRS_GTK=1 -TARGET_DIRS_CONSOLE=1 -endif -ifdef TARGET_DIRS_GTK -gtk_all: - $(MAKE) -C gtk all -gtk_debug: - $(MAKE) -C gtk debug -gtk_smart: - $(MAKE) -C gtk smart -gtk_release: - $(MAKE) -C gtk release -gtk_units: - $(MAKE) -C gtk units -gtk_examples: - $(MAKE) -C gtk examples -gtk_shared: - $(MAKE) -C gtk shared -gtk_install: - $(MAKE) -C gtk install -gtk_sourceinstall: - $(MAKE) -C gtk sourceinstall -gtk_exampleinstall: - $(MAKE) -C gtk exampleinstall -gtk_distinstall: - $(MAKE) -C gtk distinstall -gtk_zipinstall: - $(MAKE) -C gtk zipinstall -gtk_zipsourceinstall: - $(MAKE) -C gtk zipsourceinstall -gtk_zipexampleinstall: - $(MAKE) -C gtk zipexampleinstall -gtk_zipdistinstall: - $(MAKE) -C gtk zipdistinstall -gtk_clean: - $(MAKE) -C gtk clean -gtk_distclean: - $(MAKE) -C gtk distclean -gtk_cleanall: - $(MAKE) -C gtk cleanall -gtk_info: - $(MAKE) -C gtk info -gtk_makefiles: - $(MAKE) -C gtk makefiles -gtk: - $(MAKE) -C gtk all -.PHONY: gtk_all gtk_debug gtk_smart gtk_release gtk_units gtk_examples gtk_shared gtk_install gtk_sourceinstall gtk_exampleinstall gtk_distinstall gtk_zipinstall gtk_zipsourceinstall gtk_zipexampleinstall gtk_zipdistinstall gtk_clean gtk_distclean gtk_cleanall gtk_info gtk_makefiles gtk -endif -ifdef TARGET_DIRS_CONSOLE -console_all: - $(MAKE) -C console all -console_debug: - $(MAKE) -C console debug -console_smart: - $(MAKE) -C console smart -console_release: - $(MAKE) -C console release -console_units: - $(MAKE) -C console units -console_examples: - $(MAKE) -C console examples -console_shared: - $(MAKE) -C console shared -console_install: - $(MAKE) -C console install -console_sourceinstall: - $(MAKE) -C console sourceinstall -console_exampleinstall: - $(MAKE) -C console exampleinstall -console_distinstall: - $(MAKE) -C console distinstall -console_zipinstall: - $(MAKE) -C console zipinstall -console_zipsourceinstall: - $(MAKE) -C console zipsourceinstall -console_zipexampleinstall: - $(MAKE) -C console zipexampleinstall -console_zipdistinstall: - $(MAKE) -C console zipdistinstall -console_clean: - $(MAKE) -C console clean -console_distclean: - $(MAKE) -C console distclean -console_cleanall: - $(MAKE) -C console cleanall -console_info: - $(MAKE) -C console info -console_makefiles: - $(MAKE) -C console makefiles -console: - $(MAKE) -C console all -.PHONY: console_all console_debug console_smart console_release console_units console_examples console_shared console_install console_sourceinstall console_exampleinstall console_distinstall console_zipinstall console_zipsourceinstall console_zipexampleinstall console_zipdistinstall console_clean console_distclean console_cleanall console_info console_makefiles console -endif -all: fpc_all $(addsuffix _all,$(TARGET_DIRS)) -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units $(addsuffix _units,$(TARGET_DIRS)) -examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS)) -shared: fpc_shared -install: fpc_install $(addsuffix _install,$(TARGET_DIRS)) -sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS)) -exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS)) -distinstall: $(addsuffix _distinstall,$(TARGET_DIRS)) -zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS)) -zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS)) -zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) -zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS)) -clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) -distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS)) -cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS)) +units: +examples: +shared: +sourceinstall: fpc_sourceinstall +exampleinstall: fpc_exampleinstall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall info: fpc_info -makefiles: fpc_makefiles $(addsuffix _makefiles,$(TARGET_DIRS)) -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +makefiles: fpc_makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -debugserverintf$(PPUEXT): msgintf$(PPUEXT) debugserverintf.pp - $(COMPILER) debugserverintf$(PASEXT) -dbugintf$(PPUEXT): msgintf$(PPUEXT) dbugintf.pp - $(COMPILER) dbugintf.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/debugsvr/Makefile.fpc b/utils/debugsvr/Makefile.fpc index 78fdfa8329..d5ecf26b6b 100644 --- a/utils/debugsvr/Makefile.fpc +++ b/utils/debugsvr/Makefile.fpc @@ -1,16 +1,13 @@ # -# Makefile.fpc for debugserver +# Makefile.fpc for running fpmake # -[target] -units=msgintf debugserverintf dbugintf -dirs=gtk console -examples=testdebug speeddebug -rsts=debugserverintf dbugintf +[package] +name=debugsvr +version=2.7.1 -[clean] - -[compiler] +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -18,11 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] +# 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: -debugserverintf$(PPUEXT): msgintf$(PPUEXT) debugserverintf.pp - $(COMPILER) debugserverintf$(PASEXT) -dbugintf$(PPUEXT): msgintf$(PPUEXT) dbugintf.pp - $(COMPILER) dbugintf.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/debugsvr/Makefile.fpc.fpcmake b/utils/debugsvr/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..78fdfa8329 --- /dev/null +++ b/utils/debugsvr/Makefile.fpc.fpcmake @@ -0,0 +1,28 @@ +# +# Makefile.fpc for debugserver +# + +[target] +units=msgintf debugserverintf dbugintf +dirs=gtk console +examples=testdebug speeddebug +rsts=debugserverintf dbugintf + +[clean] + +[compiler] + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + + +[rules] +.NOTPARALLEL: +debugserverintf$(PPUEXT): msgintf$(PPUEXT) debugserverintf.pp + $(COMPILER) debugserverintf$(PASEXT) + +dbugintf$(PPUEXT): msgintf$(PPUEXT) dbugintf.pp + $(COMPILER) dbugintf.pp diff --git a/utils/dxegen/Makefile b/utils/dxegen/Makefile index a69feac57c..942a194d29 100644 --- a/utils/dxegen/Makefile +++ b/utils/dxegen/Makefile @@ -319,228 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=dxegen -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=coff +override PACKAGE_NAME=dxegen +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=coff -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=coff +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1171,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1429,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1583,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -1747,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -1931,30 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -dxegen$(EXEEXT): dxegen.pp coff$(PPUEXT) -coff$(PPUEXT) : coff.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/dxegen/Makefile.fpc b/utils/dxegen/Makefile.fpc index 87b0b37587..519b60cf58 100644 --- a/utils/dxegen/Makefile.fpc +++ b/utils/dxegen/Makefile.fpc @@ -1,12 +1,13 @@ # -# Makefile.fpc for Free Pascal Utils +# Makefile.fpc for running fpmake # -[target] -programs_go32v2=dxegen +[package] +name=dxegen +version=2.7.1 -[clean] -units=coff +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -14,8 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -dxegen$(EXEEXT): dxegen.pp coff$(PPUEXT) -coff$(PPUEXT) : coff.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/dxegen/Makefile.fpc.fpcmake b/utils/dxegen/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..87b0b37587 --- /dev/null +++ b/utils/dxegen/Makefile.fpc.fpcmake @@ -0,0 +1,21 @@ +# +# Makefile.fpc for Free Pascal Utils +# + +[target] +programs_go32v2=dxegen + +[clean] +units=coff + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +dxegen$(EXEEXT): dxegen.pp coff$(PPUEXT) + +coff$(PPUEXT) : coff.pp diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile index 8ce0cae871..2bad09b68a 100644 --- a/utils/fpcm/Makefile +++ b/utils/fpcm/Makefile @@ -319,672 +319,17 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX) -REVINC:=$(wildcard revision.inc) -ifneq ($(REVINC),) -override FPCOPT+=-dREVINC -endif -REVINC_FILES=$(wildcard fpcm*.pp fpcmake.ini Makefile.fpc) -SVN:=$(firstword $(wildcard $(addsuffix /svn$(SRCEXEEXT),$(SEARCHPATH)))) -SVNLOG:=svninfo.log -GETREVEXE:=./getrev$(EXEEXT) -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fpcmake -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=fpcmmain +override PACKAGE_NAME=fpcm +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_RSTS+=fpcmmain -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) +BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1615,7 +960,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1623,7 +968,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1632,7 +976,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1641,7 +984,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1650,7 +992,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1659,7 +1000,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1668,7 +1008,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1677,7 +1016,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1686,7 +1024,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1695,7 +1032,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1704,7 +1040,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1713,7 +1048,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1722,7 +1056,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1731,7 +1064,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1740,7 +1072,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1749,7 +1080,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1758,7 +1088,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1767,7 +1096,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1776,7 +1104,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1785,7 +1112,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1794,7 +1120,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1803,7 +1128,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1812,7 +1136,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1821,7 +1144,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1830,7 +1152,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1839,7 +1160,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1848,7 +1168,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1857,7 +1176,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1866,7 +1184,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1875,7 +1192,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1884,7 +1200,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1893,7 +1208,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1902,7 +1216,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1911,7 +1224,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1920,7 +1232,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1929,7 +1240,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1938,7 +1248,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1947,7 +1256,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1956,7 +1264,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1965,7 +1272,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1974,7 +1280,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1983,7 +1288,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1992,7 +1296,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2001,7 +1304,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2010,7 +1312,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2019,7 +1320,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2028,7 +1328,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2037,7 +1336,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2046,7 +1344,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2055,7 +1352,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2064,7 +1360,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2073,7 +1368,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2082,7 +1376,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2091,7 +1384,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2100,7 +1392,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2109,7 +1400,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2118,7 +1408,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2127,7 +1416,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2136,7 +1424,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2145,7 +1432,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2154,7 +1440,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -2163,7 +1448,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2172,7 +1456,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2181,7 +1464,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2190,7 +1472,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2199,7 +1480,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2208,7 +1488,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2217,7 +1496,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2226,7 +1504,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2235,7 +1512,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2244,7 +1520,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2253,7 +1528,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2262,7 +1536,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2271,7 +1544,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2501,44 +1773,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2693,103 +1927,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2857,6 +1998,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -3041,64 +2268,75 @@ 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: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -ifneq ($(DATA2INC),) -fpcmake.inc: fpcmake.ini - $(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini -endif +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 -EnableRevIncRule=1 + { $(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 -ifdef inCygWin -EnableRevIncRule=1 -endif -ifneq (,$(SVN)) -revision.inc : $(REVINC_FILES) - -$(SVN) info $(REVINC_FILES) > $(SVNLOG) - $(MAKE) getrev$(EXEEXT) - $(GETREVEXE) $(SVNLOG) - -$(DEL) getrev$(EXEEXT) -endif -.PHONY : revision -revision : - $(MAKE) -B revision.inc -fpcmwr$(PPUEXT): fpcmake.inc -fpcmmain$(PPUEXT): $(REVINC) -fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc $(REVINC) -fpcmake$(EXEEXT): fpcmwr$(PPUEXT) fpcmmain$(PPUEXT) + -$(DEL) $(LOCALFPMAKE) +endif +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie ifndef inCygWin $(BS_UNITDIR): $(MKDIRTREE) $(BS_UNITDIR) diff --git a/utils/fpcm/Makefile.fpc b/utils/fpcm/Makefile.fpc index 76b9121640..2a95227376 100644 --- a/utils/fpcm/Makefile.fpc +++ b/utils/fpcm/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for FPCMake +# Makefile.fpc for running fpmake # -[target] -programs=fpcmake -rsts=fpcmmain - -[clean] -units=fpcmmain fpcmdic fpcmwr fpcmpkg +[package] +name=fpcm +version=2.7.1 [require] -packages=fcl-base -tools=data2inc +packages=rtl fpmkunit [install] fpcpackage=y @@ -20,62 +16,83 @@ fpcpackage=y fpcdir=../.. [prerules] -BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX) - -# Check if revision.inc is present -REVINC:=$(wildcard revision.inc) -ifneq ($(REVINC),) -# File revision.inc is present -# Use it to compile fpcmmain.pp unit -override FPCOPT+=-dREVINC +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -REVINC_FILES=$(wildcard fpcm*.pp fpcmake.ini Makefile.fpc) +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) +BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX) -SVN:=$(firstword $(wildcard $(addsuffix /svn$(SRCEXEEXT),$(SEARCHPATH)))) -SVNLOG:=svninfo.log -# This one can be overriden on command line for debugging purposes -GETREVEXE:=./getrev$(EXEEXT) [rules] -.NOTPARALLEL: -ifneq ($(DATA2INC),) -fpcmake.inc: fpcmake.ini - $(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini +# 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: - +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 -EnableRevIncRule=1 + { $(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 -ifdef inCygWin -EnableRevIncRule=1 + -$(DEL) $(LOCALFPMAKE) endif - -ifneq (,$(SVN)) -# revision.inc rule -revision.inc : $(REVINC_FILES) - -$(SVN) info $(REVINC_FILES) > $(SVNLOG) - $(MAKE) getrev$(EXEEXT) - $(GETREVEXE) $(SVNLOG) - -$(DEL) getrev$(EXEEXT) +cleanall: distclean +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 - -.PHONY : revision - -# Use -B option to force -# regeneration of revision.inc -revision : - $(MAKE) -B revision.inc - - -fpcmwr$(PPUEXT): fpcmake.inc - -fpcmmain$(PPUEXT): $(REVINC) - -fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc $(REVINC) - -fpcmake$(EXEEXT): fpcmwr$(PPUEXT) fpcmmain$(PPUEXT) - +# 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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie # Cygwin doesn't like c:/path/ ifndef inCygWin $(BS_UNITDIR): diff --git a/utils/fpcm/Makefile.fpc.fpcmake b/utils/fpcm/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..76b9121640 --- /dev/null +++ b/utils/fpcm/Makefile.fpc.fpcmake @@ -0,0 +1,85 @@ +# +# Makefile.fpc for FPCMake +# + +[target] +programs=fpcmake +rsts=fpcmmain + +[clean] +units=fpcmmain fpcmdic fpcmwr fpcmpkg + +[require] +packages=fcl-base +tools=data2inc + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[prerules] +BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX) + +# Check if revision.inc is present +REVINC:=$(wildcard revision.inc) +ifneq ($(REVINC),) +# File revision.inc is present +# Use it to compile fpcmmain.pp unit +override FPCOPT+=-dREVINC +endif +REVINC_FILES=$(wildcard fpcm*.pp fpcmake.ini Makefile.fpc) + +SVN:=$(firstword $(wildcard $(addsuffix /svn$(SRCEXEEXT),$(SEARCHPATH)))) +SVNLOG:=svninfo.log +# This one can be overriden on command line for debugging purposes +GETREVEXE:=./getrev$(EXEEXT) + +[rules] +.NOTPARALLEL: +ifneq ($(DATA2INC),) +fpcmake.inc: fpcmake.ini + $(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini +endif + + +ifdef inUnix +EnableRevIncRule=1 +endif +ifdef inCygWin +EnableRevIncRule=1 +endif + +ifneq (,$(SVN)) +# revision.inc rule +revision.inc : $(REVINC_FILES) + -$(SVN) info $(REVINC_FILES) > $(SVNLOG) + $(MAKE) getrev$(EXEEXT) + $(GETREVEXE) $(SVNLOG) + -$(DEL) getrev$(EXEEXT) +endif + +.PHONY : revision + +# Use -B option to force +# regeneration of revision.inc +revision : + $(MAKE) -B revision.inc + + +fpcmwr$(PPUEXT): fpcmake.inc + +fpcmmain$(PPUEXT): $(REVINC) + +fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc $(REVINC) + +fpcmake$(EXEEXT): fpcmwr$(PPUEXT) fpcmmain$(PPUEXT) + +# Cygwin doesn't like c:/path/ +ifndef inCygWin +$(BS_UNITDIR): + $(MKDIRTREE) $(BS_UNITDIR) +bootstrap: $(BS_UNITDIR) fpcmake.inc + $(FPCFPMAKE) fpcmake.pp $(FPMAKE_SKIP_CONFIG) -Fu$(UNITDIR_FPMAKE_RTL) -FU$(BS_UNITDIR) $(OPT) +endif diff --git a/utils/fpcmkcfg/Makefile b/utils/fpcmkcfg/Makefile index b9558e9c98..f1c273a372 100644 --- a/utils/fpcmkcfg/Makefile +++ b/utils/fpcmkcfg/Makefile @@ -319,228 +319,17 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpcmkcfg +override PACKAGE_NAME=fpcmkcfg +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fpcmkcfg -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fpcmkcfg +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1170,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base fcl-process +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1178,7 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1187,7 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1196,7 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1205,7 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1214,7 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1223,7 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1232,7 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1241,7 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1250,7 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1259,7 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1268,7 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1277,7 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1286,7 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1295,7 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1304,7 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1313,7 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1322,7 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1331,7 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1340,7 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1349,7 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1358,7 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1367,7 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1376,7 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1385,7 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1394,7 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1403,7 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1412,7 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1421,7 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1430,7 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1439,7 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1448,7 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1457,7 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1466,7 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1475,7 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1484,7 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1493,7 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1502,7 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1511,7 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1520,7 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1529,7 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1538,7 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1547,7 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1556,7 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1565,7 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1574,7 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1583,7 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1592,7 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1601,7 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1610,7 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1619,7 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1628,7 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1637,7 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1646,7 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1655,7 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1664,7 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1673,7 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1682,7 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1691,7 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1700,7 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1709,7 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -1718,7 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1727,7 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1736,7 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1745,7 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -1754,7 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1763,7 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -1772,7 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1781,7 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -1790,7 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -1799,7 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -1808,7 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -1817,7 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -1826,7 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2056,44 +1772,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2248,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2412,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2596,59 +2267,72 @@ 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 -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: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc fppkg.inc default.inc -ifneq ($(DATA2INC),) -fpccfg.inc: fpc.cft - $(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig -fpcfg.inc : fpinc.cfg - $(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg -fpini.inc : fpinc.ini - $(DATA2INC) -b -s fpinc.ini fpini.inc fpini -fppkg.inc : fppkg.cfg - $(DATA2INC) -b -s fppkg.cfg fppkg.inc fppkg -default.inc : default.cft - $(DATA2INC) -b -s default.cft default.inc fppkg_default +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpcmkcfg/Makefile.fpc b/utils/fpcmkcfg/Makefile.fpc index f211736be9..f093c80878 100644 --- a/utils/fpcmkcfg/Makefile.fpc +++ b/utils/fpcmkcfg/Makefile.fpc @@ -1,51 +1,93 @@ # -# Makefile.fpc for fpcmkcfg +# Makefile.fpc for running fpmake # -[target] -programs=fpcmkcfg -rst=fpcmkcfg +[package] +name=fpcmkcfg +version=2.7.1 + +[require] +packages=rtl fpmkunit [install] fpcpackage=y -[require] -tools=data2inc -packages=fcl-base fcl-process -tools=data2inc - [default] fpcdir=../.. -[shared] -build=n +[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] -# -# PPU Tools -# - -# not parallel because systems using an external linker will get conflicts -# due to overwriting each other's link.res file +# 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: -fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc fppkg.inc default.inc - -ifneq ($(DATA2INC),) -fpccfg.inc: fpc.cft - $(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig - -fpcfg.inc : fpinc.cfg - $(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg - -fpini.inc : fpinc.ini - $(DATA2INC) -b -s fpinc.ini fpini.inc fpini - -fppkg.inc : fppkg.cfg - $(DATA2INC) -b -s fppkg.cfg fppkg.inc fppkg - -default.inc : default.cft - $(DATA2INC) -b -s default.cft default.inc fppkg_default - +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpcmkcfg/Makefile.fpc.fpcmake b/utils/fpcmkcfg/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..f211736be9 --- /dev/null +++ b/utils/fpcmkcfg/Makefile.fpc.fpcmake @@ -0,0 +1,51 @@ +# +# Makefile.fpc for fpcmkcfg +# + +[target] +programs=fpcmkcfg +rst=fpcmkcfg + +[install] +fpcpackage=y + +[require] +tools=data2inc +packages=fcl-base fcl-process +tools=data2inc + +[default] +fpcdir=../.. + +[shared] +build=n + +[rules] +# +# PPU Tools +# + +# not parallel because systems using an external linker will get conflicts +# due to overwriting each other's link.res file +.NOTPARALLEL: + +fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc fppkg.inc default.inc + +ifneq ($(DATA2INC),) +fpccfg.inc: fpc.cft + $(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig + +fpcfg.inc : fpinc.cfg + $(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg + +fpini.inc : fpinc.ini + $(DATA2INC) -b -s fpinc.ini fpini.inc fpini + +fppkg.inc : fppkg.cfg + $(DATA2INC) -b -s fppkg.cfg fppkg.inc fppkg + +default.inc : default.cft + $(DATA2INC) -b -s default.cft default.inc fppkg_default + +endif + diff --git a/utils/fpcres/Makefile b/utils/fpcres/Makefile index 1b16c7a997..a2c330777b 100644 --- a/utils/fpcres/Makefile +++ b/utils/fpcres/Makefile @@ -319,444 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fpcres fpcjres -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser +override PACKAGE_NAME=fpcres +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1387,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl rtl fcl-res paszlib +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1395,7 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1404,7 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1413,7 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1422,7 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1431,7 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1440,7 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1449,7 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1458,7 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1467,7 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1476,7 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1485,7 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1494,7 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1503,7 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1512,7 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1521,7 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1530,7 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1539,7 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1548,7 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1557,7 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1566,7 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1575,7 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1584,7 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1593,7 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1602,7 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1611,7 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1620,7 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1629,7 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1638,7 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1647,7 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1656,7 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1665,7 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1674,7 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1683,7 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1692,7 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1701,7 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1710,7 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1719,7 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1728,7 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1737,7 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1746,7 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1755,7 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1764,7 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1773,7 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1782,7 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1791,7 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1800,7 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1809,7 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1818,7 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1827,7 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1836,7 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1845,7 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1854,7 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1863,7 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1872,7 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1881,7 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1890,7 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1899,7 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1908,7 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1917,7 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1926,7 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -1935,7 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1944,7 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1953,7 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1962,7 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -1971,7 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1980,7 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -1989,7 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1998,7 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2007,7 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2016,7 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2025,7 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2034,7 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2043,7 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2273,44 +1772,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-RES -PACKAGEDIR_FCL-RES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-RES),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-RES)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-RES) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-RES)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-RES= -UNITDIR_FCL-RES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-RES),) -UNITDIR_FCL-RES:=$(firstword $(UNITDIR_FCL-RES)) -else -UNITDIR_FCL-RES= -endif -endif -ifdef UNITDIR_FCL-RES -override COMPILER_UNITDIR+=$(UNITDIR_FCL-RES) -endif -ifdef UNITDIR_FPMAKE_FCL-RES -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-RES) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2465,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2629,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2813,30 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpcres$(EXEEXT): target.pas msghandler.pas closablefilestream.pas paramparser.pas sourcehandler.pas fpcres.pas -fpcjres$(EXEEXT): msghandler.pas closablefilestream.pas paramparser.pas sourcehandler.pas fpcjres.pas jarsourcehandler.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpcres/Makefile.fpc b/utils/fpcres/Makefile.fpc index 3b185b5888..40f97a3974 100644 --- a/utils/fpcres/Makefile.fpc +++ b/utils/fpcres/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for fpcres +# Makefile.fpc for running fpmake # -[target] -programs=fpcres fpcjres - -[clean] -units=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser +[package] +name=fpcres +version=2.7.1 [require] -packages=rtl fcl-res paszlib +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,7 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -fpcres$(EXEEXT): target.pas msghandler.pas closablefilestream.pas paramparser.pas sourcehandler.pas fpcres.pas -fpcjres$(EXEEXT): msghandler.pas closablefilestream.pas paramparser.pas sourcehandler.pas fpcjres.pas jarsourcehandler.pas + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpcres/Makefile.fpc.fpcmake b/utils/fpcres/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..3b185b5888 --- /dev/null +++ b/utils/fpcres/Makefile.fpc.fpcmake @@ -0,0 +1,23 @@ +# +# Makefile.fpc for fpcres +# + +[target] +programs=fpcres fpcjres + +[clean] +units=closablefilestream msghandler paramparser sourcehandler target jarsourcehandler jarparamparser + +[require] +packages=rtl fcl-res paszlib + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +fpcres$(EXEEXT): target.pas msghandler.pas closablefilestream.pas paramparser.pas sourcehandler.pas fpcres.pas +fpcjres$(EXEEXT): msghandler.pas closablefilestream.pas paramparser.pas sourcehandler.pas fpcjres.pas jarsourcehandler.pas diff --git a/utils/fpcreslipo/Makefile b/utils/fpcreslipo/Makefile index a2fc48fc5f..72fbd861f0 100644 --- a/utils/fpcreslipo/Makefile +++ b/utils/fpcreslipo/Makefile @@ -319,444 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fpcreslipo -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=msghandler paramparser sourcehandler +override PACKAGE_NAME=fpcreslipo +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=msghandler paramparser sourcehandler -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=msghandler paramparser sourcehandler +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1387,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl rtl fcl-res +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1395,7 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1404,7 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1413,7 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1422,7 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1431,7 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1440,7 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1449,7 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1458,7 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1467,7 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1476,7 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1485,7 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1494,7 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1503,7 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1512,7 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1521,7 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1530,7 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1539,7 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1548,7 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1557,7 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1566,7 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1575,7 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1584,7 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1593,7 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1602,7 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1611,7 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1620,7 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1629,7 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1638,7 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1647,7 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1656,7 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1665,7 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1674,7 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1683,7 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1692,7 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1701,7 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1710,7 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1719,7 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1728,7 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1737,7 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1746,7 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1755,7 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1764,7 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1773,7 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1782,7 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1791,7 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1800,7 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1809,7 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1818,7 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1827,7 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1836,7 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1845,7 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1854,7 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1863,7 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1872,7 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1881,7 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1890,7 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1899,7 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1908,7 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1917,7 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1926,7 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -1935,7 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1944,7 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1953,7 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1962,7 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -1971,7 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1980,7 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -1989,7 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1998,7 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2007,7 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2016,7 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2025,7 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2034,7 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2043,7 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-RES=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2273,44 +1772,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-RES -PACKAGEDIR_FCL-RES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-RES),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-RES)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-RES) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-RES)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-RES= -UNITDIR_FCL-RES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-RES),) -UNITDIR_FCL-RES:=$(firstword $(UNITDIR_FCL-RES)) -else -UNITDIR_FCL-RES= -endif -endif -ifdef UNITDIR_FCL-RES -override COMPILER_UNITDIR+=$(UNITDIR_FCL-RES) -endif -ifdef UNITDIR_FPMAKE_FCL-RES -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-RES) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2465,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2629,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2813,29 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpcreslipo$(EXEEXT): msghandler.pp paramparser.pp sourcehandler.pp fpcreslipo.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpcreslipo/Makefile.fpc b/utils/fpcreslipo/Makefile.fpc index c603adca90..a4bcee824a 100644 --- a/utils/fpcreslipo/Makefile.fpc +++ b/utils/fpcreslipo/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for fpcreslipo +# Makefile.fpc for running fpmake # -[target] -programs=fpcreslipo - -[clean] -units=msghandler paramparser sourcehandler +[package] +name=fpcreslipo +version=2.7.1 [require] -packages=rtl fcl-res +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,6 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -fpcreslipo$(EXEEXT): msghandler.pp paramparser.pp sourcehandler.pp fpcreslipo.pp + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpcreslipo/Makefile.fpc.fpcmake b/utils/fpcreslipo/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..c603adca90 --- /dev/null +++ b/utils/fpcreslipo/Makefile.fpc.fpcmake @@ -0,0 +1,22 @@ +# +# Makefile.fpc for fpcreslipo +# + +[target] +programs=fpcreslipo + +[clean] +units=msghandler paramparser sourcehandler + +[require] +packages=rtl fcl-res + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +fpcreslipo$(EXEEXT): msghandler.pp paramparser.pp sourcehandler.pp fpcreslipo.pp diff --git a/utils/fpdoc/Makefile b/utils/fpdoc/Makefile index 38ccebfb12..7e7ed78a01 100644 --- a/utils/fpdoc/Makefile +++ b/utils/fpdoc/Makefile @@ -321,883 +321,15 @@ endif endif override PACKAGE_NAME=fpdoc override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1827,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-passrc chm +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1835,10 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1847,10 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1859,10 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1871,10 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1883,10 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1895,10 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1907,10 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1919,10 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1931,10 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1943,10 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1955,10 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1967,10 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1979,10 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1991,11 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -2004,10 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -2016,10 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -2028,10 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -2040,10 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2052,10 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2064,10 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -2076,10 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -2088,11 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -2101,10 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -2113,10 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2125,10 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2137,10 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2149,10 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -2161,10 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2173,10 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2185,10 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2197,10 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2209,10 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2221,10 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -2233,10 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2245,10 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2257,11 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -2270,10 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2282,10 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2294,10 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -2306,10 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2318,10 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2330,10 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2342,10 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2354,10 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2366,10 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2378,10 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2390,10 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2402,10 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2414,10 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2426,11 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2439,10 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2451,10 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2463,10 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2475,10 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2487,11 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2500,10 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2512,10 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2524,10 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2536,10 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2548,10 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -2560,10 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2572,10 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2584,11 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2597,10 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2609,10 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2621,10 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2633,10 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2645,10 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2657,10 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2669,10 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2681,10 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2693,10 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2705,10 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_CHM=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2938,196 +1772,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-PASSRC -PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-PASSRC),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX)),) -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) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-PASSRC= -UNITDIR_FCL-PASSRC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-PASSRC),) -UNITDIR_FCL-PASSRC:=$(firstword $(UNITDIR_FCL-PASSRC)) -else -UNITDIR_FCL-PASSRC= -endif -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_CHM -PACKAGEDIR_CHM:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /chm/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_CHM),) -ifneq ($(wildcard $(PACKAGEDIR_CHM)/units/$(TARGETSUFFIX)),) -UNITDIR_CHM=$(PACKAGEDIR_CHM)/units/$(TARGETSUFFIX) -else -UNITDIR_CHM=$(PACKAGEDIR_CHM) -endif -ifneq ($(wildcard $(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_CHM)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_CHM) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_CHM)/$(FPCMADE) -endif -else -PACKAGEDIR_CHM= -UNITDIR_CHM:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /chm/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_CHM),) -UNITDIR_CHM:=$(firstword $(UNITDIR_CHM)) -else -UNITDIR_CHM= -endif -endif -ifdef UNITDIR_CHM -override COMPILER_UNITDIR+=$(UNITDIR_CHM) -endif -ifdef UNITDIR_FPMAKE_CHM -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CHM) -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 @@ -3282,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -3716,39 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall -zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall -zipdistinstall: fpc_zipdistinstall -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\ - dw_latex.pp dwlinear.pp dw_txt.pp dw_linrtf.pp css.inc plusimage.inc minusimage.inc -makeskel$(EXEEXT): makeskel.pp dglobals.pp -css.inc: fpdoc.css ../bin2obj$(EXEEXT) - ../bin2obj$(EXEEXT) -o css.inc -c DefaultCSS fpdoc.css -plusimage.inc: images/plus.png ../bin2obj$(EXEEXT) - ../bin2obj$(EXEEXT) -o plusimage.inc -c PlusImageData images/plus.png -minusimage.inc: images/minus.png ../bin2obj$(EXEEXT) - ../bin2obj$(EXEEXT) -o minusimage.inc -c MinusImageData images/minus.png -../bin2obj$(EXEEXT): - $(MAKE) -C .. bin2obj$(EXEEXT) +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpdoc/Makefile.fpc b/utils/fpdoc/Makefile.fpc index 5209b8c1e1..a9a5e78399 100644 --- a/utils/fpdoc/Makefile.fpc +++ b/utils/fpdoc/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for FPDoc +# Makefile.fpc for running fpmake # [package] @@ -7,19 +7,7 @@ name=fpdoc version=2.7.1 [require] -packages=fcl-base fcl-xml fcl-passrc chm -packages_darwin=univint -packages_iphonesim=univint - -[target] -programs=fpdoc makeskel unitdiff fpclasschart -rst=dwriter fpdoc dglobals makeskel dwlinear -# removed to reduce dependencies of rpm. -#dirs_linux_i386=fpde -#dirs_win32=fpde - -[compiler] -options=-S2h +packages=rtl fpmkunit [install] fpcpackage=y @@ -27,25 +15,79 @@ fpcpackage=y [default] fpcdir=../.. -[clean] -units=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc -files=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst +[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] +# 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: -fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\ - dw_latex.pp dwlinear.pp dw_txt.pp dw_linrtf.pp css.inc plusimage.inc minusimage.inc - -makeskel$(EXEEXT): makeskel.pp dglobals.pp - -css.inc: fpdoc.css ../bin2obj$(EXEEXT) - ../bin2obj$(EXEEXT) -o css.inc -c DefaultCSS fpdoc.css - -plusimage.inc: images/plus.png ../bin2obj$(EXEEXT) - ../bin2obj$(EXEEXT) -o plusimage.inc -c PlusImageData images/plus.png - -minusimage.inc: images/minus.png ../bin2obj$(EXEEXT) - ../bin2obj$(EXEEXT) -o minusimage.inc -c MinusImageData images/minus.png -../bin2obj$(EXEEXT): - $(MAKE) -C .. bin2obj$(EXEEXT) +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpdoc/Makefile.fpc.fpcmake b/utils/fpdoc/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..5209b8c1e1 --- /dev/null +++ b/utils/fpdoc/Makefile.fpc.fpcmake @@ -0,0 +1,51 @@ +# +# Makefile.fpc for FPDoc +# + +[package] +name=fpdoc +version=2.7.1 + +[require] +packages=fcl-base fcl-xml fcl-passrc chm +packages_darwin=univint +packages_iphonesim=univint + +[target] +programs=fpdoc makeskel unitdiff fpclasschart +rst=dwriter fpdoc dglobals makeskel dwlinear +# removed to reduce dependencies of rpm. +#dirs_linux_i386=fpde +#dirs_win32=fpde + +[compiler] +options=-S2h + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[clean] +units=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc +files=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst + +[rules] +.NOTPARALLEL: +fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\ + dw_latex.pp dwlinear.pp dw_txt.pp dw_linrtf.pp css.inc plusimage.inc minusimage.inc + +makeskel$(EXEEXT): makeskel.pp dglobals.pp + +css.inc: fpdoc.css ../bin2obj$(EXEEXT) + ../bin2obj$(EXEEXT) -o css.inc -c DefaultCSS fpdoc.css + +plusimage.inc: images/plus.png ../bin2obj$(EXEEXT) + ../bin2obj$(EXEEXT) -o plusimage.inc -c PlusImageData images/plus.png + +minusimage.inc: images/minus.png ../bin2obj$(EXEEXT) + ../bin2obj$(EXEEXT) -o minusimage.inc -c MinusImageData images/minus.png + +../bin2obj$(EXEEXT): + $(MAKE) -C .. bin2obj$(EXEEXT) diff --git a/utils/fpmc/Makefile b/utils/fpmc/Makefile index 8a2b737c99..2a2c4c8c62 100644 --- a/utils/fpmc/Makefile +++ b/utils/fpmc/Makefile @@ -319,671 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(OS_TARGET),win32) -GTKDLL:=$(strip $(wildcard $(addsuffix /libgtk-0.dll,$(SEARCHPATH)))) -ifneq ($(GTKDLL),) -FPMCGTK=fpmcgtk -else -$(warning GTK DLLs not found, skipping build of fpmcgtk) -endif -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpmc $(FPMCGTK) -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpmc +override PACKAGE_NAME=fpmc +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpmc fpmcgtk -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fpmc -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1614,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base fpgtk +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1622,8 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1632,8 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1642,8 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1652,8 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1662,8 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1672,8 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1682,8 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1692,8 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1702,8 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1712,8 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1722,8 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1732,8 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1742,8 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1752,8 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1762,8 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1772,8 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1782,8 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1792,8 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1802,8 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1812,8 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1822,8 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1832,8 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1842,8 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1852,8 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1862,8 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1872,8 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1882,8 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1892,8 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1902,8 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1912,8 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1922,8 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1932,8 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1942,8 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1952,8 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1962,8 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1972,8 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1982,8 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1992,8 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2002,8 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -2012,8 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2022,8 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2032,8 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2042,8 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2052,8 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2062,8 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2072,8 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2082,8 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2092,8 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2102,8 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2112,8 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2122,8 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2132,8 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2142,8 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2152,8 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2162,8 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2172,8 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2182,8 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2192,8 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2202,8 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2212,8 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -2222,8 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2232,8 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2242,8 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2252,8 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2262,8 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2272,8 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2282,8 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2292,8 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2302,8 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2312,8 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2322,8 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2332,8 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2342,8 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FPGTK=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2573,82 +1772,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_FPGTK -PACKAGEDIR_FPGTK:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpgtk/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FPGTK),) -ifneq ($(wildcard $(PACKAGEDIR_FPGTK)/units/$(TARGETSUFFIX)),) -UNITDIR_FPGTK=$(PACKAGEDIR_FPGTK)/units/$(TARGETSUFFIX) -else -UNITDIR_FPGTK=$(PACKAGEDIR_FPGTK) -endif -ifneq ($(wildcard $(PACKAGEDIR_FPGTK)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FPGTK=$(PACKAGEDIR_FPGTK)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FPGTK)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FPGTK=$(PACKAGEDIR_FPGTK)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FPGTK=$(PACKAGEDIR_FPGTK) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FPGTK)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FPGTK) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FPGTK)/$(FPCMADE) -endif -else -PACKAGEDIR_FPGTK= -UNITDIR_FPGTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpgtk/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FPGTK),) -UNITDIR_FPGTK:=$(firstword $(UNITDIR_FPGTK)) -else -UNITDIR_FPGTK= -endif -endif -ifdef UNITDIR_FPGTK -override COMPILER_UNITDIR+=$(UNITDIR_FPGTK) -endif -ifdef UNITDIR_FPMAKE_FPGTK -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPGTK) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2803,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2967,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -3151,30 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpmc$(EXEEXT): msgcomp.pp fpmc.pp -fpmcgtk$(EXEEXT): msgcomp.pp fpmcgtk.pp $(wildcard frm*.pp) +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpmc/Makefile.fpc b/utils/fpmc/Makefile.fpc index 05a4177522..abe6efd217 100644 --- a/utils/fpmc/Makefile.fpc +++ b/utils/fpmc/Makefile.fpc @@ -1,20 +1,13 @@ # -# Makefile.fpc for Free Pascal Message Compiler +# Makefile.fpc for running fpmake # -[target] -programs=fpmc -programs_linux=fpmcgtk -programs_win32=$(FPMCGTK) -rsts=frmabout frmmain frmoptions msgcomp - -[clean] -units=frmmain msgcomp frmabout frmoptions +[package] +name=fpmc +version=2.7.1 [require] -packages=fcl-base fpgtk - -[compiler] +packages=rtl fpmkunit [install] fpcpackage=y @@ -23,17 +16,78 @@ fpcpackage=y fpcdir=../.. [prerules] -ifeq ($(OS_TARGET),win32) -GTKDLL:=$(strip $(wildcard $(addsuffix /libgtk-0.dll,$(SEARCHPATH)))) -ifneq ($(GTKDLL),) -FPMCGTK=fpmcgtk -else -$(warning GTK DLLs not found, skipping build of fpmcgtk) +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] +# 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: -fpmc$(EXEEXT): msgcomp.pp fpmc.pp -fpmcgtk$(EXEEXT): msgcomp.pp fpmcgtk.pp $(wildcard frm*.pp) +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fpmc/Makefile.fpc.fpcmake b/utils/fpmc/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..05a4177522 --- /dev/null +++ b/utils/fpmc/Makefile.fpc.fpcmake @@ -0,0 +1,39 @@ +# +# Makefile.fpc for Free Pascal Message Compiler +# + +[target] +programs=fpmc +programs_linux=fpmcgtk +programs_win32=$(FPMCGTK) +rsts=frmabout frmmain frmoptions msgcomp + +[clean] +units=frmmain msgcomp frmabout frmoptions + +[require] +packages=fcl-base fpgtk + +[compiler] + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[prerules] +ifeq ($(OS_TARGET),win32) +GTKDLL:=$(strip $(wildcard $(addsuffix /libgtk-0.dll,$(SEARCHPATH)))) +ifneq ($(GTKDLL),) +FPMCGTK=fpmcgtk +else +$(warning GTK DLLs not found, skipping build of fpmcgtk) +endif +endif + +[rules] +.NOTPARALLEL: +fpmc$(EXEEXT): msgcomp.pp fpmc.pp + +fpmcgtk$(EXEEXT): msgcomp.pp fpmcgtk.pp $(wildcard frm*.pp) diff --git a/utils/fppkg/Makefile b/utils/fppkg/Makefile index 4f9860f914..52bc713e0a 100644 --- a/utils/fppkg/Makefile +++ b/utils/fppkg/Makefile @@ -2272,13 +2272,11 @@ examples: shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall -zipdistinstall: fpc_zipdistinstall info: fpc_info makefiles: fpc_makefiles -.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif @@ -2334,3 +2332,7 @@ ifdef UNIXHier else $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie endif +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fppkg/Makefile.fpc b/utils/fppkg/Makefile.fpc index 4b0ce977d1..8c75da8d10 100644 --- a/utils/fppkg/Makefile.fpc +++ b/utils/fppkg/Makefile.fpc @@ -87,3 +87,7 @@ ifdef UNIXHier else $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie endif +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index 11e292a658..20136f4677 100644 --- a/utils/fprcp/Makefile +++ b/utils/fprcp/Makefile @@ -319,444 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=fprcp -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=comments expr pasprep -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=comments expr pasprep +override PACKAGE_NAME=fprcp +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=comments expr pasprep +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1387,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1645,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1799,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -1963,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2147,29 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpcrp$(EXEEXT): fpcrp.pp comments.pp pexpr.pp pasprep.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fprcp/Makefile.fpc b/utils/fprcp/Makefile.fpc index 4891f57a38..f72979f3b6 100644 --- a/utils/fprcp/Makefile.fpc +++ b/utils/fprcp/Makefile.fpc @@ -1,12 +1,13 @@ # -# Makefile.fpc for fprcp +# Makefile.fpc for running fpmake # -[target] -programs=fprcp +[package] +name=fprcp +version=2.7.1 -[clean] -units=comments expr pasprep +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -14,7 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] +# 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: -fpcrp$(EXEEXT): fpcrp.pp comments.pp pexpr.pp pasprep.pp + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/fprcp/Makefile.fpc.fpcmake b/utils/fprcp/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..4891f57a38 --- /dev/null +++ b/utils/fprcp/Makefile.fpc.fpcmake @@ -0,0 +1,20 @@ +# +# Makefile.fpc for fprcp +# + +[target] +programs=fprcp + +[clean] +units=comments expr pasprep + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + + +[rules] +.NOTPARALLEL: +fpcrp$(EXEEXT): fpcrp.pp comments.pp pexpr.pp pasprep.pp diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index a619fff883..c1417efe4e 100644 --- a/utils/h2pas/Makefile +++ b/utils/h2pas/Makefile @@ -319,664 +319,17 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=h2pas h2paspp +override PACKAGE_NAME=h2pas +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=h2pas h2paspp -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-Sg -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1606,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1864,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2018,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2182,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2366,56 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -ifndef PYACC -PYACC=$(strip $(wildcard $(addsuffix /pyacc$(EXEEXT),$(SEARCHPATH)))) -ifeq ($(PYACC),) -PYACC= +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 -export PYACC:=$(firstword $(PYACC)) + $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT) endif + -$(DEL) $(LOCALFPMAKE) endif -ifndef PLEX -PLEX=$(strip $(wildcard $(addsuffix /plex$(EXEEXT),$(SEARCHPATH)))) -ifeq ($(PLEX),) -PLEX= +cleanall: distclean +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) else -export PLEX:=$(firstword $(PLEX)) -endif + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) endif -h2pas$(EXEEXT): h2pas.pas scan.pas h2poptions.pas -ifdef PYACC -h2pas.pas: h2pas.y - $(PYACC) h2pas.y -yacclex: yacc lex -scan.pas: scan.l - $(PLEX) scan.l -yacc: - $(PYACC) h2pas.y -lex : - $(PLEX) scan.l +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/h2pas/Makefile.fpc b/utils/h2pas/Makefile.fpc index d4a8506491..edfd2fb6e4 100644 --- a/utils/h2pas/Makefile.fpc +++ b/utils/h2pas/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for h2pas +# Makefile.fpc for running fpmake # -[target] -programs=h2pas h2paspp +[package] +name=h2pas +version=2.7.1 -[clean] -units=h2poptions h2plexlib scan h2pyacclib converu - -[compiler] -options=-Sg +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,45 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -# do we have pyacc? -ifndef PYACC -PYACC=$(strip $(wildcard $(addsuffix /pyacc$(EXEEXT),$(SEARCHPATH)))) -ifeq ($(PYACC),) -PYACC= + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 -export PYACC:=$(firstword $(PYACC)) -endif +clean: + $(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT) endif - -# do we have plex? -ifndef PLEX -PLEX=$(strip $(wildcard $(addsuffix /plex$(EXEEXT),$(SEARCHPATH)))) -ifeq ($(PLEX),) -PLEX= +# 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 -export PLEX:=$(firstword $(PLEX)) +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 - -h2pas$(EXEEXT): h2pas.pas scan.pas h2poptions.pas - -# -# Lex and Yacc (only if pyacc is found) -# -ifdef PYACC -h2pas.pas: h2pas.y - $(PYACC) h2pas.y - -yacclex: yacc lex - -scan.pas: scan.l - $(PLEX) scan.l - -yacc: - $(PYACC) h2pas.y - -lex : - $(PLEX) scan.l +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/h2pas/Makefile.fpc.fpcmake b/utils/h2pas/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..d4a8506491 --- /dev/null +++ b/utils/h2pas/Makefile.fpc.fpcmake @@ -0,0 +1,61 @@ +# +# Makefile.fpc for h2pas +# + +[target] +programs=h2pas h2paspp + +[clean] +units=h2poptions h2plexlib scan h2pyacclib converu + +[compiler] +options=-Sg + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +# do we have pyacc? +ifndef PYACC +PYACC=$(strip $(wildcard $(addsuffix /pyacc$(EXEEXT),$(SEARCHPATH)))) +ifeq ($(PYACC),) +PYACC= +else +export PYACC:=$(firstword $(PYACC)) +endif +endif + +# do we have plex? +ifndef PLEX +PLEX=$(strip $(wildcard $(addsuffix /plex$(EXEEXT),$(SEARCHPATH)))) +ifeq ($(PLEX),) +PLEX= +else +export PLEX:=$(firstword $(PLEX)) +endif +endif + +h2pas$(EXEEXT): h2pas.pas scan.pas h2poptions.pas + +# +# Lex and Yacc (only if pyacc is found) +# +ifdef PYACC +h2pas.pas: h2pas.y + $(PYACC) h2pas.y + +yacclex: yacc lex + +scan.pas: scan.l + $(PLEX) scan.l + +yacc: + $(PYACC) h2pas.y + +lex : + $(PLEX) scan.l +endif diff --git a/utils/importtl/Makefile b/utils/importtl/Makefile index b1373c27fb..573a21bce4 100644 --- a/utils/importtl/Makefile +++ b/utils/importtl/Makefile @@ -319,225 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=importtl +override PACKAGE_NAME=importtl +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=importtl -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=importtl +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1168,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl winunits-base fcl-base fcl-registry +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1176,9 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1187,9 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1198,9 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1209,9 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1220,9 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1231,9 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1242,9 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1253,9 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1264,9 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1275,9 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1286,9 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1297,9 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1308,9 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1319,9 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1330,9 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1341,9 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1352,9 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1363,9 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1374,9 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1385,9 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1396,9 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1407,9 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1418,9 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1429,9 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1440,9 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1451,9 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1462,9 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1473,9 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1484,9 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1495,9 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1506,9 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1517,9 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1528,9 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1539,9 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1550,9 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1561,9 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1572,9 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1583,9 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1594,9 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1605,9 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1616,9 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1627,9 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1638,9 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1649,9 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1660,9 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1671,9 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1682,9 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1693,9 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1704,9 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1715,9 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1726,9 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1737,9 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1748,9 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1759,9 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1770,9 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1781,9 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1792,9 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1803,9 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1814,9 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1825,9 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -1836,9 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1847,9 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1858,9 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1869,9 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -1880,9 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1891,9 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -1902,9 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1913,9 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -1924,9 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -1935,9 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -1946,9 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -1957,9 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -1968,9 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_WINUNITS-BASE=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-REGISTRY=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2200,120 +1772,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_WINUNITS-BASE -PACKAGEDIR_WINUNITS-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_WINUNITS-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_WINUNITS-BASE= -UNITDIR_WINUNITS-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_WINUNITS-BASE),) -UNITDIR_WINUNITS-BASE:=$(firstword $(UNITDIR_WINUNITS-BASE)) -else -UNITDIR_WINUNITS-BASE= -endif -endif -ifdef UNITDIR_WINUNITS-BASE -override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE) -endif -ifdef UNITDIR_FPMAKE_WINUNITS-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_WINUNITS-BASE) -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-REGISTRY -PACKAGEDIR_FCL-REGISTRY:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-registry/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-REGISTRY),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-REGISTRY)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-REGISTRY) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-REGISTRY)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-REGISTRY= -UNITDIR_FCL-REGISTRY:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-registry/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-REGISTRY),) -UNITDIR_FCL-REGISTRY:=$(firstword $(UNITDIR_FCL-REGISTRY)) -else -UNITDIR_FCL-REGISTRY= -endif -endif -ifdef UNITDIR_FCL-REGISTRY -override COMPILER_UNITDIR+=$(UNITDIR_FCL-REGISTRY) -endif -ifdef UNITDIR_FPMAKE_FCL-REGISTRY -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-REGISTRY) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2468,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2632,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2816,27 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/importtl/Makefile.fpc b/utils/importtl/Makefile.fpc index 1bc1773759..7a8f2cb34b 100644 --- a/utils/importtl/Makefile.fpc +++ b/utils/importtl/Makefile.fpc @@ -1,15 +1,93 @@ # -# Makefile.fpc for h2pas +# Makefile.fpc for running fpmake # -[install] -fpcpackage=y +[package] +name=importtl +version=2.7.1 -[target] -programs=importtl +[require] +packages=rtl fpmkunit + +[install] +fpcpackage=y [default] fpcdir=../.. -[require] -packages=winunits-base fcl-base fcl-registry +[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] +# 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: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/importtl/Makefile.fpc.fpcmake b/utils/importtl/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..1bc1773759 --- /dev/null +++ b/utils/importtl/Makefile.fpc.fpcmake @@ -0,0 +1,15 @@ +# +# Makefile.fpc for h2pas +# +[install] +fpcpackage=y + + +[target] +programs=importtl + +[default] +fpcdir=../.. + +[require] +packages=winunits-base fcl-base fcl-registry diff --git a/utils/instantfpc/Makefile b/utils/instantfpc/Makefile index 917cbbe763..f4fd5c40d9 100644 --- a/utils/instantfpc/Makefile +++ b/utils/instantfpc/Makefile @@ -321,664 +321,15 @@ endif endif override PACKAGE_NAME=instantfpc override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=instantfpc +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=instantfpc -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=instantfptools -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=instantfptools +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1608,298 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-process +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_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1939,6 +1582,44 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif ifdef REQUIRE_PACKAGES_FCL-PROCESS PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FCL-PROCESS),) @@ -1977,6 +1658,120 @@ ifdef UNITDIR_FPMAKE_FCL-PROCESS override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2131,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2565,29 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall -zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall -zipdistinstall: fpc_zipdistinstall -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -fpdoc$(EXEEXT): instantfpc.pas instantfptools.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/instantfpc/Makefile.fpc b/utils/instantfpc/Makefile.fpc index 98694f10ed..ca751d44bb 100644 --- a/utils/instantfpc/Makefile.fpc +++ b/utils/instantfpc/Makefile.fpc @@ -1,30 +1,93 @@ # -# Makefile.fpc for FPDoc +# Makefile.fpc for running fpmake # [package] name=instantfpc version=2.7.1 -[install] -fpcpackage=y - [require] -packages=fcl-process +packages=rtl fpmkunit -[target] -programs=instantfpc - -[compiler] -options=-S2h +[install] +fpcpackage=y [default] fpcdir=../.. -[clean] -units=instantfptools +[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] +# 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: -fpdoc$(EXEEXT): instantfpc.pas instantfptools.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/instantfpc/Makefile.fpc.fpcmake b/utils/instantfpc/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..98694f10ed --- /dev/null +++ b/utils/instantfpc/Makefile.fpc.fpcmake @@ -0,0 +1,30 @@ +# +# Makefile.fpc for FPDoc +# + +[package] +name=instantfpc +version=2.7.1 + +[install] +fpcpackage=y + +[require] +packages=fcl-process + +[target] +programs=instantfpc + +[compiler] +options=-S2h + +[default] +fpcdir=../.. + +[clean] +units=instantfptools + +[rules] +.NOTPARALLEL: +fpdoc$(EXEEXT): instantfpc.pas instantfptools.pas + diff --git a/utils/mksymbian/Makefile b/utils/mksymbian/Makefile index 9d349a23f2..218907b379 100644 --- a/utils/mksymbian/Makefile +++ b/utils/mksymbian/Makefile @@ -319,444 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=mksymbian -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil +override PACKAGE_NAME=mksymbian +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=cfgfile cmdline compiler constants projectparser sdkutil +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1387,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1645,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1799,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -1963,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2147,29 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -mksymbian$(EXEEXT): mksymbian.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/mksymbian/Makefile.fpc b/utils/mksymbian/Makefile.fpc index 28f7d77d46..1ebf4eea82 100644 --- a/utils/mksymbian/Makefile.fpc +++ b/utils/mksymbian/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for Free Pascal Symbian Build Tool +# Makefile.fpc for running fpmake # -[target] -programs=mksymbian - -[clean] -units=cfgfile cmdline compiler constants projectparser sdkutil +[package] +name=mksymbian +version=2.7.1 [require] -packages= - -[compiler] +packages=rtl fpmkunit [install] fpcpackage=y @@ -19,6 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -mksymbian$(EXEEXT): mksymbian.pas + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/mksymbian/Makefile.fpc.fpcmake b/utils/mksymbian/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..28f7d77d46 --- /dev/null +++ b/utils/mksymbian/Makefile.fpc.fpcmake @@ -0,0 +1,24 @@ +# +# Makefile.fpc for Free Pascal Symbian Build Tool +# + +[target] +programs=mksymbian + +[clean] +units=cfgfile cmdline compiler constants projectparser sdkutil + +[require] +packages= + +[compiler] + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +mksymbian$(EXEEXT): mksymbian.pas diff --git a/utils/pas2fpm/Makefile b/utils/pas2fpm/Makefile index ca9621220c..d896b67b43 100644 --- a/utils/pas2fpm/Makefile +++ b/utils/pas2fpm/Makefile @@ -321,445 +321,15 @@ endif endif override PACKAGE_NAME=pas2fpm override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=pas2fpm +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=pas2fpm -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=pas2fpm +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1389,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-passrc fcl-base +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1397,8 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1407,8 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1417,8 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1427,8 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1437,8 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1447,8 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1457,8 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1467,8 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1477,8 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1487,8 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1497,8 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1507,8 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1517,8 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1527,9 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1538,8 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1548,8 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1558,8 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1568,8 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1578,8 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1588,8 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1598,8 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1608,9 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1619,8 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1629,8 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1639,8 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1649,8 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1659,8 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1669,8 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1679,8 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1689,8 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1699,8 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1709,8 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1719,8 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1729,8 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1739,8 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1749,9 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1760,8 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1770,8 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1780,8 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1790,8 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1800,8 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1810,8 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1820,8 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1830,8 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1840,8 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1850,8 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1860,8 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1870,8 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1880,8 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1890,9 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1901,8 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1911,8 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1921,8 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1931,8 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1941,9 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1952,8 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1962,8 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1972,8 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1982,8 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1992,8 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -2002,8 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2012,8 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2022,9 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2033,8 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2043,8 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2053,8 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2063,8 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2073,8 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2083,8 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2093,8 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2103,8 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2113,8 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2123,8 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2354,120 +1772,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-PASSRC -PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-PASSRC),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX)),) -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) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-PASSRC= -UNITDIR_FCL-PASSRC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-PASSRC),) -UNITDIR_FCL-PASSRC:=$(firstword $(UNITDIR_FCL-PASSRC)) -else -UNITDIR_FCL-PASSRC= -endif -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-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_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 @@ -2622,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -3056,29 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall -zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall -zipdistinstall: fpc_zipdistinstall -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -pas2fm$(EXEEXT): pas2fpm.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/pas2fpm/Makefile.fpc b/utils/pas2fpm/Makefile.fpc index fa0aeb39c2..a050bad3e0 100644 --- a/utils/pas2fpm/Makefile.fpc +++ b/utils/pas2fpm/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for pas2fpm +# Makefile.fpc for running fpmake # [package] @@ -7,16 +7,7 @@ name=pas2fpm version=2.7.1 [require] -packages=fcl-passrc fcl-base -packages_darwin=univint -packages_iphonesim=univint - -[target] -programs=pas2fpm -rst=pas2fpm - -[compiler] -options=-S2h +packages=rtl fpmkunit [install] fpcpackage=y @@ -24,7 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -pas2fm$(EXEEXT): pas2fpm.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/pas2fpm/Makefile.fpc.fpcmake b/utils/pas2fpm/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..fa0aeb39c2 --- /dev/null +++ b/utils/pas2fpm/Makefile.fpc.fpcmake @@ -0,0 +1,30 @@ +# +# Makefile.fpc for pas2fpm +# + +[package] +name=pas2fpm +version=2.7.1 + +[require] +packages=fcl-passrc fcl-base +packages_darwin=univint +packages_iphonesim=univint + +[target] +programs=pas2fpm +rst=pas2fpm + +[compiler] +options=-S2h + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +pas2fm$(EXEEXT): pas2fpm.pp + diff --git a/utils/pas2jni/Makefile b/utils/pas2jni/Makefile index 7fb2f6ebef..9a3907cfa0 100644 --- a/utils/pas2jni/Makefile +++ b/utils/pas2jni/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/05/15] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-04-26 rev 24324] # 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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos @@ -319,444 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=pas2jni +override PACKAGE_NAME=pas2jni +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=pas2jni -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=pas2jni def ppuparser writer -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=pas2jni def ppuparser writer +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1387,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl rtl fcl-base fcl-json +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1395,8 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1405,8 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1415,8 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1425,8 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1435,8 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1445,8 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1455,8 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1465,8 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1475,8 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1485,8 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1495,8 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1505,8 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1515,8 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1525,8 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1535,8 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1545,8 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1555,8 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1565,8 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1575,8 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1585,8 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1595,8 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1605,8 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1615,8 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1625,8 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1635,8 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1645,8 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1655,8 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1665,8 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1675,8 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1685,8 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1695,8 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1705,8 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1715,8 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1725,8 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1735,8 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1745,8 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1755,8 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1765,8 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1775,8 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1785,8 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1795,8 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1805,8 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1815,8 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1825,8 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1835,8 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1845,8 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1855,8 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1865,8 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1875,8 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1885,8 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1895,8 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1905,8 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1915,8 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1925,8 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1935,8 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1945,8 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1955,8 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1965,8 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1975,8 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1985,8 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -1995,8 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2005,8 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2015,8 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2025,8 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2035,8 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2045,8 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2055,8 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2065,8 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2075,8 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2085,8 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2095,8 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2105,8 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2115,8 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2346,82 +1772,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-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 -ifneq ($(wildcard $(PACKAGEDIR_FCL-JSON)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-JSON=$(PACKAGEDIR_FCL-JSON)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-JSON)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-JSON=$(PACKAGEDIR_FCL-JSON)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-JSON=$(PACKAGEDIR_FCL-JSON) -endif -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) -endif -ifdef UNITDIR_FPMAKE_FCL-JSON -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-JSON) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2576,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2740,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2924,28 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -pas2jni$(EXEEXT): pas2jni.pas +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) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/pas2jni/Makefile.fpc b/utils/pas2jni/Makefile.fpc index 3426f35bab..25840db47f 100644 --- a/utils/pas2jni/Makefile.fpc +++ b/utils/pas2jni/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for pas2jni +# Makefile.fpc for running fpmake # -[target] -programs=pas2jni - -[clean] -units=pas2jni def ppuparser writer +[package] +name=pas2jni +version=2.7.1 [require] -packages=rtl fcl-base fcl-json +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,5 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] -pas2jni$(EXEEXT): pas2jni.pas +# 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: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/pas2jni/Makefile.fpc.fpcmake b/utils/pas2jni/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..3426f35bab --- /dev/null +++ b/utils/pas2jni/Makefile.fpc.fpcmake @@ -0,0 +1,21 @@ +# +# Makefile.fpc for pas2jni +# + +[target] +programs=pas2jni + +[clean] +units=pas2jni def ppuparser writer + +[require] +packages=rtl fcl-base fcl-json + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +pas2jni$(EXEEXT): pas2jni.pas diff --git a/utils/pas2ut/Makefile b/utils/pas2ut/Makefile index 9c645fbc43..4e35bfbf96 100644 --- a/utils/pas2ut/Makefile +++ b/utils/pas2ut/Makefile @@ -321,445 +321,15 @@ endif endif override PACKAGE_NAME=pas2ut override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=pas2ut +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=pas2ut -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=pas2ut +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1389,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-passrc fcl-base +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1397,8 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1407,8 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1417,8 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1427,8 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1437,8 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1447,8 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1457,8 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1467,8 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1477,8 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1487,8 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1497,8 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1507,8 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1517,8 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1527,9 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1538,8 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1548,8 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1558,8 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1568,8 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1578,8 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1588,8 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1598,8 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1608,9 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1619,8 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1629,8 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1639,8 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1649,8 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1659,8 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1669,8 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1679,8 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1689,8 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1699,8 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1709,8 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1719,8 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1729,8 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1739,8 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1749,9 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1760,8 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1770,8 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1780,8 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1790,8 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1800,8 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1810,8 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1820,8 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1830,8 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1840,8 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1850,8 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1860,8 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1870,8 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1880,8 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1890,9 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1901,8 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1911,8 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1921,8 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1931,8 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1941,9 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1952,8 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1962,8 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1972,8 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1982,8 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1992,8 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -2002,8 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2012,8 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2022,9 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_UNIVINT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2033,8 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2043,8 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2053,8 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2063,8 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2073,8 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2083,8 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2093,8 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2103,8 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2113,8 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2123,8 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-PASSRC=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2354,120 +1772,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-PASSRC -PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-PASSRC),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX)),) -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) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-PASSRC= -UNITDIR_FCL-PASSRC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-PASSRC),) -UNITDIR_FCL-PASSRC:=$(firstword $(UNITDIR_FCL-PASSRC)) -else -UNITDIR_FCL-PASSRC= -endif -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-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_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 @@ -2622,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -3056,29 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall -zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall -zipdistinstall: fpc_zipdistinstall -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -pas2ut$(EXEEXT): pas2ut.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/pas2ut/Makefile.fpc b/utils/pas2ut/Makefile.fpc index 73df532693..97f5792542 100644 --- a/utils/pas2ut/Makefile.fpc +++ b/utils/pas2ut/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for pas2ut +# Makefile.fpc for running fpmake # [package] @@ -7,16 +7,7 @@ name=pas2ut version=2.7.1 [require] -packages=fcl-passrc fcl-base -packages_darwin=univint -packages_iphonesim=univint - -[target] -programs=pas2ut -rst=pas2ut - -[compiler] -options=-S2h +packages=rtl fpmkunit [install] fpcpackage=y @@ -24,7 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -pas2ut$(EXEEXT): pas2ut.pp +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/pas2ut/Makefile.fpc.fpcmake b/utils/pas2ut/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..73df532693 --- /dev/null +++ b/utils/pas2ut/Makefile.fpc.fpcmake @@ -0,0 +1,30 @@ +# +# Makefile.fpc for pas2ut +# + +[package] +name=pas2ut +version=2.7.1 + +[require] +packages=fcl-passrc fcl-base +packages_darwin=univint +packages_iphonesim=univint + +[target] +programs=pas2ut +rst=pas2ut + +[compiler] +options=-S2h + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +pas2ut$(EXEEXT): pas2ut.pp + diff --git a/utils/rmwait/Makefile b/utils/rmwait/Makefile index a43d2af05b..54853cfe95 100644 --- a/utils/rmwait/Makefile +++ b/utils/rmwait/Makefile @@ -319,225 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=rmwait +override PACKAGE_NAME=rmwait +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=rmwait -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=rmwait +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1168,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1426,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1580,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -1744,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -1928,28 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -rmwait$(EXEEXT): rmwait.pas +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) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/rmwait/Makefile.fpc b/utils/rmwait/Makefile.fpc index 2671cf9af5..6bd3de33c5 100644 --- a/utils/rmwait/Makefile.fpc +++ b/utils/rmwait/Makefile.fpc @@ -1,9 +1,13 @@ # -# Makefile.fpc for Free Pascal Utils +# Makefile.fpc for running fpmake # -[target] -programs=rmwait +[package] +name=rmwait +version=2.7.1 + +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -11,5 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] -rmwait$(EXEEXT): rmwait.pas +# 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: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/rmwait/Makefile.fpc.fpcmake b/utils/rmwait/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..2671cf9af5 --- /dev/null +++ b/utils/rmwait/Makefile.fpc.fpcmake @@ -0,0 +1,15 @@ +# +# Makefile.fpc for Free Pascal Utils +# + +[target] +programs=rmwait + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +rmwait$(EXEEXT): rmwait.pas diff --git a/utils/tply/Makefile b/utils/tply/Makefile index 62e1229203..c198355835 100644 --- a/utils/tply/Makefile +++ b/utils/tply/Makefile @@ -319,887 +319,17 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -override PACKAGE_NAME=lexyacc +override PACKAGE_NAME=tply override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=plex pyacc -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_UNITS+=lexlib yacclib -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-Sg -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-Sg -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1829,225 +959,590 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2087,6 +1582,196 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_LIBTAR +PACKAGEDIR_LIBTAR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libtar/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_LIBTAR),) +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX)),) +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(TARGETSUFFIX) +else +UNITDIR_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBTAR=$(PACKAGEDIR_LIBTAR) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_LIBTAR)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_LIBTAR) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBTAR)/$(FPCMADE) +endif +else +PACKAGEDIR_LIBTAR= +UNITDIR_LIBTAR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libtar/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_LIBTAR),) +UNITDIR_LIBTAR:=$(firstword $(UNITDIR_LIBTAR)) +else +UNITDIR_LIBTAR= +endif +endif +ifdef UNITDIR_LIBTAR +override COMPILER_UNITDIR+=$(UNITDIR_LIBTAR) +endif +ifdef UNITDIR_FPMAKE_LIBTAR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBTAR) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2241,112 +1926,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)) @@ -2684,43 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared +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 info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -pyacc$(EXEEXT): pyacc.pas $(wildcard yacc*.pas) - $(COMPILER) pyacc.pas -plex$(EXEEXT): plex.pas $(wildcard lex*.pas) - $(COMPILER) plex.pas -lexlib$(PPUEXT): lexlib.pas -yacclib$(PPUEXT): yacclib.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +install: fpmake ifdef UNIXHier -CODPATH=$(INSTALL_PREFIX)/lib/fpc/lexyacc + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) else -CODPATH=$(INSTALL_BINDIR) + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) endif -install: fpc_install -ifndef CROSSINSTALL - $(MKDIR) $(CODPATH) - $(COPY) yylex.cod yyparse.cod $(CODPATH) +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/tply/Makefile.fpc b/utils/tply/Makefile.fpc index b410c8864f..e8526ece05 100644 --- a/utils/tply/Makefile.fpc +++ b/utils/tply/Makefile.fpc @@ -1,21 +1,13 @@ # -# Makefile.fpc for Pascal lex/yacc +# Makefile.fpc for running fpmake # [package] -name=lexyacc +name=tply version=2.7.1 -[target] -programs=plex pyacc -units=lexlib yacclib - -[clean] -units=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable \ - yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl - -[compiler] -options=-Sg +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -23,29 +15,79 @@ fpcpackage=y [default] fpcdir=../.. -[shared] -build=n +[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] +# 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: -pyacc$(EXEEXT): pyacc.pas $(wildcard yacc*.pas) - $(COMPILER) pyacc.pas - -plex$(EXEEXT): plex.pas $(wildcard lex*.pas) - $(COMPILER) plex.pas - -lexlib$(PPUEXT): lexlib.pas - -yacclib$(PPUEXT): yacclib.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +install: fpmake ifdef UNIXHier -CODPATH=$(INSTALL_PREFIX)/lib/fpc/lexyacc + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) else -CODPATH=$(INSTALL_BINDIR) + $(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) endif - -install: fpc_install -ifndef CROSSINSTALL - $(MKDIR) $(CODPATH) - $(COPY) yylex.cod yyparse.cod $(CODPATH) +# 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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/tply/Makefile.fpc.fpcmake b/utils/tply/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..b410c8864f --- /dev/null +++ b/utils/tply/Makefile.fpc.fpcmake @@ -0,0 +1,51 @@ +# +# Makefile.fpc for Pascal lex/yacc +# + +[package] +name=lexyacc +version=2.7.1 + +[target] +programs=plex pyacc +units=lexlib yacclib + +[clean] +units=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable \ + yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl + +[compiler] +options=-Sg + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[shared] +build=n + +[rules] +.NOTPARALLEL: +pyacc$(EXEEXT): pyacc.pas $(wildcard yacc*.pas) + $(COMPILER) pyacc.pas + +plex$(EXEEXT): plex.pas $(wildcard lex*.pas) + $(COMPILER) plex.pas + +lexlib$(PPUEXT): lexlib.pas + +yacclib$(PPUEXT): yacclib.pas + +ifdef UNIXHier +CODPATH=$(INSTALL_PREFIX)/lib/fpc/lexyacc +else +CODPATH=$(INSTALL_BINDIR) +endif + +install: fpc_install +ifndef CROSSINSTALL + $(MKDIR) $(CODPATH) + $(COPY) yylex.cod yyparse.cod $(CODPATH) +endif diff --git a/utils/unicode/Makefile b/utils/unicode/Makefile index 844a71885e..028e4d35e1 100644 --- a/utils/unicode/Makefile +++ b/utils/unicode/Makefile @@ -319,444 +319,16 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=cldrparser unihelper +override PACKAGE_NAME=unicode +override PACKAGE_VERSION=2.7.1 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_PROGRAMS+=cldrparser unihelper -endif -ifeq ($(FULL_TARGET),i386-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-win32) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-os2) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-beos) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-haiku) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-solaris) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-netware) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-darwin) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-emx) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-watcom) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-wince) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-symbian) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-nativent) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i386-android) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-atari) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),sparc-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-netbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-openbsd) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-palmos) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-wince) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-gba) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-nds) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-symbian) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),arm-android) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),avr-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),armeb-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),mips-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),jvm-java) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),jvm-android) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override CLEAN_UNITS+=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1387,7 +959,7 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl rtl fcl-base fcl-xml +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1395,8 +967,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1405,8 +975,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1415,8 +983,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1425,8 +991,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1435,8 +999,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1445,8 +1007,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1455,8 +1015,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1465,8 +1023,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1475,8 +1031,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1485,8 +1039,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1495,8 +1047,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1505,8 +1055,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1515,8 +1063,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1525,8 +1071,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1535,8 +1079,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1545,8 +1087,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1555,8 +1095,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1565,8 +1103,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1575,8 +1111,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1585,8 +1119,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1595,8 +1127,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1605,8 +1135,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-android) REQUIRE_PACKAGES_RTL=1 @@ -1615,8 +1143,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1625,8 +1151,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1635,8 +1159,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1645,8 +1167,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1655,8 +1175,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1665,8 +1183,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1675,8 +1191,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1685,8 +1199,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1695,8 +1207,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1705,8 +1215,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1715,8 +1223,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1725,8 +1231,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1735,8 +1239,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1745,8 +1247,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1755,8 +1255,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1765,8 +1263,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1775,8 +1271,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-aix) REQUIRE_PACKAGES_RTL=1 @@ -1785,8 +1279,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1795,8 +1287,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1805,8 +1295,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1815,8 +1303,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1825,8 +1311,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1835,8 +1319,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1845,8 +1327,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1855,8 +1335,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1865,8 +1343,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1875,8 +1351,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1885,8 +1359,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1895,8 +1367,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1905,8 +1375,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1915,8 +1383,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1925,8 +1391,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1935,8 +1399,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1945,8 +1407,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1955,8 +1415,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1965,8 +1423,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1975,8 +1431,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1985,8 +1439,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 @@ -1995,8 +1447,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2005,8 +1455,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2015,8 +1463,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2025,8 +1471,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 @@ -2035,8 +1479,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2045,8 +1487,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2055,8 +1495,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2065,8 +1503,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 @@ -2075,8 +1511,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2085,8 +1519,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 @@ -2095,8 +1527,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 @@ -2105,8 +1535,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 @@ -2115,8 +1543,6 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2346,82 +1772,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 ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2576,103 +1926,10 @@ EXECPPAS:=@$(PPAS) endif endif endif -.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)) @@ -2740,6 +1997,92 @@ endif ifdef TARGET_EXAMPLEDIRS $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) $(ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -2924,30 +2267,72 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall 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 zipsourceinstall zipexampleinstall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif +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: -cldrparser$(EXEEXT): cldrparser.lpr cldrhelper.pas helper.pas cldrtest.pas cldrxml.pas unicodeset.pas -unihelper$(EXEEXT): unihelper.lpr helper.pas uca_test.pas +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/unicode/Makefile.fpc b/utils/unicode/Makefile.fpc index 4275a97f7a..317c56131e 100644 --- a/utils/unicode/Makefile.fpc +++ b/utils/unicode/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for Unicode Utils +# Makefile.fpc for running fpmake # -[target] -programs=cldrparser unihelper - -[clean] -units=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset +[package] +name=unicode +version=2.7.1 [require] -packages=rtl fcl-base fcl-xml +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,7 +15,79 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] +# 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: -cldrparser$(EXEEXT): cldrparser.lpr cldrhelper.pas helper.pas cldrtest.pas cldrxml.pas unicodeset.pas -unihelper$(EXEEXT): unihelper.lpr helper.pas uca_test.pas
\ No newline at end of file + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) +all: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) +smart: fpmake + $(LOCALFPMAKE) compile $(FPMAKE_OPT) -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 +cleanall: distclean +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 +zipinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) +zipdistinstall: fpmake + $(LOCALFPMAKE) zipinstall $(FPMAKE_OPT) --zipprefix=$(DIST_DESTDIR)/$(ZIPPREFIX) -ie diff --git a/utils/unicode/Makefile.fpc.fpcmake b/utils/unicode/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..4275a97f7a --- /dev/null +++ b/utils/unicode/Makefile.fpc.fpcmake @@ -0,0 +1,23 @@ +# +# Makefile.fpc for Unicode Utils +# + +[target] +programs=cldrparser unihelper + +[clean] +units=cldrhelper cldrtest cldrxml grbtree helper trie uca_test unicodeset + +[require] +packages=rtl fcl-base fcl-xml + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: +cldrparser$(EXEEXT): cldrparser.lpr cldrhelper.pas helper.pas cldrtest.pas cldrxml.pas unicodeset.pas +unihelper$(EXEEXT): unihelper.lpr helper.pas uca_test.pas
\ No newline at end of file |