diff options
author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-08-16 20:10:19 +0000 |
---|---|---|
committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-08-16 20:10:19 +0000 |
commit | c3d20ce12cd9cfbddb13a9a891f935446e346ff1 (patch) | |
tree | 6253780823962511659eb27bb697eb902fcc9bb5 /packages/librsvg | |
parent | 69036b2f89d05efdda4e66c30963cc76b4e53cc1 (diff) | |
download | fpc-c3d20ce12cd9cfbddb13a9a891f935446e346ff1.tar.gz |
+ Update all Makefile's modified by
change in utils/fpcm/fpcmake.ini in prevous commit.
Adapt also other files to that change:
* compiler/globals.pas: Replace $FPCTARGET by os_string if
tf_use_8_3 flag is set for target_info also.
* tests/Makefile.fpc: Modify TEST_TARGETSUFFIX in the same way
as TARGETSUFFIX was modified in previous commit.
* tests/utils/dotest.pp:
+ New variable UseOSOnly, set to true if only target OS name
should be used for subdirectories.
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@18228 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/librsvg')
-rw-r--r-- | packages/librsvg/Makefile | 424 |
1 files changed, 192 insertions, 232 deletions
diff --git a/packages/librsvg/Makefile b/packages/librsvg/Makefile index 4c8afcf1d9..798e721199 100644 --- a/packages/librsvg/Makefile +++ b/packages/librsvg/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/11] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -188,7 +188,11 @@ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) else +ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),) +TARGETSUFFIX=$(OS_TARGET) +else TARGETSUFFIX=$(FULL_TARGET) +endif SOURCESUFFIX=$(FULL_SOURCE) endif ifneq ($(FULL_TARGET),$(FULL_SOURCE)) @@ -1667,10 +1671,10 @@ endif override REQUIRE_PACKAGES=rtl gtk2 ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1678,40 +1682,40 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1719,10 +1723,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1730,10 +1734,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1741,10 +1745,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1752,10 +1756,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1763,30 +1767,30 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1794,21 +1798,20 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1816,81 +1819,80 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1898,10 +1900,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1909,10 +1911,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1920,10 +1922,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1931,30 +1933,30 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1962,30 +1964,30 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -1993,10 +1995,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2004,31 +2006,30 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2036,40 +2037,40 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2077,10 +2078,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2088,10 +2089,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2099,20 +2100,20 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2120,10 +2121,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2131,10 +2132,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2142,11 +2143,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2154,30 +2154,30 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2185,21 +2185,20 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2207,60 +2206,60 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2268,11 +2267,10 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2280,30 +2278,30 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2311,20 +2309,20 @@ REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 @@ -2368,44 +2366,6 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif -ifdef REQUIRE_PACKAGES_PASJPEG -PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_PASJPEG),) -ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX)),) -UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) -else -UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) -endif -ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_PASJPEG)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_PASJPEG)/$(FPCMADE) -endif -else -PACKAGEDIR_PASJPEG= -UNITDIR_PASJPEG:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_PASJPEG),) -UNITDIR_PASJPEG:=$(firstword $(UNITDIR_PASJPEG)) -else -UNITDIR_PASJPEG= -endif -endif -ifdef UNITDIR_PASJPEG -override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) -endif -ifdef UNITDIR_FPMAKE_PASJPEG -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) -endif -endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_HASH),) @@ -2482,42 +2442,80 @@ ifdef UNITDIR_FPMAKE_PASZLIB override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) 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) +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_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_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) endif endif ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(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)) +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) else -UNITDIR_FCL-BASE= +UNITDIR_FPMKUNIT= endif endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE @@ -2672,44 +2670,6 @@ ifdef UNITDIR_FPMAKE_GTK2 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) 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 |