From b5e3217bb53d610ed9a4eff585b46f72b79af060 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Wed, 20 Sep 2023 08:25:10 +0200 Subject: [PATCH] Makefile's regenerated after math unit rule update --- rtl/aix/Makefile | 18 +++++++----------- rtl/amiga/Makefile | 8 ++++---- rtl/android/Makefile | 36 ++++++++++++++++-------------------- rtl/aros/Makefile | 4 ++-- rtl/atari/Makefile | 4 ++-- rtl/beos/Makefile | 6 +++--- rtl/darwin/Makefile | 24 ++++++++++++------------ rtl/dragonfly/Makefile | 12 +++++------- rtl/embedded/Makefile | 6 +++--- rtl/emx/Makefile | 4 ++-- rtl/freebsd/Makefile | 20 +++++++++----------- rtl/freertos/Makefile | 20 ++++++++++---------- rtl/gba/Makefile | 4 ++-- rtl/go32v2/Makefile | 15 ++++++--------- rtl/haiku/Makefile | 4 ++-- rtl/java/Makefile | 4 ++-- rtl/linux/Makefile | 40 ++++++++++++++++++++-------------------- rtl/macos/Makefile | 4 ++-- rtl/morphos/Makefile | 4 ++-- rtl/msdos/Makefile | 4 ++-- rtl/msxdos/Makefile | 9 +++------ rtl/nativent/Makefile | 8 ++++---- rtl/nds/Makefile | 4 ++-- rtl/netbsd/Makefile | 34 ++++++++++++++++------------------ rtl/netware/Makefile | 4 ++-- rtl/netwlibc/Makefile | 12 +++++------- rtl/openbsd/Makefile | 16 +++++++--------- rtl/os2/Makefile | 4 ++-- rtl/palmos/Makefile | 6 +++--- rtl/sinclairql/Makefile | 6 +++--- rtl/solaris/Makefile | 22 +++++++++------------- rtl/symbian/Makefile | 4 ++-- rtl/wasi/Makefile | 4 ++-- rtl/watcom/Makefile | 6 +++--- rtl/wii/Makefile | 4 ++-- rtl/win16/Makefile | 11 ++++------- rtl/win32/Makefile | 6 +++--- rtl/win64/Makefile | 8 ++++---- rtl/wince/Makefile | 4 ++-- rtl/zxspectrum/Makefile | 4 ++-- 40 files changed, 193 insertions(+), 224 deletions(-) diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile index eea97ef392..cd565589f2 100644 --- a/rtl/aix/Makefile +++ b/rtl/aix/Makefile @@ -903,10 +903,10 @@ endif override FPCOPT+=-dFPC_USE_LIBC OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),powerpc-aix) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) baseunix unixutil termio unix initc $(CMEMUNIT) $(LNFOGDBUNIT) sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst rtlconsts cthreads dos cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) baseunix unixutil termio unix initc $(CMEMUNIT) $(LNFOGDBUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst rtlconsts cthreads dos cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),powerpc64-aix) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) baseunix unixutil termio unix initc $(CMEMUNIT) $(LNFOGDBUNIT) sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst rtlconsts cthreads dos cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) baseunix unixutil termio unix initc $(CMEMUNIT) $(LNFOGDBUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst rtlconsts cthreads dos cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-aix) override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT) @@ -915,10 +915,10 @@ ifeq ($(CPU_OS_TARGET),powerpc64-aix) override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-aix) -override TARGET_RSTS+=math typinfo classes sysconst rtlconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconst endif ifeq ($(CPU_OS_TARGET),powerpc64-aix) -override TARGET_RSTS+=math typinfo classes sysconst rtlconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),powerpc-aix) @@ -2359,7 +2359,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2416,7 +2416,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2868,9 +2868,7 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp @@ -2894,8 +2892,6 @@ cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUE gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT) $(COMPILER) $(INC)/ctypes.pp -fpcylix$(PPUEXT) : fpcylix.pp $(SYSTEMUNIT)$(PPUEXT) dynlibs$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) - $(COMPILER) fpcylix.pp dl$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(UNIXINC)/dl.pp initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index 0452fbceb6..e89028f888 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -924,10 +924,10 @@ ifeq ($(CPU_OS_TARGET),powerpc-amiga) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),m68k-amiga) -override TARGET_RSTS+=math rtlconsts typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) rtlconsts typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),powerpc-amiga) -override TARGET_RSTS+=math rtlconsts typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) rtlconsts typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),m68k-amiga) @@ -2395,7 +2395,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2452,7 +2452,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/android/Makefile b/rtl/android/Makefile index 649215c3f5..c597dffb41 100644 --- a/rtl/android/Makefile +++ b/rtl/android/Makefile @@ -904,22 +904,22 @@ override FPCOPT+=-Ur endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-android) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-android) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),arm-android) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),mipsel-android) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),jvm-android) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-android) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-android) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -958,22 +958,22 @@ ifeq ($(CPU_OS_TARGET),aarch64-android) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),i386-android) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),x86_64-android) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),arm-android) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),mipsel-android) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),jvm-android) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),aarch64-android) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),i386-android) override CLEAN_UNITS+=$(LINUXUNIT) @@ -1048,7 +1048,7 @@ endif ifeq ($(CPU_OS_TARGET),aarch64-android) override COMPILER_TARGETDIR+=. endif -override SHARED_LIBUNITS=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos unix baseunix unixtype unixutil sysutils typinfo math $(CPU_UNITS) $(GETOPTSUNIT) $(ERRORSUNIT) sockets $(SORTBASEUNIT) classes $(FGLUNIT) sysconst rtlconsts +override SHARED_LIBUNITS=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos unix baseunix unixtype unixutil sysutils typinfo $(MATHUNIT) $(CPU_UNITS) $(GETOPTSUNIT) $(ERRORSUNIT) sockets $(SORTBASEUNIT) classes $(FGLUNIT) sysconst rtlconsts ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2502,7 +2502,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2559,7 +2559,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -3035,9 +3035,7 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp @@ -3055,7 +3053,5 @@ cwstring$(PPUEXT) : cwstring.pp $(SYSTEMUNIT)$(PPUEXT) dynlibs$(PPUEXT) $(COMPILER) cwstring.pp ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/ctypes.pp -fpcylix$(PPUEXT) : $(LINUXINC)/fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dynlibs$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(LINUXINC)/fpcylix.pp termio$(PPUEXT) : $(LINUXINC)/termio.pp $(SYSTEMUNIT)$(PPUEXT) baseunix$(PPUEXT) $(COMPILER) $(LINUXINC)/termio.pp diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile index 0e79b08150..06f3726f0b 100644 --- a/rtl/aros/Makefile +++ b/rtl/aros/Makefile @@ -2410,7 +2410,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2467,7 +2467,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile index 48a9e1c7c6..f5e38e83b7 100644 --- a/rtl/atari/Makefile +++ b/rtl/atari/Makefile @@ -2365,7 +2365,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2422,7 +2422,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index 6cd752aee3..e0ad3b1dff 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -907,7 +907,7 @@ ifeq ($(CPU_OS_TARGET),i386-beos) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif ifeq ($(CPU_OS_TARGET),i386-beos) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-beos) @@ -2372,7 +2372,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2429,7 +2429,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 76b04528f7..b17dad57ef 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -971,34 +971,34 @@ ifeq ($(CPU_OS_TARGET),aarch64-ios) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) endif ifeq ($(CPU_OS_TARGET),i386-darwin) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),i386-iphonesim) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),powerpc-darwin) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),x86_64-darwin) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),x86_64-iphonesim) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),arm-ios) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),powerpc64-darwin) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),aarch64-darwin) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),aarch64-iphonesim) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),aarch64-ios) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-darwin) @@ -2487,7 +2487,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2544,7 +2544,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile index 61dea6e512..f3282692c8 100644 --- a/rtl/dragonfly/Makefile +++ b/rtl/dragonfly/Makefile @@ -901,7 +901,7 @@ override FPCOPT+=-Ur endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -910,7 +910,7 @@ ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0 endif ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) @@ -2372,7 +2372,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2429,7 +2429,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2887,9 +2887,7 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index 19a701a7f7..0979664e4c 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -1041,7 +1041,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT endif endif ifeq ($(ARCH),riscv32) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32ec) override FPCOPT+=-Cprv32ec CPU_UNITS=CH32VxBootstrap @@ -2744,7 +2744,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2801,7 +2801,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index d35bf08df3..9868c3695d 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -2374,7 +2374,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2431,7 +2431,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 16326b8315..603ee07b1f 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -907,13 +907,13 @@ override FPCOPT+=-Ur endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd freebsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd freebsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd freebsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd freebsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd freebsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd freebsd console sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-freebsd) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -934,13 +934,13 @@ ifeq ($(CPU_OS_TARGET),aarch64-freebsd) override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0 endif ifeq ($(CPU_OS_TARGET),i386-freebsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),x86_64-freebsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),aarch64-freebsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),i386-freebsd) @@ -2414,7 +2414,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2471,7 +2471,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2934,9 +2934,7 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile index edc17b17f9..52ecea4e54 100644 --- a/rtl/freertos/Makefile +++ b/rtl/freertos/Makefile @@ -905,7 +905,7 @@ CPU_SPECIFIC_COMMON_UNITS= DOSDIR=. DOS_DEPS_OS=objpas$(PPUEXT) ifeq ($(ARCH),arm) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),armv7m) CPU_UNITS=stm32f103xe cortexm3 cortexm4 # thumb2_bare CPU_UNITS_DEFINED=1 @@ -1005,7 +1005,7 @@ endif endif endif ifeq ($(ARCH),i386) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) CPU_UNITS=multiboot CPU_UNITS_DEFINED=1 ifeq ($(CPU_UNITS_DEFINED),) @@ -1013,13 +1013,13 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT endif endif ifeq ($(ARCH),x86_64) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) endif ifeq ($(ARCH),m68k) -CPU_SPECIFIC_COMMON_UNITS=sysutils math +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) endif ifeq ($(ARCH),mipsel) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),pic32mx) CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh CPU_UNITS_DEFINED=1 @@ -1029,7 +1029,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT endif endif ifeq ($(ARCH),riscv32) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32imc) override FPCOPT+=-Cprv32imc CPU_UNITS=esp32c3 esp32c3idf_50000 @@ -1040,7 +1040,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT endif endif ifeq ($(ARCH),riscv64) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) CPU_UNITS= CPU_UNITS_DEFINED=1 ifeq ($(CPU_UNITS_DEFINED),) @@ -1048,7 +1048,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT endif endif ifeq ($(ARCH),xtensa) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),lx6) CPU_UNITS=esp32 espidf_40100 espidf_40200 espidf_40400 CPU_UNITS_DEFINED=1 @@ -2561,7 +2561,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2618,7 +2618,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index 97f57217d5..6f4b9f1eef 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -2363,7 +2363,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2420,7 +2420,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index e5271c55a7..c18a7481c7 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -899,7 +899,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM endif ifeq ($(CPU_OS_TARGET),i386-go32v2) -override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) go32 dpmiexcp initc $(PORTSUNIT) profile dxetype dxeload emu387 dos $(CMEMUNIT) $(SORTBASEUNIT) sysutils classes math typinfo cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) msmouse $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) types sysconst rtlconst $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) go32 dpmiexcp initc $(PORTSUNIT) profile dxetype dxeload emu387 dos $(CMEMUNIT) $(SORTBASEUNIT) sysutils classes $(MATHUNIT) typinfo cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) msmouse $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) types sysconst rtlconst $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-go32v2) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) @@ -908,7 +908,7 @@ ifeq ($(CPU_OS_TARGET),i386-go32v2) override TARGET_LOADERS+=prt0 exceptn fpu endif ifeq ($(CPU_OS_TARGET),i386-go32v2) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-go32v2) @@ -2370,7 +2370,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2427,7 +2427,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2891,13 +2891,10 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp - $(EXECPPAS) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconst$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp @@ -2912,7 +2909,7 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT) matrix$(PPUEXT) : $(INC)/matrix.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/matrix.pp $(EXECPPAS) -ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT) +ucomplex$(PPUEXT) : $(INC)/ucomplex.pp $(MATHUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) $(INC)/ucomplex.pp $(EXECPPAS) msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT) diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile index 9f5ae8675b..82651bcca7 100644 --- a/rtl/haiku/Makefile +++ b/rtl/haiku/Makefile @@ -2403,7 +2403,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2460,7 +2460,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/java/Makefile b/rtl/java/Makefile index a880794685..c56cc26b20 100644 --- a/rtl/java/Makefile +++ b/rtl/java/Makefile @@ -2333,7 +2333,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2390,7 +2390,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 557e4a32d7..429da40694 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1122,58 +1122,58 @@ ifeq ($(CPU_OS_TARGET),loongarch64-linux) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),i386-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),m68k-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),powerpc-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),sparc-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),x86_64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),arm-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),powerpc64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),armeb-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),mips-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),mipsel-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),mips64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),mips64el-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),aarch64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),sparc64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),riscv32-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),riscv64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),xtensa-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),loongarch64-linux) -override TARGET_RSTS+=math typinfo sysconst rtlconsts +override TARGET_RSTS+=$(MATHUNIT) typinfo sysconst rtlconsts endif ifeq ($(CPU_OS_TARGET),i386-linux) override CLEAN_UNITS+=$(LINUXUNIT) @@ -2964,7 +2964,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -3021,7 +3021,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index b2e49c2ee1..0d13287bd0 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -2352,7 +2352,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2409,7 +2409,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index 29afa9ad06..b64047693c 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -2337,7 +2337,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2394,7 +2394,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile index 89e719b906..09146ea891 100644 --- a/rtl/msdos/Makefile +++ b/rtl/msdos/Makefile @@ -2365,7 +2365,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2422,7 +2422,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile index ecb6def3b6..5509cbdca3 100644 --- a/rtl/msxdos/Makefile +++ b/rtl/msxdos/Makefile @@ -2334,7 +2334,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2391,7 +2391,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2836,13 +2836,10 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(EXECPPAS) -math$(PPUEXT): $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp - $(EXECPPAS) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) system$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) system$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASDIR)/rtlconst.inc $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile index 0313fc5007..3e9a6a6f93 100644 --- a/rtl/nativent/Makefile +++ b/rtl/nativent/Makefile @@ -903,10 +903,10 @@ ifeq ($(CPU_OS_TARGET),i386-nativent) override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl endif ifeq ($(CPU_OS_TARGET),i386-nativent) -override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes $(STRINGSUNIT) dos rtlconsts sysconst sysutils math types typinfo $(FGLUNIT) classes $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP_UNITS) +override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes $(STRINGSUNIT) dos rtlconsts sysconst sysutils $(MATHUNIT) types typinfo $(FGLUNIT) classes $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP_UNITS) endif ifeq ($(CPU_OS_TARGET),i386-nativent) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-nativent) @@ -2341,7 +2341,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2398,7 +2398,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile index a6b59ca0ba..78596dc77c 100644 --- a/rtl/nds/Makefile +++ b/rtl/nds/Makefile @@ -2363,7 +2363,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2420,7 +2420,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index c200719b44..ceac369a37 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -905,22 +905,22 @@ ifeq ($(ARCH),i386) CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT) endif ifeq ($(CPU_OS_TARGET),i386-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),m68k-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),sparc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),arm-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) unix rtlconsts initc $(CMEMUNIT) dl termio sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) bsd sysconst cthreads dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -959,22 +959,22 @@ ifeq ($(CPU_OS_TARGET),arm-netbsd) override TARGET_LOADERS+=prt0 cprt0 dllprt0 endif ifeq ($(CPU_OS_TARGET),i386-netbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),m68k-netbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),powerpc-netbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),sparc-netbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),x86_64-netbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),arm-netbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),i386-netbsd) @@ -2466,7 +2466,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2523,7 +2523,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2986,9 +2986,7 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp ifneq ($(findstring $(ARCH),x86_64 i386),) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) @@ -3008,7 +3006,7 @@ sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) syscall$(PPUEXT) $(SYSTE $(COMPILER) $< cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< -variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) math$(PPUEXT) +variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(COMPILER) -Fi$(INC) $(INC)/variants.pp cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT) $(COMPILER) $< diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index 7561c36cc5..41c5018563 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -2378,7 +2378,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2435,7 +2435,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile index 853e7d2670..7e0a7de98b 100644 --- a/rtl/netwlibc/Makefile +++ b/rtl/netwlibc/Makefile @@ -895,7 +895,7 @@ CREATESMART=1 OBJPASDIR=$(RTL)/objpas override BINUTILSPREFIX=$(CPU_TARGET)-netware- ifeq ($(CPU_OS_TARGET),i386-netwlibc) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) nwsnut libc dos sysconst initc sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes cpu $(MMXUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CPALLUNIT) rtlconsts math dynlibs $(CMEMUNIT) ctypes $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) nwsnut libc dos sysconst initc sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes cpu $(MMXUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CPALLUNIT) rtlconsts $(MATHUNIT) dynlibs $(CMEMUNIT) ctypes $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-netwlibc) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) @@ -904,7 +904,7 @@ ifeq ($(CPU_OS_TARGET),i386-netwlibc) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif ifeq ($(CPU_OS_TARGET),i386-netwlibc) -override TARGET_RSTS+=math typinfo classes sysconst rtlconsts system +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconsts system endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-netwlibc) @@ -2366,7 +2366,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2423,7 +2423,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2876,9 +2876,7 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/rtlconsts.pp diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile index 4aa5f081d3..b885c6638d 100644 --- a/rtl/openbsd/Makefile +++ b/rtl/openbsd/Makefile @@ -910,10 +910,10 @@ CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT) endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) types sysctl sysconst $(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) types sysctl sysconst $(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) types sysctl sysconst $(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) types sysctl sysconst $(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-openbsd) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -928,10 +928,10 @@ ifeq ($(CPU_OS_TARGET),x86_64-openbsd) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),i386-openbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),x86_64-openbsd) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),i386-openbsd) @@ -2399,7 +2399,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2456,7 +2456,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2920,9 +2920,7 @@ rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(COMPILER) $(OBJPASDIR)/rtlconsts.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp ctypes$(PPUEXT) : $(INC)/ctypes.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index bcf0cad025..fe4e6dd7ef 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -2373,7 +2373,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2430,7 +2430,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile index d60888a559..816560a708 100644 --- a/rtl/palmos/Makefile +++ b/rtl/palmos/Makefile @@ -2376,7 +2376,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2433,7 +2433,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2864,7 +2864,7 @@ $(PRT0)$(OEXT) : $(CPU_TARGET)/$(PRT0).as $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp si_prc$(PPUEXT): si_prc.pp palmos.inc $(SYSTEMUNIT)$(PPUEXT) -types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/rtlconsts.pp diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile index 3146be3a29..5da12799e9 100644 --- a/rtl/sinclairql/Makefile +++ b/rtl/sinclairql/Makefile @@ -903,7 +903,7 @@ ifeq ($(CPU_OS_TARGET),m68k-sinclairql) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),m68k-sinclairql) -override TARGET_RSTS+=math rtlconsts typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) rtlconsts typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),m68k-sinclairql) @@ -2365,7 +2365,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2422,7 +2422,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index 416400abc8..8a9b7bc6fc 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -903,13 +903,13 @@ endif override FPCOPT+=-dFPC_USE_LIBC OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-solaris) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) baseunix unixutil $(UNIXCPUNIT) termio unix initc $(CMEMUNIT) sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst $(CHARACTERUNIT) rtlconsts cthreads dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) baseunix unixutil $(UNIXCPUNIT) termio unix initc $(CMEMUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst $(CHARACTERUNIT) rtlconsts cthreads dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),sparc-solaris) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) baseunix unixutil $(UNIXCPUNIT) termio unix initc $(CMEMUNIT) sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst $(CHARACTERUNIT) rtlconsts cthreads dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) baseunix unixutil $(UNIXCPUNIT) termio unix initc $(CMEMUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst $(CHARACTERUNIT) rtlconsts cthreads dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-solaris) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) baseunix unixutil $(UNIXCPUNIT) termio unix initc $(CMEMUNIT) sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst $(CHARACTERUNIT) rtlconsts cthreads dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) baseunix unixutil $(UNIXCPUNIT) termio unix initc $(CMEMUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs types sysconst $(CHARACTERUNIT) rtlconsts cthreads dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-solaris) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -921,13 +921,13 @@ ifeq ($(CPU_OS_TARGET),x86_64-solaris) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) endif ifeq ($(CPU_OS_TARGET),i386-solaris) -override TARGET_RSTS+=math typinfo classes sysconst rtlconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconst endif ifeq ($(CPU_OS_TARGET),sparc-solaris) -override TARGET_RSTS+=math typinfo classes sysconst rtlconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconst endif ifeq ($(CPU_OS_TARGET),x86_64-solaris) -override TARGET_RSTS+=math typinfo classes sysconst rtlconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst rtlconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-solaris) @@ -2374,7 +2374,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2431,7 +2431,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2883,9 +2883,7 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp -types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp @@ -2908,8 +2906,6 @@ cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUE $(COMPILER) $(UNIXINC)/cwstring.pp ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT) $(COMPILER) $(INC)/ctypes.pp -fpcylix$(PPUEXT) : fpcylix.pp $(SYSTEMUNIT)$(PPUEXT) dynlibs$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) - $(COMPILER) fpcylix.pp dl$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(UNIXINC)/dl.pp initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index 5171f68a54..521c2621d2 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -2356,7 +2356,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2413,7 +2413,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile index 79d296ce79..82c43adf1b 100644 --- a/rtl/wasi/Makefile +++ b/rtl/wasi/Makefile @@ -2339,7 +2339,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2396,7 +2396,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile index 16beb6be08..8413566107 100644 --- a/rtl/watcom/Makefile +++ b/rtl/watcom/Makefile @@ -910,7 +910,7 @@ ifeq ($(CPU_OS_TARGET),i386-watcom) override TARGET_LOADERS+=prt0 endif ifeq ($(CPU_OS_TARGET),i386-watcom) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) $(MATHUNIT) typinfo classes sysconst endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-watcom) @@ -2372,7 +2372,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2429,7 +2429,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile index 0b9b799892..77e58983e2 100644 --- a/rtl/wii/Makefile +++ b/rtl/wii/Makefile @@ -2332,7 +2332,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2389,7 +2389,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile index 523c669a36..19b3234dcb 100644 --- a/rtl/win16/Makefile +++ b/rtl/win16/Makefile @@ -896,7 +896,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM endif ifeq ($(CPU_OS_TARGET),i8086-win16) -override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos wintypes winprocs win31 $(PORTSUNIT) dynlibs $(SORTBASEUNIT) sysconst rtlconsts sysutils math types typinfo $(FGLUNIT) classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) $(UNICODEDATAUNIT) $(CHARACTERUNIT) ctypes +override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos wintypes winprocs win31 $(PORTSUNIT) dynlibs $(SORTBASEUNIT) sysconst rtlconsts sysutils $(MATHUNIT) types typinfo $(FGLUNIT) classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) $(UNICODEDATAUNIT) $(CHARACTERUNIT) ctypes endif ifeq ($(CPU_OS_TARGET),i8086-win16) override TARGET_IMPLICITUNITS+=$(CP_UNITS) @@ -2364,7 +2364,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2421,7 +2421,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) @@ -2892,13 +2892,10 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ winprocs$(PPUEXT) wintypes$(PPUEXT) sortbase$(PPUEXT) system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(EXECPPAS) -math$(PPUEXT): $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/math.pp - $(EXECPPAS) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) system$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) -types$(PPUEXT) : $(OBJPASDIR)/types.pp math$(PPUEXT) wintypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp $(MATHUNIT)$(PPUEXT) wintypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index e544371f1e..669a7e8da3 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -915,7 +915,7 @@ ifeq ($(CPU_OS_TARGET),i386-win32) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),i386-win32) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_BUILDUNIT=buildrtl override INSTALL_FPCPACKAGE=y y @@ -2378,7 +2378,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2435,7 +2435,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile index e1dfd83bb8..9fbed5a676 100644 --- a/rtl/win64/Makefile +++ b/rtl/win64/Makefile @@ -927,10 +927,10 @@ ifeq ($(CPU_OS_TARGET),aarch64-win64) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),x86_64-win64) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif ifeq ($(CPU_OS_TARGET),aarch64-win64) -override TARGET_RSTS+=math typinfo classes sysconst +override TARGET_RSTS+=$(MATHUNIT) typinfo classes sysconst endif override INSTALL_BUILDUNIT=buildrtl override INSTALL_FPCPACKAGE=y y @@ -2399,7 +2399,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2456,7 +2456,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile index b8772e588a..220e261788 100644 --- a/rtl/wince/Makefile +++ b/rtl/wince/Makefile @@ -2359,7 +2359,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2416,7 +2416,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS) diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile index 73964fd5a7..bc7420a9bb 100644 --- a/rtl/zxspectrum/Makefile +++ b/rtl/zxspectrum/Makefile @@ -2331,7 +2331,7 @@ linuxvcs$(PPUEXT): $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< LinuxApi.Vcs$(PPUEXT): $(NSOSDIR)/LinuxApi.Vcs.pp $(LINUXVCS_DEPS) $(COMPILER) $(LINUXVCS_OPT) $< -FPCYLIX_DEPS=fpcylix.pp \ +FPCYLIX_DEPS=../linux/fpcylix.pp \ $(CTHREADSUNIT)$(PPUEXT) $(CWSTRINGUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(FPCYLIX_DEPS_OS) $(FPCYLIX_DEPS_CPU) @@ -2388,7 +2388,7 @@ character$(PPUEXT): $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) $< System.Character$(PPUEXT): $(NSINC)/System.Character.pas $(CHARACTER_DEPS) $(COMPILER) $(CHARACTER_OPT) -Fi$(OBJPASDIR) $< -MATH_DEPS= $(OBJPASDIR)/math.pp \ +MATH_DEPS= $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc \ objpas$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ $(MATH_DEPS_OS) $(MATH_DEPS_CPU) math$(PPUEXT): $(MATH_DEPS)