Browse Source

Regenerate Makefile's after inc/Makefile.rtl change

Pierre Muller 2 years ago
parent
commit
cefa2745b8

+ 2 - 1
rtl/aix/Makefile

@@ -2527,7 +2527,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/amiga/Makefile

@@ -2559,7 +2559,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/android/Makefile

@@ -2666,7 +2666,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/aros/Makefile

@@ -2574,7 +2574,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/atari/Makefile

@@ -2529,7 +2529,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/beos/Makefile

@@ -2535,7 +2535,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/darwin/Makefile

@@ -2655,7 +2655,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/dragonfly/Makefile

@@ -2536,7 +2536,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/embedded/Makefile

@@ -2893,7 +2893,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/emx/Makefile

@@ -2539,7 +2539,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/freebsd/Makefile

@@ -2577,7 +2577,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/freertos/Makefile

@@ -2724,7 +2724,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/gba/Makefile

@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/go32v2/Makefile

@@ -2534,7 +2534,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/haiku/Makefile

@@ -2568,7 +2568,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/java/Makefile

@@ -2498,7 +2498,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/linux/Makefile

@@ -3128,7 +3128,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/macos/Makefile

@@ -2517,7 +2517,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/morphos/Makefile

@@ -2501,7 +2501,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/msdos/Makefile

@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/msxdos/Makefile

@@ -2498,7 +2498,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/nativent/Makefile

@@ -2505,7 +2505,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/nds/Makefile

@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/netbsd/Makefile

@@ -2633,7 +2633,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/netware/Makefile

@@ -2540,7 +2540,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/netwlibc/Makefile

@@ -2530,7 +2530,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/openbsd/Makefile

@@ -2566,7 +2566,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/os2/Makefile

@@ -2538,7 +2538,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/palmos/Makefile

@@ -2541,7 +2541,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/sinclairql/Makefile

@@ -2529,7 +2529,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/solaris/Makefile

@@ -2542,7 +2542,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/symbian/Makefile

@@ -2519,7 +2519,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/wasi/Makefile

@@ -2503,7 +2503,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/watcom/Makefile

@@ -2535,7 +2535,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/wii/Makefile

@@ -2497,7 +2497,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/win16/Makefile

@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/win32/Makefile

@@ -2540,7 +2540,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/win64/Makefile

@@ -2557,7 +2557,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/wince/Makefile

@@ -2520,7 +2520,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<

+ 2 - 1
rtl/zxspectrum/Makefile

@@ -2495,7 +2495,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
 	$(COMPILER) $(FPWIDESTRING_OPT) $<