Remove OS lnfodwrf unit rule and use LNFODWRFUNIT variable

This commit is contained in:
Pierre Muller 2023-09-12 21:07:16 +00:00
parent 3f4c6c5255
commit 6ba28372db
13 changed files with 13 additions and 40 deletions

View File

@ -9,7 +9,7 @@ main=rtl
loaders=$(LOADERS) loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
$(UUCHARUNIT) unixtype ctypes baseunix strings $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \ $(UUCHARUNIT) unixtype ctypes baseunix strings $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf termio unix linux initc cmem \ $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix linux initc cmem \
linuxvcs sysutils typinfo math charset cpall character \ linuxvcs sysutils typinfo math charset cpall character \
getopts errors dl dynlibs \ getopts errors dl dynlibs \
types sysconst cthreads sortbase classes fgl \ types sysconst cthreads sortbase classes fgl \
@ -233,9 +233,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp $(COMPILER) $(INC)/getopts.pp
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
$(COMPILER) $(INC)/lnfodwrf.pp
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/charset.pp $(COMPILER) $(INC)/charset.pp

View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc cmem \ unix rtlconsts initc cmem \
dl termio \ dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \ sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) lnfodwrf $(LINEINFOUNIT) \ $(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
errors bsd \ errors bsd \
console \ console \
sysconst cthreads dos cwstring \ sysconst cthreads dos cwstring \
@ -212,8 +212,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)

View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc cmem \ unix rtlconsts initc cmem \
dl termio \ dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \ sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) lnfodwrf $(LINEINFOUNIT) \ $(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
errors bsd freebsd \ errors bsd freebsd \
console \ console \
sysconst cthreads dos cwstring \ sysconst cthreads dos cwstring \
@ -232,9 +232,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
$(COMPILER) $<
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<

View File

@ -9,7 +9,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN
go32 dpmiexcp initc ports profile dxetype dxeload emu387 \ go32 dpmiexcp initc ports profile dxetype dxeload emu387 \
dos cmem sortbase \ dos cmem sortbase \
sysutils classes math typinfo \ sysutils classes math typinfo \
cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf ctypes fgl \ cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes fgl \
msmouse charset cpall \ msmouse charset cpall \
character fpwidestring unicodedata \ character fpwidestring unicodedata \
types sysconst rtlconst \ types sysconst rtlconst \
@ -182,10 +182,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp $(COMPILER) $(INC)/getopts.pp
$(EXECPPAS) $(EXECPPAS)
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp system$(PPUEXT)
$(COMPILER) $(INC)/lnfodwrf.pp
$(EXECPPAS)
charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT)
$(COMPILER) $(INC)/charset.pp $(COMPILER) $(INC)/charset.pp
$(EXECPPAS) $(EXECPPAS)

View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(
$(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT)
# exec \ # exec \
# printer \ # printer \
# $(LINEINFOUNIT) lnfodwrf # $(LINEINFOUNIT) $(LNFODWRFUNIT)
rsts=$(MATHUNIT) $(SYSCONSTUNIT) rsts=$(MATHUNIT) $(SYSCONSTUNIT)
# implicitunits=exeinfo # implicitunits=exeinfo
implicitunits=$(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \ implicitunits=$(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \

View File

@ -7,7 +7,7 @@ main=rtl
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu #loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) strings charset cpall \ units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) strings charset cpall \
getopts exeinfo $(HEAPTRCUNIT) getopts exeinfo $(HEAPTRCUNIT)
#$(UUCHARUNIT) $(OBJPASUNIT) strings dos $(HEAPTRCUNIT) lnfodwrf sysconst sysutils \ #$(UUCHARUNIT) $(OBJPASUNIT) strings dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) sysconst sysutils \
# math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \ # math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \
# getopts sortbase fgl classes \ # getopts sortbase fgl classes \
# msmouse ports \ # msmouse ports \
@ -153,10 +153,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp $(REDIR) $(COMPILER) $(INC)/getopts.pp $(REDIR)
$(EXECPPAS) $(EXECPPAS)
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp exeinfo$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/lnfodwrf.pp
$(EXECPPAS)
exeinfo$(PPUEXT) : $(INC)/exeinfo.pp strings$(PPUEXT) system$(PPUEXT) exeinfo$(PPUEXT) : $(INC)/exeinfo.pp strings$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/exeinfo.pp $(COMPILER) $(INC)/exeinfo.pp
$(EXECPPAS) $(EXECPPAS)

View File

@ -7,7 +7,7 @@ main=rtl
[target] [target]
loaders= loaders=
#units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) lnfodwrf #units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT)
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) cpall buildrtl units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) cpall buildrtl
implicitunits=ndk ndkutils ddk \ implicitunits=ndk ndkutils ddk \
ctypes strings \ ctypes strings \

View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc cmem \ unix rtlconsts initc cmem \
dl termio \ dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \ sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) lnfodwrf $(LINEINFOUNIT) \ $(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
errors bsd \ errors bsd \
sysconst cthreads dos cwstring \ sysconst cthreads dos cwstring \
$(FPINTRESUNIT) unixcp fpwidestring \ $(FPINTRESUNIT) unixcp fpwidestring \
@ -226,9 +226,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
$(COMPILER) $<
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<

View File

@ -8,7 +8,7 @@ main=rtl
[target] [target]
loaders=nwplibc nwl_main nwl_dlle loaders=nwplibc nwl_main nwl_dlle
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \
$(LINEINFOUNIT) lnfodwrf $(HEAPTRCUNIT) \ $(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) \
nwsnut libc dos sysconst \ nwsnut libc dos sysconst \
initc sysutils types typinfo sortbase fgl classes \ initc sysutils types typinfo sortbase fgl classes \
cpu mmx getopts \ cpu mmx getopts \
@ -193,8 +193,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT)
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)

View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASU
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \ $(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \ $(CPU_UNITS) dos rtlconsts \
sysutils sortbase fgl classes typinfo math \ sysutils sortbase fgl classes typinfo math \
charset cpall character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf \ charset cpall character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
errors \ errors \
types sysctl sysconst \ types sysctl sysconst \
$(FPINTRESUNIT) dynlibs cwstring cmem dl termio \ $(FPINTRESUNIT) dynlibs cwstring cmem dl termio \
@ -257,9 +257,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
$(COMPILER) $<
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<

View File

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

View File

@ -8,7 +8,7 @@ main=rtl
[target] [target]
loaders= loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
$(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf \ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
baseunix unixutil unixcp \ baseunix unixutil unixcp \
termio unix initc cmem \ termio unix initc cmem \
sysutils typinfo math sortbase fgl classes \ sysutils typinfo math sortbase fgl classes \
@ -210,9 +210,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp $(COMPILER) $(INC)/getopts.pp
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
$(COMPILER) $(INC)/lnfodwrf.pp
charset$(PPUEXT) : $(INC)/charset.pp $(OBJPASUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(INC)/charset.pp $(COMPILER) $(INC)/charset.pp

View File

@ -70,7 +70,7 @@ EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
CPALL_DEPS_OS=buildrtl$(PPUEXT) CPALL_DEPS_OS=buildrtl$(PPUEXT)
# exeinfo unit is inside buildrtl # exeinfo unit is inside buildrtl
# so add a dependency on buildrtl # so add a dependency on buildrtl
# for $(LINEINFOUNIT) and lnfodwrf units # for $(LINEINFOUNIT) and $(LNFODWRFUNIT) units
# which depend on exeinfo # which depend on exeinfo
LINEINFO_DEPS_OS=buildrtl$(PPUEXT) LINEINFO_DEPS_OS=buildrtl$(PPUEXT)
LNFODWRF_DEPS_OS=buildrtl$(PPUEXT) LNFODWRF_DEPS_OS=buildrtl$(PPUEXT)