From e34a5ac44b6ace7b9139df78acafd9ff2cc58be8 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Mon, 11 Sep 2023 22:23:33 +0000 Subject: [PATCH] Remove OS specific extpas rules and replace extpas by $(EXTPASUNIT) --- rtl/aix/Makefile.fpc | 5 +---- rtl/amiga/Makefile.fpc | 2 +- rtl/android/Makefile.fpc | 5 +---- rtl/beos/Makefile.fpc | 2 +- rtl/darwin/Makefile.fpc | 2 +- rtl/dragonfly/Makefile.fpc | 9 +-------- rtl/embedded/Makefile.fpc | 2 +- rtl/freebsd/Makefile.fpc | 9 +-------- rtl/freertos/Makefile.fpc | 2 +- rtl/go32v2/Makefile.fpc | 6 +----- rtl/macos/Makefile.fpc | 2 +- rtl/morphos/Makefile.fpc | 5 +---- rtl/msxdos/Makefile.fpc | 6 +----- rtl/nativent/Makefile.fpc | 7 ++----- rtl/netbsd/Makefile.fpc | 9 +-------- rtl/netwlibc/Makefile.fpc | 2 +- rtl/openbsd/Makefile.fpc | 9 +-------- rtl/palmos/Makefile.fpc | 5 +---- 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 +----- rtl/win32/Makefile.fpc | 2 +- rtl/win64/Makefile.fpc | 2 +- 25 files changed, 27 insertions(+), 88 deletions(-) diff --git a/rtl/aix/Makefile.fpc b/rtl/aix/Makefile.fpc index 96f074aac6..a720ea854f 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 $(ISO7185UNIT) extpas $(MACPASUNIT) \ +units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas $(ISO7185UNIT) $(EXTPASUNIT) $(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 -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - # # Other system-dependent RTL Units # diff --git a/rtl/amiga/Makefile.fpc b/rtl/amiga/Makefile.fpc index 94d9e3c786..55e20e24fd 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) $(ISO7185UNIT) extpas buildrtl $(CPALLUNIT) +units=$(SYSTEMUNIT) $(RESUNIT) heaptrc uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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 f6cc8f7746..0329159b8a 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) $(ISO7185UNIT) extpas syscall unixutil \ + uuchar unixtype ctypes baseunix strings objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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 -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - # # Other $(SYSTEMUNIT)-dependent RTL Units # diff --git a/rtl/beos/Makefile.fpc b/rtl/beos/Makefile.fpc index d5db155faa..0e33aaf20a 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) $(ISO7185UNIT) extpas $(STRINGSUNIT) \ +units=system uuchar $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \ $(ERRORSUNIT) $(DOSUNIT) $(DLUNIT) $(CTHREADSUNIIT) \ $(SYSCONSTUNIT) $(SYSUTILSUNIT) \ $(TYPESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MATHUNIT) \ diff --git a/rtl/darwin/Makefile.fpc b/rtl/darwin/Makefile.fpc index f402db5c1b..7d369eb51e 100644 --- a/rtl/darwin/Makefile.fpc +++ b/rtl/darwin/Makefile.fpc @@ -8,7 +8,7 @@ main=rtl # disabled units: serial [target] loaders= -units=$(SYSTEMUNIT) sysinit uuchar $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) extpas \ +units=$(SYSTEMUNIT) sysinit uuchar $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ $(STRINGSUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) \ $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) \ $(DOSUNIT) $(DLUNIT) $(BLOCKRTLUNIT) \ diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc index cef35664b9..9578724513 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) $(ISO7185UNIT) extpas \ +units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ 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 -# -# Extended Pascal Model -# - -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp $(REDIR) - # # Other system-independent RTL Units # diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index 14d4a570f6..7b1b6f3c7c 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -12,7 +12,7 @@ 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 $(ISO7185UNIT) extpas $(HEAPMGRUNIT) $(CONSOLEIOUNIT) $(CPU_SPECIFIC_COMMON_UNITS) \ +units=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas $(ISO7185UNIT) $(EXTPASUNIT) $(HEAPMGRUNIT) $(CONSOLEIOUNIT) $(CPU_SPECIFIC_COMMON_UNITS) \ # $(MACPASUNIT) $(ISO7185UNIT) strings $(STRINGSUNIT) \ $(SORTBASEUNIT) \ diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index fd3f6c8a18..12e4709cdd 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) $(ISO7185UNIT) extpas \ +units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ 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 -# -# Extended Pascal Model -# - -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp $(REDIR) - # # Other system-independent RTL Units # diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc index fe5831cc40..9925a6f8d4 100644 --- a/rtl/freertos/Makefile.fpc +++ b/rtl/freertos/Makefile.fpc @@ -12,7 +12,7 @@ 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 $(ISO7185UNIT) extpas heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \ +units=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas $(ISO7185UNIT) $(EXTPASUNIT) heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \ # $(MACPASUNIT) $(ISO7185UNIT) strings $(STRINGSUNIT) \ $(SORTBASEUNIT) \ diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index 5ddec2cc3b..cc8388193b 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) $(ISO7185UNIT) extpas strings \ +units=system uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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) -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - $(EXECPPAS) - # # System Dependent Units # diff --git a/rtl/macos/Makefile.fpc b/rtl/macos/Makefile.fpc index cb72a40be5..6b013380f1 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 $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) extpas \ +units=$(SYSTEMUNIT) uuchar $(STRINGSUNIT) $(MACPASUNIT) objpas $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) \ $(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 d1e5ad0972..5ea129ccb9 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) $(ISO7185UNIT) extpas buildrtl cpall +units=$(SYSTEMUNIT) heaptrc uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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) -extpas$(PPUEXT) : $(INC)/extpas.pp buildrtl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) heaptrc$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/msxdos/Makefile.fpc b/rtl/msxdos/Makefile.fpc index 8a914d2099..03f67163d8 100644 --- a/rtl/msxdos/Makefile.fpc +++ b/rtl/msxdos/Makefile.fpc @@ -8,7 +8,7 @@ main=rtl units=system si_prc uuchar objpas $(ISO7185UNIT) strings charset cpall \ getopts exeinfo heaptrc #uuchar objpas strings dos heaptrc lnfodwrf sysconst sysutils \ -# math $(MACPASUNIT) $(ISO7185UNIT) extpas rtlconsts typinfo cpu types \ +# math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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) -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - $(EXECPPAS) - # # System Dependent Units # diff --git a/rtl/nativent/Makefile.fpc b/rtl/nativent/Makefile.fpc index d1f288ba0d..6c6d4cd83f 100644 --- a/rtl/nativent/Makefile.fpc +++ b/rtl/nativent/Makefile.fpc @@ -7,8 +7,8 @@ main=rtl [target] loaders= -#units=system objpas $(MACPASUNIT) $(ISO7185UNIT) extpas buildrtl lineinfo lnfodwrf -units=system uuchar objpas $(ISO7185UNIT) extpas cpall buildrtl +#units=system objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl lineinfo lnfodwrf +units=system uuchar objpas $(ISO7185UNIT) $(EXTPASUNIT) 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 -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -Fi$(DDKINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc index e065aae379..c75e3c4991 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) $(ISO7185UNIT) extpas \ +units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ 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 -# -# Extended Pascal Model -# - -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp $(REDIR) - # # Other system-independent RTL Units # diff --git a/rtl/netwlibc/Makefile.fpc b/rtl/netwlibc/Makefile.fpc index ad326aa338..ea4f7bcca8 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) $(ISO7185UNIT) extpas strings \ +units=$(SYSTEMUNIT) uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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 75928b1d71..5fd13cdc91 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) $(ISO7185UNIT) extpas strings syscall baseunix \ +units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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 -# -# Extended Pascal Model -# - -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - # # Other system-independent RTL Units # diff --git a/rtl/palmos/Makefile.fpc b/rtl/palmos/Makefile.fpc index d459d04af8..f0cbd9c745 100644 --- a/rtl/palmos/Makefile.fpc +++ b/rtl/palmos/Makefile.fpc @@ -12,7 +12,7 @@ units=$(SYSTEMUNIT) si_prc uuchar objpas $(ISO7185UNIT) strings \ charset cpall \ sysconst \ systraps pilot -#units=$(SYSTEMUNIT) uuchar ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) extpas strings \ +#units=$(SYSTEMUNIT) uuchar ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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 -#extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) -# $(COMPILER) $(INC)/extpas.pp - types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp diff --git a/rtl/sinclairql/Makefile.fpc b/rtl/sinclairql/Makefile.fpc index 934bddbbab..bc25e394c4 100644 --- a/rtl/sinclairql/Makefile.fpc +++ b/rtl/sinclairql/Makefile.fpc @@ -8,7 +8,7 @@ main=rtl [target] loaders=$(LOADERS) units=$(SYSTEMUNIT) uuchar objpas $(ISO7185UNIT) buildrtl cpall -# extpas $(MACPASUNIT) +# $(EXTPASUNIT) $(MACPASUNIT) implicitunits=si_prc \ ctypes rtlconsts strings \ sortbase charset fpwidestring \ @@ -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) -extpas$(PPUEXT) : $(INC)/extpas.pp buildrtl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc index 3179f255f8..e442723ebb 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 $(ISO7185UNIT) extpas $(MACPASUNIT) \ +units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas $(ISO7185UNIT) $(EXTPASUNIT) $(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 -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - # # Other system-dependent RTL Units # diff --git a/rtl/symbian/Makefile.fpc b/rtl/symbian/Makefile.fpc index 856f5809e8..069ff363f4 100644 --- a/rtl/symbian/Makefile.fpc +++ b/rtl/symbian/Makefile.fpc @@ -7,8 +7,8 @@ main=rtl [target] # $(MACPASUNIT) and $(ISO7185UNIT) units rely on sysutils unit, not yet handled here -# extpas unit relies on dos unit, not yet handled -units=$(SYSTEMUNIT) $(ISO7185UNIT) extpas uuchar objpas $(MACPASUNIT) \ +# $(EXTPASUNIT) unit relies on dos unit, not yet handled +units=$(SYSTEMUNIT) $(ISO7185UNIT) $(EXTPASUNIT) 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 a5b591a7a2..d3525c7d7b 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) $(ISO7185UNIT) uuchar \ +units=$(SYSTEMUNIT) $(SYSINIT_UNITS) objpas $(EXTPASUNIT) $(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 d66535ad27..e6e001ae39 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 $(ISO7185UNIT) extpas dos \ +units=system uuchar objpas strings $(ISO7185UNIT) $(EXTPASUNIT) 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) -extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(INC)/extpas.pp - $(EXECPPAS) - # # WinAPI Units # diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index 349ab65862..ac0b3d8d25 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -8,7 +8,7 @@ main=rtl [target] loaders=$(LOADERS) units=system uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) -implicitunits=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc \ +implicitunits=sysinitpas sysinitcyg sysinitgprof initc $(EXTPASUNIT) heaptrc \ $(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) \ $(DOSUNIT) $(MESSAGESUNIT) \ $(CMEMUNIT) $(DYNLIBSUNIT) \ diff --git a/rtl/win64/Makefile.fpc b/rtl/win64/Makefile.fpc index 1fce90a7dc..3ae4b141cc 100644 --- a/rtl/win64/Makefile.fpc +++ b/rtl/win64/Makefile.fpc @@ -8,7 +8,7 @@ main=rtl [target] loaders=$(LOADERS) units=system uuchar objpas $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) -implicitunits=sysinit extpas heaptrc $(FPINTRESUNIT) \ +implicitunits=sysinit $(EXTPASUNIT) heaptrc $(FPINTRESUNIT) \ $(CTYPESUNIT) $(STRINGSUNIT) \ $(DOSUNIT) $(MESSAGESUNIT) \ $(CMEMUNIT) $(DYNLIBSUNIT) \