mirror of
				https://gitlab.com/freepascal.org/fpc/source.git
				synced 2025-11-04 10:59:41 +01:00 
			
		
		
		
	Remove OS lnfodwrf unit rule and use LNFODWRFUNIT variable
This commit is contained in:
		
							parent
							
								
									3f4c6c5255
								
							
						
					
					
						commit
						6ba28372db
					
				@ -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) $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf termio unix linux initc cmem \
 | 
			
		||||
      $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix linux initc cmem \
 | 
			
		||||
      linuxvcs sysutils typinfo math charset cpall character \
 | 
			
		||||
      getopts errors dl dynlibs \
 | 
			
		||||
      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)
 | 
			
		||||
        $(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)
 | 
			
		||||
        $(COMPILER) $(INC)/charset.pp
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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 $(HEAPTRCUNIT) lnfodwrf $(LINEINFOUNIT) \
 | 
			
		||||
      $(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
 | 
			
		||||
      errors bsd \
 | 
			
		||||
      console  \
 | 
			
		||||
      sysconst cthreads dos cwstring \
 | 
			
		||||
@ -212,8 +212,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(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)
 | 
			
		||||
 | 
			
		||||
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
@ -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 $(HEAPTRCUNIT) lnfodwrf $(LINEINFOUNIT) \
 | 
			
		||||
      $(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
 | 
			
		||||
      errors bsd freebsd \
 | 
			
		||||
      console  \
 | 
			
		||||
      sysconst cthreads dos cwstring \
 | 
			
		||||
@ -232,9 +232,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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 $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf ctypes fgl \
 | 
			
		||||
      cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes fgl \
 | 
			
		||||
      msmouse charset cpall \
 | 
			
		||||
      character fpwidestring unicodedata \
 | 
			
		||||
      types sysconst rtlconst \
 | 
			
		||||
@ -182,10 +182,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
 | 
			
		||||
	$(COMPILER) $(INC)/getopts.pp
 | 
			
		||||
	$(EXECPPAS)
 | 
			
		||||
 | 
			
		||||
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp system$(PPUEXT)
 | 
			
		||||
	$(COMPILER) $(INC)/lnfodwrf.pp
 | 
			
		||||
	$(EXECPPAS)
 | 
			
		||||
 | 
			
		||||
charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT)
 | 
			
		||||
	$(COMPILER) $(INC)/charset.pp
 | 
			
		||||
	$(EXECPPAS)
 | 
			
		||||
 | 
			
		||||
@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT)  $(MACPASUNIT) $(OBJPASUNIT) $(
 | 
			
		||||
      $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT)  $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT)   
 | 
			
		||||
#      exec  \
 | 
			
		||||
#      printer \
 | 
			
		||||
#      $(LINEINFOUNIT) lnfodwrf
 | 
			
		||||
#      $(LINEINFOUNIT) $(LNFODWRFUNIT)
 | 
			
		||||
rsts=$(MATHUNIT) $(SYSCONSTUNIT)
 | 
			
		||||
# implicitunits=exeinfo
 | 
			
		||||
implicitunits=$(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,7 @@ main=rtl
 | 
			
		||||
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
 | 
			
		||||
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) strings charset cpall \
 | 
			
		||||
      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 \
 | 
			
		||||
#      getopts sortbase fgl classes \
 | 
			
		||||
#      msmouse ports  \
 | 
			
		||||
@ -153,10 +153,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $(INC)/getopts.pp $(REDIR)
 | 
			
		||||
	$(EXECPPAS)
 | 
			
		||||
 | 
			
		||||
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp exeinfo$(PPUEXT) system$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $(INC)/lnfodwrf.pp
 | 
			
		||||
	$(EXECPPAS)
 | 
			
		||||
 | 
			
		||||
exeinfo$(PPUEXT) : $(INC)/exeinfo.pp strings$(PPUEXT) system$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $(INC)/exeinfo.pp
 | 
			
		||||
	$(EXECPPAS)
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,7 @@ main=rtl
 | 
			
		||||
 | 
			
		||||
[target]
 | 
			
		||||
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
 | 
			
		||||
implicitunits=ndk ndkutils ddk \
 | 
			
		||||
      ctypes strings \
 | 
			
		||||
 | 
			
		||||
@ -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 $(HEAPTRCUNIT) lnfodwrf $(LINEINFOUNIT) \
 | 
			
		||||
      $(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
 | 
			
		||||
      errors bsd \
 | 
			
		||||
      sysconst cthreads dos cwstring \
 | 
			
		||||
      $(FPINTRESUNIT) unixcp fpwidestring \
 | 
			
		||||
@ -226,9 +226,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
	$(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
 | 
			
		||||
	$(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
	$(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,7 +8,7 @@ main=rtl
 | 
			
		||||
[target]
 | 
			
		||||
loaders=nwplibc nwl_main nwl_dlle
 | 
			
		||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \
 | 
			
		||||
      $(LINEINFOUNIT) lnfodwrf  $(HEAPTRCUNIT) \
 | 
			
		||||
      $(LINEINFOUNIT) $(LNFODWRFUNIT)  $(HEAPTRCUNIT) \
 | 
			
		||||
      nwsnut libc dos sysconst \
 | 
			
		||||
      initc sysutils types typinfo sortbase fgl classes \
 | 
			
		||||
      cpu mmx getopts \
 | 
			
		||||
@ -193,8 +193,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
@ -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 $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf \
 | 
			
		||||
      charset cpall character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
 | 
			
		||||
      errors \
 | 
			
		||||
      types sysctl sysconst \
 | 
			
		||||
      $(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)
 | 
			
		||||
        $(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
 | 
			
		||||
        $(COMPILER) $<
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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 $(LINEINFOUNIT) $(HEAPTRCUNIT) \
 | 
			
		||||
#      $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \
 | 
			
		||||
#      windows messages dynlibs \
 | 
			
		||||
#      dos objects \
 | 
			
		||||
#      rtlconsts sysconst sysutils \
 | 
			
		||||
 | 
			
		||||
@ -8,7 +8,7 @@ main=rtl
 | 
			
		||||
[target]
 | 
			
		||||
loaders=
 | 
			
		||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
 | 
			
		||||
      $(HEAPTRCUNIT) $(LINEINFOUNIT) lnfodwrf \
 | 
			
		||||
      $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
 | 
			
		||||
      baseunix unixutil unixcp \
 | 
			
		||||
      termio unix initc cmem \
 | 
			
		||||
      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)
 | 
			
		||||
	$(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)
 | 
			
		||||
	$(COMPILER) $(INC)/charset.pp
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -70,7 +70,7 @@ EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
 | 
			
		||||
CPALL_DEPS_OS=buildrtl$(PPUEXT)
 | 
			
		||||
# exeinfo unit is inside buildrtl
 | 
			
		||||
# so add a dependency on buildrtl
 | 
			
		||||
# for $(LINEINFOUNIT) and lnfodwrf units
 | 
			
		||||
# for $(LINEINFOUNIT) and $(LNFODWRFUNIT) units
 | 
			
		||||
# which depend on exeinfo
 | 
			
		||||
LINEINFO_DEPS_OS=buildrtl$(PPUEXT)
 | 
			
		||||
LNFODWRF_DEPS_OS=buildrtl$(PPUEXT)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user