* Remove OS specific linux unit rules

* Replace linux by LINUXUNIT where neeeded
 * Remove OS specific linuxvcs unit rule
 * Replace linuxvcs by LINUXVCSUNIT
This commit is contained in:
Pierre Muller 2023-09-14 11:38:03 +00:00
parent 31d831d775
commit 3dd21b88da
4 changed files with 4 additions and 16 deletions

View File

@ -9,8 +9,8 @@ main=rtl
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
$(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix linux initc $(CMEMUNIT) \
linuxvcs sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) \
$(LINUXVCSUNIT) sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \
$(GETOPTSUNIT) $(ERRORSUNIT) dl dynlibs \
types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \
rtlconsts dos cwstring fpcylix $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \
@ -22,7 +22,7 @@ rsts=math typinfo sysconst rtlconsts
nortl=y
[clean]
units=syslinux linux
units=syslinux $(LINUXUNIT)
[install]
fpcpackage=y
@ -222,9 +222,3 @@ fpcylix$(PPUEXT) : $(LINUXINC)/fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dy
termio$(PPUEXT) : $(LINUXINC)/termio.pp $(SYSTEMUNIT)$(PPUEXT) baseunix$(PPUEXT)
$(COMPILER) $(LINUXINC)/termio.pp
linux$(PPUEXT) : $(LINUXINC)/linux.pp $(SYSTEMUNIT)$(PPUEXT) baseunix$(PPUEXT) unixtype$(PPUEXT)
$(COMPILER) $(LINUXINC)/linux.pp
linuxvcs$(PPUEXT) : $(LINUXINC)/linuxvcs.pp $(SYSTEMUNIT)$(PPUEXT) baseunix$(PPUEXT) strings$(PPUEXT)
$(COMPILER) $(LINUXINC)/linuxvcs.pp

View File

@ -146,9 +146,6 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/fi
unxfunc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
linux$(PPUEXT) : baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
unixutil$(PPUEXT) : $(UNIXINC)/unixutil.pp baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<

View File

@ -27,7 +27,7 @@ rsts=math typinfo sysconst rtlconsts
nortl=y
[clean]
units=syslinux linux
units=syslinux $(LINUXUNIT)
[install]
fpcpackage=y

View File

@ -159,9 +159,6 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/fi
unxfunc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
linux$(PPUEXT) : baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
unixutil$(PPUEXT) : $(UNIXINC)/unixutil.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<