paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 02:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Adapt dl unit rules for DOTTED version

Browse Source 
* Set DL_DEPS_OS to dlaix.inc for aix OS
  * Set DL_DEPS_OS to dlandroid.inc for android OS
  * Remove OS specific rules for dl unit
  * Replace dl references by DLUNIT variable
This commit is contained in:
Pierre Muller 2023-09-20 16:04:28 +02:00
parent 3db44e8d8e
commit 6c3888f568
7 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/aix/Makefile.fpc
View File

@ -16,7 +16,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) \
$(ERRORSUNIT) \ $(ERRORSUNIT) \
# ipc # ipc
dl $(DYNLIBSUNIT) \ $(DLUNIT) $(DYNLIBSUNIT) \
types sysconst \ types sysconst \
rtlconsts cthreads \ rtlconsts cthreads \
dos \ dos \
@ -61,6 +61,7 @@ UNITPREFIX=rtl
CPU_UNITS= CPU_UNITS=
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC) DYNLIBSINCDIR=$(UNIXINC)
DL_DEPS_OS=$(DLUNIT)aix.inc
SYSTEMUNIT=system SYSTEMUNIT=system
@ -201,9 +202,6 @@ gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT)
$(COMPILER) $(INC)/ctypes.pp $(COMPILER) $(INC)/ctypes.pp
dl$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/dl.pp
initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/initc.pp $(COMPILER) $(UNIXINC)/initc.pp

6
rtl/android/Makefile.fpc
View File

@ -11,7 +11,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
$(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \ $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) \ $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix $(LINUXUNIT) initc $(CMEMUNIT) \
$(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \ $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \
$(GETOPTSUNIT) $(ERRORSUNIT) dl $(DYNLIBSUNIT) \ $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) \
types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \ types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \
rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \ rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
@ -53,6 +53,7 @@ OSPROCINC=$(RTL)/linux/$(CPU_TARGET)
LINUXINC=$(RTL)/linux LINUXINC=$(RTL)/linux
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC) DYNLIBSINCDIR=$(UNIXINC)
DL_DEPS_OS=dlandroid.inc
UNITPREFIX=rtl UNITPREFIX=rtl
@ -154,9 +155,6 @@ baseunix$(PPUEXT) : $(UNIXINC)/baseunix.pp $(LINUXINC)/errno.inc $(LINUXINC)/pty
$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT) $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/baseunix.pp $(COMPILER) $(UNIXINC)/baseunix.pp
dl$(PPUEXT) : $(UNIXINC)/dl.pp $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) dlandroid.inc
$(COMPILER) $(UNIXINC)/dl.pp
initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/initc.pp $(COMPILER) $(UNIXINC)/initc.pp

2
rtl/dragonfly/Makefile.fpc
View File

@ -13,7 +13,7 @@ loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \ $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \ unix rtlconsts initc $(CMEMUNIT) \
dl termio \ $(DLUNIT) termio \
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
$(ERRORSUNIT) bsd \ $(ERRORSUNIT) bsd \

5
rtl/freebsd/Makefile.fpc
View File

@ -13,7 +13,7 @@ loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \ $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \ unix rtlconsts initc $(CMEMUNIT) \
dl termio \ $(DLUNIT) termio \
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
$(ERRORSUNIT) bsd freebsd \ $(ERRORSUNIT) bsd freebsd \
@ -209,9 +209,6 @@ sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) s
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
dl$(PPUEXT) : $(UNIXINC)/dl.pp ctypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $<
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<

5
rtl/netbsd/Makefile.fpc
View File

@ -13,7 +13,7 @@ loaders=prt0 cprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \ $(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \ unix rtlconsts initc $(CMEMUNIT) \
dl termio \ $(DLUNIT) termio \
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
$(ERRORSUNIT) bsd \ $(ERRORSUNIT) bsd \
@ -142,9 +142,6 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) sysctl$(PPUEXT) $(INC)/textr
unxsysc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) unxsysc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
dl$(PPUEXT) : $(UNIXINC)/dl.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
# #
# TP7 Compatible RTL Units # TP7 Compatible RTL Units
# #

5
rtl/openbsd/Makefile.fpc
View File

@ -17,7 +17,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASU
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(ERRORSUNIT) \ $(ERRORSUNIT) \
types sysctl sysconst \ types sysctl sysconst \
$(FPINTRESUNIT) $(DYNLIBSUNIT) cwstring $(CMEMUNIT) dl termio \ $(FPINTRESUNIT) $(DYNLIBSUNIT) cwstring $(CMEMUNIT) $(DLUNIT) termio \
cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \ cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
@ -200,9 +200,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEX
ctypes$(PPUEXT) : $(INC)/ctypes.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<
dl$(PPUEXT) : $(UNIXINC)/dl.pp ctypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $<
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $< $(COMPILER) $<

5
rtl/solaris/Makefile.fpc
View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $
sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \ sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \
$(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \
$(ERRORSUNIT) \ $(ERRORSUNIT) \
dl $(DYNLIBSUNIT) \ $(DLUNIT) $(DYNLIBSUNIT) \
types sysconst $(CHARACTERUNIT) \ types sysconst $(CHARACTERUNIT) \
rtlconsts cthreads \ rtlconsts cthreads \
dos $(FPWIDESTRINGUNIT) \ dos $(FPWIDESTRINGUNIT) \
@ -198,9 +198,6 @@ cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUE
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT)
$(COMPILER) $(INC)/ctypes.pp $(COMPILER) $(INC)/ctypes.pp
dl$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/dl.pp
initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
console$(PPUEXT) : baseunix$(PPUEXT) termio$(PPUEXT) console$(PPUEXT) : baseunix$(PPUEXT) termio$(PPUEXT)