mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-18 05:49:23 +02:00
Handle dynlibs unit to support DOTTED version
* Replace dynlibs by DYNLIBSUNIT variable use everywhere * Remove OS specific dynlibs unit rules * Set DYNLIBSINCDIR varaible where required * Set DYNLIBS_DEPS_OS where needed
This commit is contained in:
parent
21fba0badd
commit
3db44e8d8e
@ -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 dynlibs \
|
dl $(DYNLIBSUNIT) \
|
||||||
types sysconst \
|
types sysconst \
|
||||||
rtlconsts cthreads \
|
rtlconsts cthreads \
|
||||||
dos \
|
dos \
|
||||||
@ -59,6 +59,8 @@ OSPROCINC=$(RTL)/aix/$(CPU_TARGET)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
CPU_UNITS=
|
CPU_UNITS=
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
|
|
||||||
@ -185,16 +187,13 @@ endif
|
|||||||
# Other system-dependent RTL Units
|
# Other system-dependent RTL Units
|
||||||
#
|
#
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
|
||||||
$(COMPILER) $(INC)/dynlibs.pas
|
|
||||||
|
|
||||||
termio$(PPUEXT) : termio.pp unixtype$(PPUEXT) baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
termio$(PPUEXT) : termio.pp unixtype$(PPUEXT) baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) termio.pp
|
$(COMPILER) termio.pp
|
||||||
|
|
||||||
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp sysutils$(PPUEXT) baseunix$(PPUEXT) unixtype$(PPUEXT) unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp sysutils$(PPUEXT) baseunix$(PPUEXT) unixtype$(PPUEXT) unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $(UNIXINC)/cthreads.pp
|
$(COMPILER) $(UNIXINC)/cthreads.pp
|
||||||
|
|
||||||
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
|
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $(UNIXINC)/cwstring.pp
|
$(COMPILER) $(UNIXINC)/cwstring.pp
|
||||||
|
|
||||||
gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
|
gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
|
||||||
|
@ -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 dynlibs \
|
$(GETOPTSUNIT) $(ERRORSUNIT) dl $(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)
|
||||||
@ -51,6 +51,8 @@ PROCINC=$(RTL)/$(ARCH)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
OSPROCINC=$(RTL)/linux/$(CPU_TARGET)
|
OSPROCINC=$(RTL)/linux/$(CPU_TARGET)
|
||||||
LINUXINC=$(RTL)/linux
|
LINUXINC=$(RTL)/linux
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
|
|
||||||
@ -155,9 +157,6 @@ baseunix$(PPUEXT) : $(UNIXINC)/baseunix.pp $(LINUXINC)/errno.inc $(LINUXINC)/pty
|
|||||||
dl$(PPUEXT) : $(UNIXINC)/dl.pp $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) dlandroid.inc
|
dl$(PPUEXT) : $(UNIXINC)/dl.pp $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) dlandroid.inc
|
||||||
$(COMPILER) $(UNIXINC)/dl.pp
|
$(COMPILER) $(UNIXINC)/dl.pp
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
|
||||||
$(COMPILER) $(INC)/dynlibs.pas
|
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
@ -207,7 +206,7 @@ endif
|
|||||||
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
|
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $(UNIXINC)/cthreads.pp
|
$(COMPILER) $(UNIXINC)/cthreads.pp
|
||||||
|
|
||||||
cwstring$(PPUEXT) : cwstring.pp $(SYSTEMUNIT)$(PPUEXT) dynlibs$(PPUEXT)
|
cwstring$(PPUEXT) : cwstring.pp $(SYSTEMUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
$(COMPILER) cwstring.pp
|
$(COMPILER) cwstring.pp
|
||||||
|
|
||||||
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
|
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
@ -44,7 +44,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
|
|||||||
dos crt \
|
dos crt \
|
||||||
sysutils typinfo $(MATHUNIT) \
|
sysutils typinfo $(MATHUNIT) \
|
||||||
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
||||||
$(ERRORSUNIT) dynlibs
|
$(ERRORSUNIT) $(DYNLIBSUNIT)
|
||||||
|
|
||||||
|
|
||||||
[prerules]
|
[prerules]
|
||||||
@ -58,6 +58,8 @@ BASEUNIXDIR=.
|
|||||||
ifndef FPC_DOTTEDUNITS
|
ifndef FPC_DOTTEDUNITS
|
||||||
RTLCONSTSUNIT=rtlconst
|
RTLCONSTSUNIT=rtlconst
|
||||||
endif
|
endif
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
# Use new feature from 1.0.5 version
|
# Use new feature from 1.0.5 version
|
||||||
# that generates release PPU files
|
# that generates release PPU files
|
||||||
# which will not be recompiled
|
# which will not be recompiled
|
||||||
|
@ -69,6 +69,7 @@ INITCDIR=$(UNIXINC)
|
|||||||
SYSUTILS_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
|
SYSUTILS_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
|
||||||
BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT)
|
BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT)
|
||||||
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
CTYPES_DEPS_OS=$(UNIXTYPEUNIT)$(PPUEXT)
|
CTYPES_DEPS_OS=$(UNIXTYPEUNIT)$(PPUEXT)
|
||||||
EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
|
EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
|
||||||
FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
|
FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
|
||||||
|
@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
|
|||||||
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
|
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
|
||||||
unix rtlconsts initc $(CMEMUNIT) \
|
unix rtlconsts initc $(CMEMUNIT) \
|
||||||
dl termio \
|
dl termio \
|
||||||
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \
|
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 \
|
||||||
console \
|
console \
|
||||||
@ -47,7 +47,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
|
|||||||
dos \
|
dos \
|
||||||
sysutils typinfo $(MATHUNIT) \
|
sysutils typinfo $(MATHUNIT) \
|
||||||
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
||||||
$(ERRORSUNIT) dynlibs
|
$(ERRORSUNIT) $(DYNLIBSUNIT)
|
||||||
|
|
||||||
[prerules]
|
[prerules]
|
||||||
RTL=..
|
RTL=..
|
||||||
@ -60,6 +60,8 @@ BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
CPU_UNITS=
|
CPU_UNITS=
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
loaders+=gprt0
|
loaders+=gprt0
|
||||||
@ -191,9 +193,7 @@ sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) s
|
|||||||
|
|
||||||
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
|
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
|
||||||
|
|
||||||
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
|
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
|
||||||
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
|
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
|
|||||||
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
|
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
|
||||||
unix rtlconsts initc $(CMEMUNIT) \
|
unix rtlconsts initc $(CMEMUNIT) \
|
||||||
dl termio \
|
dl termio \
|
||||||
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \
|
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 \
|
||||||
console \
|
console \
|
||||||
@ -47,7 +47,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
|
|||||||
dos \
|
dos \
|
||||||
sysutils typinfo $(MATHUNIT) \
|
sysutils typinfo $(MATHUNIT) \
|
||||||
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
||||||
$(ERRORSUNIT) dynlibs
|
$(ERRORSUNIT) $(DYNLIBSUNIT)
|
||||||
|
|
||||||
[prerules]
|
[prerules]
|
||||||
RTL=..
|
RTL=..
|
||||||
@ -61,6 +61,8 @@ BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
CPU_UNITS=
|
CPU_UNITS=
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
loaders+=gprt0
|
loaders+=gprt0
|
||||||
@ -207,16 +209,13 @@ 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) $<
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
|
||||||
$(COMPILER) $<
|
|
||||||
|
|
||||||
dl$(PPUEXT) : $(UNIXINC)/dl.pp ctypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
dl$(PPUEXT) : $(UNIXINC)/dl.pp ctypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
|
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
|
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
@ -44,7 +44,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
|
|||||||
dos \
|
dos \
|
||||||
sysutils typinfo $(MATHUNIT) \
|
sysutils typinfo $(MATHUNIT) \
|
||||||
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
$(CPU_UNITS) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
|
||||||
$(ERRORSUNIT) dynlibs
|
$(ERRORSUNIT) $(DYNLIBSUNIT)
|
||||||
|
|
||||||
|
|
||||||
[prerules]
|
[prerules]
|
||||||
|
@ -40,6 +40,8 @@ PROCINC=../$(CPU_TARGET)
|
|||||||
UNIXINC=../unix
|
UNIXINC=../unix
|
||||||
PPUEXT=pput
|
PPUEXT=pput
|
||||||
ASMEXT=.s
|
ASMEXT=.s
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
|
@ -12,7 +12,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNI
|
|||||||
implicitunits=ndk ndkutils ddk \
|
implicitunits=ndk ndkutils ddk \
|
||||||
ctypes $(STRINGSUNIT) \
|
ctypes $(STRINGSUNIT) \
|
||||||
# $(HEAPTRCUNIT)
|
# $(HEAPTRCUNIT)
|
||||||
# initc $(CMEMUNIT) dynlibs signals \
|
# initc $(CMEMUNIT) $(DYNLIBSUNIT) signals \
|
||||||
dos \
|
dos \
|
||||||
rtlconsts sysconst sysutils $(MATHUNIT) types \
|
rtlconsts sysconst sysutils $(MATHUNIT) types \
|
||||||
typinfo $(FGLUNIT) classes \
|
typinfo $(FGLUNIT) classes \
|
||||||
@ -48,6 +48,7 @@ COMMON=$(RTL)/common
|
|||||||
PROCINC=$(RTL)/$(CPU_TARGET)
|
PROCINC=$(RTL)/$(CPU_TARGET)
|
||||||
DDKINC=ddk
|
DDKINC=ddk
|
||||||
NDKINC=ndk
|
NDKINC=ndk
|
||||||
|
# Not used DYNLIBSINCDIR=$(WINDIR)
|
||||||
|
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
|
@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
|
|||||||
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
|
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
|
||||||
unix rtlconsts initc $(CMEMUNIT) \
|
unix rtlconsts initc $(CMEMUNIT) \
|
||||||
dl termio \
|
dl termio \
|
||||||
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \
|
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 \
|
||||||
sysconst cthreads dos cwstring \
|
sysconst cthreads dos cwstring \
|
||||||
@ -59,6 +59,8 @@ BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
TARGETPROCINC=$(RTL)/netbsd/$(CPU_TARGET)
|
TARGETPROCINC=$(RTL)/netbsd/$(CPU_TARGET)
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
LINUXUNIT=
|
LINUXUNIT=
|
||||||
@ -143,9 +145,6 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) sysctl$(PPUEXT) $(INC)/textr
|
|||||||
dl$(PPUEXT) : $(UNIXINC)/dl.pp $(SYSTEMUNIT)$(PPUEXT)
|
dl$(PPUEXT) : $(UNIXINC)/dl.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
|
||||||
$(COMPILER) $<
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# TP7 Compatible RTL Units
|
# TP7 Compatible RTL Units
|
||||||
#
|
#
|
||||||
@ -215,7 +214,7 @@ cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
|
|||||||
variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(MATHUNIT)$(PPUEXT)
|
variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(MATHUNIT)$(PPUEXT)
|
||||||
$(COMPILER) -Fi$(INC) $(INC)/variants.pp
|
$(COMPILER) -Fi$(INC) $(INC)/variants.pp
|
||||||
|
|
||||||
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
|
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
@ -121,8 +121,6 @@ nwpre$(PPUEXT) : nwpre.pp $(SYSTEMUNIT)$(PPUEXT)
|
|||||||
|
|
||||||
netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT)
|
netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
|
||||||
#dynlibs$(PPUEXT) : $(INC)/dynlibs.pas windows$(PPUEXT)
|
|
||||||
|
|
||||||
initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(E
|
|||||||
cpu $(MMXUNIT) $(GETOPTSUNIT) \
|
cpu $(MMXUNIT) $(GETOPTSUNIT) \
|
||||||
$(CHARSETUNIT) $(CPALLUNIT) \
|
$(CHARSETUNIT) $(CPALLUNIT) \
|
||||||
rtlconsts $(MATHUNIT) \
|
rtlconsts $(MATHUNIT) \
|
||||||
dynlibs $(CMEMUNIT) ctypes \
|
$(DYNLIBSUNIT) $(CMEMUNIT) ctypes \
|
||||||
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
|
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
|
||||||
|
|
||||||
rsts=$(MATHUNIT) typinfo classes sysconst rtlconsts system
|
rsts=$(MATHUNIT) typinfo classes sysconst rtlconsts system
|
||||||
@ -131,8 +131,6 @@ netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT)
|
|||||||
|
|
||||||
nwsnut$(PPUEXT) : nwsnut.pp ../netware/nwsnut.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
nwsnut$(PPUEXT) : nwsnut.pp ../netware/nwsnut.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
|
||||||
|
|
||||||
initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
|
|
||||||
|
|
||||||
|
@ -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) dynlibs cwstring $(CMEMUNIT) dl termio \
|
$(FPINTRESUNIT) $(DYNLIBSUNIT) cwstring $(CMEMUNIT) dl termio \
|
||||||
cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \
|
cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \
|
||||||
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
|
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
|
||||||
|
|
||||||
@ -58,6 +58,8 @@ BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
TARGETPROCINC=$(RTL)/openbsd/$(CPU_TARGET)
|
TARGETPROCINC=$(RTL)/openbsd/$(CPU_TARGET)
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
LINUXUNIT=
|
LINUXUNIT=
|
||||||
@ -201,10 +203,7 @@ ctypes$(PPUEXT) : $(INC)/ctypes.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
|||||||
dl$(PPUEXT) : $(UNIXINC)/dl.pp ctypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
dl$(PPUEXT) : $(UNIXINC)/dl.pp ctypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $<
|
|
||||||
|
|
||||||
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
|
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \
|
|||||||
systraps pilot
|
systraps pilot
|
||||||
#units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
#units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||||
# $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \
|
# $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \
|
||||||
# windows messages dynlibs \
|
# windows messages $(DYNLIBSUNIT) \
|
||||||
# dos objects \
|
# dos objects \
|
||||||
# rtlconsts sysconst sysutils \
|
# rtlconsts sysconst sysutils \
|
||||||
# typinfo types $(FGLUNIT) classes fmtbcd \
|
# typinfo types $(FGLUNIT) classes fmtbcd \
|
||||||
|
@ -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 dynlibs \
|
dl $(DYNLIBSUNIT) \
|
||||||
types sysconst $(CHARACTERUNIT) \
|
types sysconst $(CHARACTERUNIT) \
|
||||||
rtlconsts cthreads \
|
rtlconsts cthreads \
|
||||||
dos $(FPWIDESTRINGUNIT) \
|
dos $(FPWIDESTRINGUNIT) \
|
||||||
@ -58,6 +58,8 @@ OSPROCINC=$(RTL)/solaris/$(CPU_TARGET)
|
|||||||
UNIXINC=$(RTL)/unix
|
UNIXINC=$(RTL)/unix
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
CPU_UNITS=
|
CPU_UNITS=
|
||||||
|
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
||||||
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
|
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
|
|
||||||
@ -184,17 +186,13 @@ endif
|
|||||||
# Other system-dependent RTL Units
|
# Other system-dependent RTL Units
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
|
||||||
$(COMPILER) $(INC)/dynlibs.pas
|
|
||||||
|
|
||||||
termio$(PPUEXT) : termio.pp unixtype$(PPUEXT) baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
termio$(PPUEXT) : termio.pp unixtype$(PPUEXT) baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) termio.pp
|
$(COMPILER) termio.pp
|
||||||
|
|
||||||
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp sysutils$(PPUEXT) baseunix$(PPUEXT) unixtype$(PPUEXT) unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp sysutils$(PPUEXT) baseunix$(PPUEXT) unixtype$(PPUEXT) unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $(UNIXINC)/cthreads.pp
|
$(COMPILER) $(UNIXINC)/cthreads.pp
|
||||||
|
|
||||||
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
|
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
|
||||||
$(COMPILER) $(UNIXINC)/cwstring.pp
|
$(COMPILER) $(UNIXINC)/cwstring.pp
|
||||||
|
|
||||||
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT)
|
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT)
|
||||||
|
@ -6,7 +6,7 @@ main=rtl
|
|||||||
[target]
|
[target]
|
||||||
loaders=prt0s prt0m prt0c prt0l prt0h
|
loaders=prt0s prt0m prt0c prt0l prt0h
|
||||||
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \
|
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \
|
||||||
wintypes winprocs win31 $(PORTSUNIT) dynlibs $(SORTBASEUNIT) \
|
wintypes winprocs win31 $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) \
|
||||||
sysconst rtlconsts sysutils $(MATHUNIT) types typinfo $(FGLUNIT) \
|
sysconst rtlconsts sysutils $(MATHUNIT) types typinfo $(FGLUNIT) \
|
||||||
classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) \
|
classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) \
|
||||||
$(UNICODEDATAUNIT) $(CHARACTERUNIT) ctypes
|
$(UNICODEDATAUNIT) $(CHARACTERUNIT) ctypes
|
||||||
@ -98,13 +98,6 @@ win31$(PPUEXT) : win31.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) wintypes$(PPUEX
|
|||||||
$(COMPILER) win31.pp
|
$(COMPILER) win31.pp
|
||||||
$(EXECPPAS)
|
$(EXECPPAS)
|
||||||
|
|
||||||
#
|
|
||||||
# system Dependent Units
|
|
||||||
#
|
|
||||||
|
|
||||||
dynlibs$(PPUEXT) : $(INC)/dynlibs.pas dynlibs.inc $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT)
|
|
||||||
$(COMPILER) $(INC)/dynlibs.pas
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# TP7 Compatible RTL Units
|
# TP7 Compatible RTL Units
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user