From bc40d13c4a2e5f6f6900eb78f13b9ea46dbffe4f Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Fri, 4 Aug 2023 22:54:11 +0000 Subject: [PATCH] Unique rule for fpwidestring unit --- rtl/aix/Makefile.fpc | 3 --- rtl/android/Makefile.fpc | 2 -- rtl/dragonfly/Makefile.fpc | 3 --- rtl/freebsd/Makefile.fpc | 2 -- rtl/go32v2/Makefile.fpc | 3 --- rtl/inc/Makefile.rtl | 16 ++++++++++++++-- rtl/msxdos/Makefile.fpc | 3 --- rtl/netbsd/Makefile.fpc | 3 --- rtl/openbsd/Makefile.fpc | 3 --- rtl/solaris/Makefile.fpc | 3 --- rtl/win32/Makefile.fpc | 1 + rtl/win64/Makefile.fpc | 1 + rtl/wince/Makefile.fpc | 1 + 13 files changed, 17 insertions(+), 27 deletions(-) diff --git a/rtl/aix/Makefile.fpc b/rtl/aix/Makefile.fpc index 2f51692654..5658367eea 100644 --- a/rtl/aix/Makefile.fpc +++ b/rtl/aix/Makefile.fpc @@ -256,9 +256,6 @@ iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT) extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/extpas.pp -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp - # # Other system-dependent RTL Units # diff --git a/rtl/android/Makefile.fpc b/rtl/android/Makefile.fpc index 746a75a4b3..6acc2a55cd 100644 --- a/rtl/android/Makefile.fpc +++ b/rtl/android/Makefile.fpc @@ -270,8 +270,6 @@ extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) fpintres$(PPUEXT) : $(INC)/fpintres.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/fpintres.pp -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp # # Other $(SYSTEMUNIT)-dependent RTL Units # diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc index c84d85cd5a..d0d3fb9bbd 100644 --- a/rtl/dragonfly/Makefile.fpc +++ b/rtl/dragonfly/Makefile.fpc @@ -251,9 +251,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp - # # Other system-dependent RTL Units # diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index 72bf020415..669590f5fd 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -277,8 +277,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp # # Other system-dependent RTL Units # diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index cbf7bb519e..11c5123a6d 100644 --- a/rtl/go32v2/Makefile.fpc +++ b/rtl/go32v2/Makefile.fpc @@ -232,9 +232,6 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT) $(COMPILER) $(INC)/ucomplex.pp $(EXECPPAS) -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp charset$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp - character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) objpas$(PPUEXT) rtlconst$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT) $(COMPILER) $(OBJPASDIR)/character.pas diff --git a/rtl/inc/Makefile.rtl b/rtl/inc/Makefile.rtl index f12f37f63f..9379169c79 100644 --- a/rtl/inc/Makefile.rtl +++ b/rtl/inc/Makefile.rtl @@ -1235,8 +1235,20 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS) # fpwidestring # -FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \ - $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ +ifneq ($(UNIXINC),) + FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT) +endif + +# TODO: fpwidestring unit also includes rtldefs.inc +# but this can be in different directories +ifeq ($(AMIINC),) + RTLDEFSINCDIR = $(OSDIR) +else + RTLDEFSINCDIR=$(AMIINC) +endif + +FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \ + $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \ $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \ $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU) diff --git a/rtl/msxdos/Makefile.fpc b/rtl/msxdos/Makefile.fpc index 0c5eccd6f4..69f90222a5 100644 --- a/rtl/msxdos/Makefile.fpc +++ b/rtl/msxdos/Makefile.fpc @@ -196,9 +196,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(EXECPPAS) -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp unicodedata$(PPUEXT) charset$(PPUEXT) objpas$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp - character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) objpas$(PPUEXT) rtlconsts$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT) $(COMPILER) $(OBJPASDIR)/character.pas diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc index 311b308aa0..caaac8a4dd 100644 --- a/rtl/netbsd/Makefile.fpc +++ b/rtl/netbsd/Makefile.fpc @@ -286,9 +286,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp - # # Other system-dependent RTL Units # diff --git a/rtl/openbsd/Makefile.fpc b/rtl/openbsd/Makefile.fpc index c7832cdb3d..e74583aa92 100644 --- a/rtl/openbsd/Makefile.fpc +++ b/rtl/openbsd/Makefile.fpc @@ -313,9 +313,6 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $< - bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc index 33c3799865..4c99cbe7d4 100644 --- a/rtl/solaris/Makefile.fpc +++ b/rtl/solaris/Makefile.fpc @@ -249,9 +249,6 @@ charset$(PPUEXT) : $(INC)/charset.pp objpas$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas -fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT) unixcp$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fpwidestring.pp - iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/iso7185.pp diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index a5fcf19ea0..eac918af9d 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -74,6 +74,7 @@ WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) EXTPAS_DEPS_OS=buildrtl$(PPUEXT) +FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) [rules] .NOTPARALLEL: diff --git a/rtl/win64/Makefile.fpc b/rtl/win64/Makefile.fpc index c67d58c5c3..39d3357264 100644 --- a/rtl/win64/Makefile.fpc +++ b/rtl/win64/Makefile.fpc @@ -89,6 +89,7 @@ OBJPASDIR=$(RTL)/objpas WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) FPC_SYSTEM_OPT=-Fi../win EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) +FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) [rules] .NOTPARALLEL: diff --git a/rtl/wince/Makefile.fpc b/rtl/wince/Makefile.fpc index c6bc26a30e..ef6aa3e04c 100644 --- a/rtl/wince/Makefile.fpc +++ b/rtl/wince/Makefile.fpc @@ -86,6 +86,7 @@ DOS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) SYSUTILSDIR=. SYSUTILS_OPT=-Fi../win SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) +FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) [rules] .NOTPARALLEL: