Browse Source

* Remove OS specific linux unit rules
* Replace linux by LINUXUNIT where neeeded
* Remove OS specific linuxvcs unit rule
* Replace linuxvcs by LINUXVCSUNIT

Pierre Muller 1 year ago
parent
commit
3dd21b88da
4 changed files with 4 additions and 16 deletions
  1. 3 9
      rtl/android/Makefile.fpc
  2. 0 3
      rtl/freebsd/Makefile.fpc
  3. 1 1
      rtl/linux/Makefile.fpc
  4. 0 3
      rtl/openbsd/Makefile.fpc

+ 3 - 9
rtl/android/Makefile.fpc

@@ -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
-

+ 0 - 3
rtl/freebsd/Makefile.fpc

@@ -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) $<
 

+ 1 - 1
rtl/linux/Makefile.fpc

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

+ 0 - 3
rtl/openbsd/Makefile.fpc

@@ -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) $<