From d1c0a1b8d3e5f92931aa2738a433a058ca188541 Mon Sep 17 00:00:00 2001
From: Pierre Muller <pierre@freepascal.org>
Date: Mon, 11 Sep 2023 22:16:41 +0000
Subject: [PATCH] Remove OS specific iso7185 unit rules, and replace iso7185 by
$(ISO7185UNIT)
---
rtl/aix/Makefile.fpc | 5 +----
rtl/amiga/Makefile.fpc | 2 +-
rtl/android/Makefile.fpc | 5 +----
rtl/atari/Makefile.fpc | 2 +-
rtl/beos/Makefile.fpc | 2 +-
rtl/dragonfly/Makefile.fpc | 9 +--------
rtl/embedded/Makefile.fpc | 4 ++--
rtl/freebsd/Makefile.fpc | 9 +--------
rtl/freertos/Makefile.fpc | 4 ++--
rtl/go32v2/Makefile.fpc | 6 +-----
rtl/macos/Makefile.fpc | 2 +-
rtl/morphos/Makefile.fpc | 5 +----
rtl/msxdos/Makefile.fpc | 8 ++------
rtl/nativent/Makefile.fpc | 7 ++-----
rtl/netbsd/Makefile.fpc | 9 +--------
rtl/netwlibc/Makefile.fpc | 2 +-
rtl/openbsd/Makefile.fpc | 9 +--------
rtl/palmos/Makefile.fpc | 7 ++-----
rtl/sinclairql/Makefile.fpc | 5 +----
rtl/solaris/Makefile.fpc | 5 +----
rtl/symbian/Makefile.fpc | 4 ++--
rtl/wasi/Makefile.fpc | 2 +-
rtl/win16/Makefile.fpc | 6 +-----
23 files changed, 29 insertions(+), 90 deletions(-)
diff --git a/rtl/aix/Makefile.fpc b/rtl/aix/Makefile.fpc
index 9daf9554fd..96f074aac6 100644
--- a/rtl/aix/Makefile.fpc
+++ b/rtl/aix/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=
-units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas $(MACPASUNIT) \
+units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas $(ISO7185UNIT) extpas $(MACPASUNIT) \
heaptrc \
baseunix unixutil \
termio unix initc cmem \
@@ -229,9 +229,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
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/amiga/Makefile.fpc b/rtl/amiga/Makefile.fpc
index 216a6397ad..94d9e3c786 100644
--- a/rtl/amiga/Makefile.fpc
+++ b/rtl/amiga/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=$(LOADERS)
-units=$(SYSTEMUNIT) $(RESUNIT) heaptrc uuchar objpas $(MACPASUNIT) iso7185 extpas buildrtl $(CPALLUNIT)
+units=$(SYSTEMUNIT) $(RESUNIT) heaptrc uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) extpas buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) $(EXEUNITS) athreads $(DOSUNIT) $(SYSUTILSUNIT) $(SYSCONSTUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(FPWIDESTRINGUNIT) \
diff --git a/rtl/android/Makefile.fpc b/rtl/android/Makefile.fpc
index 7f82bc0d9e..f6cc8f7746 100644
--- a/rtl/android/Makefile.fpc
+++ b/rtl/android/Makefile.fpc
@@ -8,7 +8,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
- uuchar unixtype ctypes baseunix strings objpas $(MACPASUNIT) iso7185 extpas syscall unixutil \
+ uuchar unixtype ctypes baseunix strings objpas $(MACPASUNIT) $(ISO7185UNIT) extpas syscall unixutil \
$(FPINTRESUNIT) heaptrc lineinfo lnfodwrf termio unix linux initc cmem \
linuxvcs sysutils typinfo math charset cpall character \
getopts errors dl dynlibs \
@@ -254,9 +254,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
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/atari/Makefile.fpc b/rtl/atari/Makefile.fpc
index 975658fd1d..05f1c8c0e7 100644
--- a/rtl/atari/Makefile.fpc
+++ b/rtl/atari/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=$(LOADERS)
-units=$(SYSTEMUNIT) fpextres uuchar objpas $(MACPASUNIT) iso7185 buildrtl $(CPALLUNIT)
+units=$(SYSTEMUNIT) fpextres uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) buildrtl $(CPALLUNIT)
implicitunits=si_prc $(DOSUNIT) $(SYSUTILSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(FPWIDESTRINGUNIT) \
diff --git a/rtl/beos/Makefile.fpc b/rtl/beos/Makefile.fpc
index 91168723a5..d5db155faa 100644
--- a/rtl/beos/Makefile.fpc
+++ b/rtl/beos/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=prt0 cprt0 func dllprt
-units=system uuchar $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) iso7185 extpas $(STRINGSUNIT) \
+units=system uuchar $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) extpas $(STRINGSUNIT) \
$(ERRORSUNIT) $(DOSUNIT) $(DLUNIT) $(CTHREADSUNIIT) \
$(SYSCONSTUNIT) $(SYSUTILSUNIT) \
$(TYPESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MATHUNIT) \
diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc
index 72e9e3b475..cef35664b9 100644
--- a/rtl/dragonfly/Makefile.fpc
+++ b/rtl/dragonfly/Makefile.fpc
@@ -10,7 +10,7 @@ fpcpackage=y
[target]
loaders=prt0 cprt0 gprt0 dllprt0
-units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) iso7185 extpas \
+units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) extpas \
strings syscall sysctl baseunix unixutil character \
unix rtlconsts initc cmem \
dl termio \
@@ -202,13 +202,6 @@ sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUE
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
-#
-# ISO-Pascal Model
-#
-
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
#
# Extended Pascal Model
#
diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc
index aee2a9e097..14d4a570f6 100644
--- a/rtl/embedded/Makefile.fpc
+++ b/rtl/embedded/Makefile.fpc
@@ -12,8 +12,8 @@ loaders=$(LOADERS)
# not all targets include enough features to build all units so
# the common units which are not compiled for all CPUs are stored in
# CPU_SPECIFIC_COMMON_UNITS
-units=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas iso7185 extpas $(HEAPMGRUNIT) $(CONSOLEIOUNIT) $(CPU_SPECIFIC_COMMON_UNITS) \
-# $(MACPASUNIT) iso7185 strings
+units=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas $(ISO7185UNIT) extpas $(HEAPMGRUNIT) $(CONSOLEIOUNIT) $(CPU_SPECIFIC_COMMON_UNITS) \
+# $(MACPASUNIT) $(ISO7185UNIT) strings
$(STRINGSUNIT) \
$(SORTBASEUNIT) \
$(DOSUNIT) \
diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc
index a41bad9dde..fd3f6c8a18 100644
--- a/rtl/freebsd/Makefile.fpc
+++ b/rtl/freebsd/Makefile.fpc
@@ -10,7 +10,7 @@ fpcpackage=y
[target]
loaders=prt0 cprt0 gprt0 dllprt0
-units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) iso7185 extpas \
+units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) extpas \
strings syscall sysctl baseunix unixutil character \
unix rtlconsts initc cmem \
dl termio \
@@ -215,13 +215,6 @@ sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUE
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
-#
-# ISO-Pascal Model
-#
-
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
#
# Extended Pascal Model
#
diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc
index a51feb1620..fe5831cc40 100644
--- a/rtl/freertos/Makefile.fpc
+++ b/rtl/freertos/Makefile.fpc
@@ -12,8 +12,8 @@ loaders=$(LOADERS)
# not all targets include enough features to build all units so
# the common units which are not compiled for all CPUs are stored in
# CPU_SPECIFIC_COMMON_UNITS
-units=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas iso7185 extpas heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \
-# $(MACPASUNIT) iso7185 strings
+units=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas $(ISO7185UNIT) extpas heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \
+# $(MACPASUNIT) $(ISO7185UNIT) strings
$(STRINGSUNIT) \
$(SORTBASEUNIT) \
$(DOSUNIT) \
diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc
index 6f616662fd..5ddec2cc3b 100644
--- a/rtl/go32v2/Makefile.fpc
+++ b/rtl/go32v2/Makefile.fpc
@@ -5,7 +5,7 @@
main=rtl
[target]
loaders=prt0 exceptn fpu
-units=system uuchar objpas $(MACPASUNIT) iso7185 extpas strings \
+units=system uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) extpas strings \
go32 dpmiexcp initc ports profile dxetype dxeload emu387 \
dos cmem sortbase \
sysutils classes math typinfo \
@@ -94,10 +94,6 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(COMPILER) $(INC)/strings.pp
$(EXECPPAS)
-iso7185$(PPUEXT) : $(INC)/iso7185.pp system$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
- $(EXECPPAS)
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
$(EXECPPAS)
diff --git a/rtl/macos/Makefile.fpc b/rtl/macos/Makefile.fpc
index 7808fae4e1..cb72a40be5 100644
--- a/rtl/macos/Makefile.fpc
+++ b/rtl/macos/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=
-units=$(SYSTEMUNIT) uuchar $(STRINGSUNIT) $(MACPASUNIT) objpas iso7185 $(MACOSTPUNIT) $(MACUTILSUNIT) extpas \
+units=$(SYSTEMUNIT) uuchar $(STRINGSUNIT) $(MACPASUNIT) objpas $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) extpas \
$(HEAPTRCUNIT) $(GETOPTSUNIT) \
$(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) \
$(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) \
diff --git a/rtl/morphos/Makefile.fpc b/rtl/morphos/Makefile.fpc
index 3251685814..d1e5ad0972 100644
--- a/rtl/morphos/Makefile.fpc
+++ b/rtl/morphos/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
#loaders=prt0
-units=$(SYSTEMUNIT) heaptrc uuchar objpas $(MACPASUNIT) iso7185 extpas buildrtl cpall
+units=$(SYSTEMUNIT) heaptrc uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) extpas buildrtl cpall
implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) $(SYSUTILSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \
@@ -100,9 +100,6 @@ uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp heaptrc$(PPUEXT)
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR)
-iso7185$(PPUEXT) : $(INC)/iso7185.pp buildrtl$(PPUEXT) heaptrc$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
extpas$(PPUEXT) : $(INC)/extpas.pp buildrtl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/msxdos/Makefile.fpc b/rtl/msxdos/Makefile.fpc
index 980f11cc5e..8a914d2099 100644
--- a/rtl/msxdos/Makefile.fpc
+++ b/rtl/msxdos/Makefile.fpc
@@ -5,10 +5,10 @@
main=rtl
[target]
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
-units=system si_prc uuchar objpas iso7185 strings charset cpall \
+units=system si_prc uuchar objpas $(ISO7185UNIT) strings charset cpall \
getopts exeinfo heaptrc
#uuchar objpas strings dos heaptrc lnfodwrf sysconst sysutils \
-# math $(MACPASUNIT) iso7185 extpas rtlconsts typinfo cpu types \
+# math $(MACPASUNIT) $(ISO7185UNIT) extpas rtlconsts typinfo cpu types \
# getopts sortbase fgl classes \
# msmouse ports \
# charset cpall ctypes \
@@ -95,10 +95,6 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(COMPILER) $(INC)/strings.pp
$(EXECPPAS)
-iso7185$(PPUEXT) : $(INC)/iso7185.pp system$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
- $(EXECPPAS)
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
$(EXECPPAS)
diff --git a/rtl/nativent/Makefile.fpc b/rtl/nativent/Makefile.fpc
index f2218b5e1a..d1f288ba0d 100644
--- a/rtl/nativent/Makefile.fpc
+++ b/rtl/nativent/Makefile.fpc
@@ -7,8 +7,8 @@ main=rtl
[target]
loaders=
-#units=system objpas $(MACPASUNIT) iso7185 extpas buildrtl lineinfo lnfodwrf
-units=system uuchar objpas iso7185 extpas cpall buildrtl
+#units=system objpas $(MACPASUNIT) $(ISO7185UNIT) extpas buildrtl lineinfo lnfodwrf
+units=system uuchar objpas $(ISO7185UNIT) extpas cpall buildrtl
implicitunits=ndk ndkutils ddk \
ctypes strings \
# heaptrc
@@ -116,9 +116,6 @@ uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc
index 325f7163df..e065aae379 100644
--- a/rtl/netbsd/Makefile.fpc
+++ b/rtl/netbsd/Makefile.fpc
@@ -10,7 +10,7 @@ fpcpackage=y
[target]
loaders=prt0 cprt0 dllprt0
-units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) iso7185 extpas \
+units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) extpas \
strings syscall sysctl baseunix unixutil character \
unix rtlconsts initc cmem \
dl termio \
@@ -216,13 +216,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) math$(PPUEXT) $(SYSTEMUNI
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
-#
-# ISO-Pascal Model
-#
-
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
#
# Extended Pascal Model
#
diff --git a/rtl/netwlibc/Makefile.fpc b/rtl/netwlibc/Makefile.fpc
index 3ac812dff7..ad326aa338 100644
--- a/rtl/netwlibc/Makefile.fpc
+++ b/rtl/netwlibc/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=nwplibc nwl_main nwl_dlle
-units=$(SYSTEMUNIT) uuchar objpas $(MACPASUNIT) iso7185 extpas strings \
+units=$(SYSTEMUNIT) uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) extpas strings \
lineinfo lnfodwrf heaptrc \
nwsnut libc dos sysconst \
initc sysutils types typinfo sortbase fgl classes \
diff --git a/rtl/openbsd/Makefile.fpc b/rtl/openbsd/Makefile.fpc
index 641599a62d..75928b1d71 100644
--- a/rtl/openbsd/Makefile.fpc
+++ b/rtl/openbsd/Makefile.fpc
@@ -10,7 +10,7 @@ fpcpackage=y
[target]
loaders=$(LOADERS)
-units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas $(MACPASUNIT) iso7185 extpas strings syscall baseunix \
+units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) extpas strings syscall baseunix \
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \
sysutils sortbase fgl classes typinfo math \
@@ -239,13 +239,6 @@ cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUE
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
-#
-# ISO-Pascal Model
-#
-
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
#
# Extended Pascal Model
#
diff --git a/rtl/palmos/Makefile.fpc b/rtl/palmos/Makefile.fpc
index a56e9784bd..d459d04af8 100644
--- a/rtl/palmos/Makefile.fpc
+++ b/rtl/palmos/Makefile.fpc
@@ -7,12 +7,12 @@ main=rtl
[target]
loaders= prt0
-units=$(SYSTEMUNIT) si_prc uuchar objpas iso7185 strings \
+units=$(SYSTEMUNIT) si_prc uuchar objpas $(ISO7185UNIT) strings \
ctypes \
charset cpall \
sysconst \
systraps pilot
-#units=$(SYSTEMUNIT) uuchar ctypes objpas $(MACPASUNIT) iso7185 extpas strings \
+#units=$(SYSTEMUNIT) uuchar ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) extpas strings \
# lnfodwrf lineinfo heaptrc \
# windows messages dynlibs \
# dos objects \
@@ -120,9 +120,6 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
#extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
# $(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/sinclairql/Makefile.fpc b/rtl/sinclairql/Makefile.fpc
index df8d511faa..934bddbbab 100644
--- a/rtl/sinclairql/Makefile.fpc
+++ b/rtl/sinclairql/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=$(LOADERS)
-units=$(SYSTEMUNIT) uuchar objpas iso7185 buildrtl cpall
+units=$(SYSTEMUNIT) uuchar objpas $(ISO7185UNIT) buildrtl cpall
# extpas $(MACPASUNIT)
implicitunits=si_prc \
ctypes rtlconsts strings \
@@ -89,9 +89,6 @@ uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR)
-iso7185$(PPUEXT) : $(INC)/iso7185.pp buildrtl$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
extpas$(PPUEXT) : $(INC)/extpas.pp buildrtl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc
index 9d4c2991ec..3179f255f8 100644
--- a/rtl/solaris/Makefile.fpc
+++ b/rtl/solaris/Makefile.fpc
@@ -7,7 +7,7 @@ main=rtl
[target]
loaders=
-units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas $(MACPASUNIT) \
+units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas $(ISO7185UNIT) extpas $(MACPASUNIT) \
heaptrc lineinfo lnfodwrf \
baseunix unixutil unixcp \
termio unix initc cmem \
@@ -231,9 +231,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
-iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
diff --git a/rtl/symbian/Makefile.fpc b/rtl/symbian/Makefile.fpc
index 6ed76ec8ff..856f5809e8 100644
--- a/rtl/symbian/Makefile.fpc
+++ b/rtl/symbian/Makefile.fpc
@@ -6,9 +6,9 @@
main=rtl
[target]
-# $(MACPASUNIT) and iso7185 units rely on sysutils unit, not yet handled here
+# $(MACPASUNIT) and $(ISO7185UNIT) units rely on sysutils unit, not yet handled here
# extpas unit relies on dos unit, not yet handled
-units=$(SYSTEMUNIT) iso7185 extpas uuchar objpas $(MACPASUNIT) \
+units=$(SYSTEMUNIT) $(ISO7185UNIT) extpas uuchar objpas $(MACPASUNIT) \
$(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(RTLCONSTSUNIT) \
$(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(FGLUNIT) $(CPU_UNITS) \
$(DOSUNIT) $(TYPEINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) buildrtl
diff --git a/rtl/wasi/Makefile.fpc b/rtl/wasi/Makefile.fpc
index 8033b4b2f1..a5b591a7a2 100644
--- a/rtl/wasi/Makefile.fpc
+++ b/rtl/wasi/Makefile.fpc
@@ -5,7 +5,7 @@
main=rtl
[target]
loaders=
-units=$(SYSTEMUNIT) $(SYSINIT_UNITS) objpas extpas $(MACPASUNIT) iso7185 uuchar \
+units=$(SYSTEMUNIT) $(SYSINIT_UNITS) objpas extpas $(MACPASUNIT) $(ISO7185UNIT) uuchar \
$(WASIAPIUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) \
$(SORTBASEUNIT) $(MATHUNIT) $(RTLCONSTSUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(GETOPTSUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) \
diff --git a/rtl/win16/Makefile.fpc b/rtl/win16/Makefile.fpc
index 1e4f55854b..d66535ad27 100644
--- a/rtl/win16/Makefile.fpc
+++ b/rtl/win16/Makefile.fpc
@@ -5,7 +5,7 @@
main=rtl
[target]
loaders=prt0s prt0m prt0c prt0l prt0h
-units=system uuchar objpas strings iso7185 extpas dos \
+units=system uuchar objpas strings $(ISO7185UNIT) extpas dos \
wintypes winprocs win31 ports dynlibs sortbase \
sysconst rtlconsts sysutils math types typinfo fgl \
classes charset cpu getopts cpall \
@@ -101,10 +101,6 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(COMPILER) $(INC)/strings.pp
$(EXECPPAS)
-iso7185$(PPUEXT) : $(INC)/iso7185.pp system$(PPUEXT)
- $(COMPILER) $(INC)/iso7185.pp
- $(EXECPPAS)
-
extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp
$(EXECPPAS)