Replace heaptrc by $(HEAPTRCUNIT) in all Makefile.fpc

This commit is contained in:
Pierre Muller 2023-09-11 23:01:38 +00:00
parent df7aa2c1d1
commit 55196a4fae
25 changed files with 37 additions and 37 deletions

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
heaptrc \
$(HEAPTRCUNIT) \
baseunix unixutil \
termio unix initc cmem \
lnfogdb \
@ -52,7 +52,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos crt \
sysutils typinfo math \
$(CPU_UNITS) getopts heaptrc \
$(CPU_UNITS) getopts $(HEAPTRCUNIT) \
errors sockets
[prerules]

View File

@ -7,7 +7,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(RESUNIT) heaptrc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
units=$(SYSTEMUNIT) $(RESUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) $(EXEUNITS) athreads $(DOSUNIT) $(SYSUTILSUNIT) $(SYSCONSTUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(FPWIDESTRINGUNIT) \
@ -102,7 +102,7 @@ endif
# Base Units (System, strings, os-dependent-base-unit)
#
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) heaptrc$(PPUEXT)
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) $(BUILDRTL_OPT) buildrtl
$(RESUNIT)$(PPUEXT) : $(INC)/$(RESUNIT).pp $(SYSTEMUNIT)$(PPUEXT)

View File

@ -9,7 +9,7 @@ main=rtl
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
$(UUCHARUNIT) unixtype ctypes baseunix strings $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \
$(FPINTRESUNIT) heaptrc lineinfo lnfodwrf termio unix linux initc cmem \
$(FPINTRESUNIT) $(HEAPTRCUNIT) lineinfo lnfodwrf termio unix linux initc cmem \
linuxvcs sysutils typinfo math charset cpall character \
getopts errors dl dynlibs \
types sysconst cthreads sortbase classes fgl \

View File

@ -7,7 +7,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=$(SYSTEMUNIT) heaptrc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
units=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(TYPESUNIT) \
$(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \
@ -98,6 +98,6 @@ prt0$(OEXT) : $(CPU_TARGET)/prt0.as
#
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) heaptrc$(PPUEXT)
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl

View File

@ -76,6 +76,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
# Base Units (System, strings, os-dependent-base-unit)
#
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) heaptrc$(PPUEXT)
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl

View File

@ -48,7 +48,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos crt \
sysutils typinfo math \
$(CPU_UNITS) getopts heaptrc \
$(CPU_UNITS) getopts $(HEAPTRCUNIT) \
errors dynlibs

View File

@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) sysinit $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPAS
$(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) \
$(DOSUNIT) $(DLUNIT) $(BLOCKRTLUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) $(LNFOGDBUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(LNFOGDBUNIT) \
$(ERRORSUNIT) $(TERMIOUNIT) \
$(SYSCONSTUNIT) $(CTHREADSUNIT) $(RTLCONSTSUNIT) $(CWSTRINGUNIT) $(BSDUNIT) $(SYSUTILSUNIT) $(FPWIDESTRINGUNIT) \
$(FPINTRESUNIT) fpextres $(OBJCUNIT) $(OBJCBASEUNIT) $(UNIXCPUNIT) \

View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc cmem \
dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) lnfodwrf lineinfo \
errors bsd \
console \
sysconst cthreads dos cwstring \
@ -52,7 +52,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos \
sysutils typinfo math \
$(CPU_UNITS) getopts heaptrc \
$(CPU_UNITS) getopts $(HEAPTRCUNIT) \
errors dynlibs
[prerules]

View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc cmem \
dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) lnfodwrf lineinfo \
errors bsd freebsd \
console \
sysconst cthreads dos cwstring \
@ -52,7 +52,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos \
sysutils typinfo math \
$(CPU_UNITS) getopts heaptrc \
$(CPU_UNITS) getopts $(HEAPTRCUNIT) \
errors dynlibs
[prerules]

View File

@ -9,7 +9,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN
go32 dpmiexcp initc ports profile dxetype dxeload emu387 \
dos cmem sortbase \
sysutils classes math typinfo \
cpu mmx getopts heaptrc lineinfo lnfodwrf ctypes fgl \
cpu mmx getopts $(HEAPTRCUNIT) lineinfo lnfodwrf ctypes fgl \
msmouse charset cpall \
character fpwidestring unicodedata \
types sysconst rtlconst \

View File

@ -10,7 +10,7 @@ loaders=$(LOADERS)
rsts=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
units=$(SYSTEMUNIT) $(FPINTRESUNIT) $(SYSINIT_UNITS) \
$(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(UNIXUTILUNIT) \
heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(CPU_UNITS) \
$(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) \
@ -49,7 +49,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos \
sysutils typinfo math \
$(CPU_UNITS) getopts heaptrc \
$(CPU_UNITS) getopts $(HEAPTRCUNIT) \
errors dynlibs

View File

@ -9,7 +9,7 @@ main=rtl
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(FPINTRESUNIT) $(SYSINIT_UNITS) \
$(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) \
heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(CPU_UNITS) \
$(LINUXVCSUNIT) \
$(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) \

View File

@ -7,7 +7,7 @@ main=rtl
[target]
#loaders=prt0
units=$(SYSTEMUNIT) heaptrc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl cpall
units=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl cpall
implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) $(SYSUTILSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \
@ -91,9 +91,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp $(REDIR)
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) heaptrc$(PPUEXT)
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) heaptrc$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

View File

@ -7,7 +7,7 @@ main=rtl
loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
units=$(SYSTEMUNIT) \
$(UUCHARUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
heaptrc $(LNFODWRFUNIT) \
$(HEAPTRCUNIT) $(LNFODWRFUNIT) \
$(CPUUNIT) \
$(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \

View File

@ -6,8 +6,8 @@ main=rtl
[target]
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) strings charset cpall \
getopts exeinfo heaptrc
#$(UUCHARUNIT) $(OBJPASUNIT) strings dos heaptrc lnfodwrf sysconst sysutils \
getopts exeinfo $(HEAPTRCUNIT)
#$(UUCHARUNIT) $(OBJPASUNIT) strings dos $(HEAPTRCUNIT) lnfodwrf sysconst sysutils \
# math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \
# getopts sortbase fgl classes \
# msmouse ports \

View File

@ -11,7 +11,7 @@ loaders=
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) cpall buildrtl
implicitunits=ndk ndkutils ddk \
ctypes strings \
# heaptrc
# $(HEAPTRCUNIT)
# initc cmem dynlibs signals \
dos \
rtlconsts sysconst sysutils math types \

View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc cmem \
dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) lnfodwrf lineinfo \
errors bsd \
sysconst cthreads dos cwstring \
$(FPINTRESUNIT) unixcp fpwidestring \
@ -51,7 +51,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos \
sysutils typinfo math \
cpu mmx getopts heaptrc \
cpu mmx getopts $(HEAPTRCUNIT) \
errors
[prerules]

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=nwplibc nwl_main nwl_dlle
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \
lineinfo lnfodwrf heaptrc \
lineinfo lnfodwrf $(HEAPTRCUNIT) \
nwsnut libc dos sysconst \
initc sysutils types typinfo sortbase fgl classes \
cpu mmx getopts \

View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASU
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \
sysutils sortbase fgl classes typinfo math \
charset cpall character getopts heaptrc lineinfo lnfodwrf \
charset cpall character getopts $(HEAPTRCUNIT) lineinfo lnfodwrf \
errors \
types sysctl sysconst \
$(FPINTRESUNIT) dynlibs cwstring cmem dl termio \
@ -51,7 +51,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos \
sysutils typinfo math \
cpu mmx getopts heaptrc \
cpu mmx getopts $(HEAPTRCUNIT) \
errors
[prerules]

View File

@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) strings \
sysconst \
systraps pilot
#units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \
# lnfodwrf lineinfo heaptrc \
# lnfodwrf lineinfo $(HEAPTRCUNIT) \
# windows messages dynlibs \
# dos objects \
# rtlconsts sysconst sysutils \

View File

@ -9,7 +9,7 @@ main=rtl
loaders=cprt0 crti crtn
units=system $(UUCHARUNIT) dos $(OBJPASUNIT) objects strings \
sysutils typinfo math \
cpu mmx getopts heaptrc lineinfo posix
cpu mmx getopts $(HEAPTRCUNIT) lineinfo posix
rsts=math typinfo
[require]

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
heaptrc lineinfo lnfodwrf \
$(HEAPTRCUNIT) lineinfo lnfodwrf \
baseunix unixutil unixcp \
termio unix initc cmem \
sysutils typinfo math sortbase fgl classes \
@ -52,7 +52,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \
unix \
dos \
sysutils typinfo math \
$(CPU_UNITS) getopts heaptrc \
$(CPU_UNITS) getopts $(HEAPTRCUNIT) \
errors
[prerules]

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
implicitunits=sysinitpas sysinitcyg sysinitgprof initc $(EXTPASUNIT) heaptrc \
implicitunits=sysinitpas sysinitcyg sysinitgprof initc $(EXTPASUNIT) $(HEAPTRCUNIT) \
$(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) \
$(DOSUNIT) $(MESSAGESUNIT) \
$(CMEMUNIT) $(DYNLIBSUNIT) \

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
implicitunits=sysinit $(EXTPASUNIT) heaptrc $(FPINTRESUNIT) \
implicitunits=sysinit $(EXTPASUNIT) $(HEAPTRCUNIT) $(FPINTRESUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) \
$(DOSUNIT) $(MESSAGESUNIT) \
$(CMEMUNIT) $(DYNLIBSUNIT) \

View File

@ -7,7 +7,7 @@ main=rtl
[target]
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(FPINTRESUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
$(CPU_UNITS) heaptrc $(LINEINFOUNIT) \
$(CPU_UNITS) $(HEAPTRCUNIT) $(LINEINFOUNIT) \
$(WINDOWSUNIT) $(MESSAGESUNIT) $(DYNLIBSUNIT) \
$(DOSUNIT) \
$(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) \