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

* Adapt initc unit to DOTTED.

Browse Source 
* Remove OS specific initc rules.
  * Set default directory for initc main source to
    UNIXINC variable value if is is set.
  * Replace initc references by INITCUNIT variable.
  * Add dpmiexcp dependency for initc on go32v2 system
    by setting INITC_DEPS_OS.
  * Add nwsys.inc dependency for initc on netware system.
This commit is contained in:
Pierre Muller 2023-09-20 22:28:32 +02:00
parent d9c1efe7f0
commit bdfd7a66eb
17 changed files with 26 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtl/aix/Makefile.fpc
View File

@ -10,7 +10,7 @@ loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
$(HEAPTRCUNIT) \
baseunix unixutil \
$(TERMIOUNIT) unix initc $(CMEMUNIT) \
$(TERMIOUNIT) unix $(INITCUNIT) $(CMEMUNIT) \
$(LNFOGDBUNIT) \
sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) \
@ -200,6 +200,3 @@ gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT)
$(COMPILER) $(INC)/ctypes.pp
initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/initc.pp

5
rtl/android/Makefile.fpc
View File

@ -9,7 +9,7 @@ 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) $(TERMIOUNIT) unix $(LINUXUNIT) initc $(CMEMUNIT) \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) unix $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) \
$(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \
$(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) \
types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \
@ -156,9 +156,6 @@ baseunix$(PPUEXT) : $(UNIXINC)/baseunix.pp $(LINUXINC)/errno.inc $(LINUXINC)/pty
$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/baseunix.pp
initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/initc.pp
#
# TP7 Compatible RTL Units
#

6
rtl/dragonfly/Makefile.fpc
View File

@ -12,7 +12,7 @@ fpcpackage=y
loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \
unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \
$(DLUNIT) $(TERMIOUNIT) \
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
@ -139,9 +139,7 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/fi
unxconst.inc $(UNIXINC)/timezone.inc \
unxfunc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
bsd$(PPUEXT) : $(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
#
# TP7 Compatible RTL Units

7
rtl/freebsd/Makefile.fpc
View File

@ -12,7 +12,7 @@ fpcpackage=y
loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \
unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \
$(DLUNIT) $(TERMIOUNIT) \
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
@ -215,9 +215,6 @@ ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $<
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
bsd$(PPUEXT) : $(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<

8
rtl/go32v2/Makefile.fpc
View File

@ -6,7 +6,7 @@ main=rtl
[target]
loaders=prt0 exceptn fpu
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
go32 dpmiexcp initc $(PORTSUNIT) profile dxetype dxeload emu387 \
go32 dpmiexcp $(INITCUNIT) $(PORTSUNIT) profile dxetype dxeload emu387 \
dos $(CMEMUNIT) $(SORTBASEUNIT) \
sysutils classes $(MATHUNIT) typinfo \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) \
@ -33,6 +33,8 @@ COMMON=$(RTL)/common
PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl
SYSTEMUNIT=system
INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT)
# Use new feature from 1.0.5 version
# that generates release PPU files
# which will not be recompiled
@ -86,10 +88,6 @@ dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) system$(PPUEXT)
$(COMPILER) -Sg dpmiexcp.pp
$(EXECPPAS)
initc$(PPUEXT) : initc.pp system$(PPUEXT)
$(COMPILER) initc.pp
$(EXECPPAS)
profile$(PPUEXT) : profile.pp dpmiexcp$(PPUEXT) go32$(PPUEXT)
$(COMPILER) profile.pp
$(EXECPPAS)

4
rtl/inc/Makefile.rtl
View File

@ -567,8 +567,12 @@ DYNLIBSINCDIR=$(OSDIR)
endif
ifndef INITCDIR
ifdef UNIXINC
INITCDIR=$(UNIXINC)
else
INITCDIR=$(OSDIR)
endif
endif
ifndef DOSDIR
DOSDIR=$(OSDIR)

2
rtl/msxdos/Makefile.fpc
View File

@ -14,7 +14,7 @@ units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(
# $(CHARSETUNIT) $(CPALLUNIT) ctypes \
# $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(UNICODEDATAUNIT)
# $(CMEMUNIT)
# initc profile dxetype dxeload emu387 \
# $(INITCUNIT) profile dxetype dxeload emu387 \
# cpu $(MMXUNIT) \
# vesamode \
# rsts=$(MATHUNIT) typinfo classes dateutil sysconst

2
rtl/nativent/Makefile.fpc
View File

@ -12,7 +12,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNI
implicitunits=ndk ndkutils ddk \
ctypes $(STRINGSUNIT) \
# $(HEAPTRCUNIT)
# initc $(CMEMUNIT) $(DYNLIBSUNIT) signals \
# $(INITCUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) signals \
dos \
rtlconsts sysconst sysutils $(MATHUNIT) types \
typinfo $(FGLUNIT) classes \

7
rtl/netbsd/Makefile.fpc
View File

@ -12,7 +12,7 @@ fpcpackage=y
loaders=prt0 cprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \
unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \
$(DLUNIT) $(TERMIOUNIT) \
sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
@ -214,10 +214,7 @@ variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varut
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $<
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
bsd$(PPUEXT) : $(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)

4
rtl/netware/Makefile.fpc
View File

@ -47,6 +47,7 @@ RTLCONSTSUNIT=rtlconst
endif
DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
INITC_DEPS_OS=$(OSDIR)/nwsys.inc
# Use new feature from 1.0.5 version
# that generates release PPU files
@ -121,9 +122,6 @@ nwpre$(PPUEXT) : nwpre.pp $(SYSTEMUNIT)$(PPUEXT)
netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT)
initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
#
# Other system-dependent RTL Units
#

5
rtl/netwlibc/Makefile.fpc
View File

@ -10,7 +10,7 @@ loaders=nwplibc nwl_main nwl_dlle
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
$(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) \
nwsnut libc dos sysconst \
initc sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes \
$(INITCUNIT) sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes \
cpu $(MMXUNIT) $(GETOPTSUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) \
rtlconsts $(MATHUNIT) \
@ -131,9 +131,6 @@ netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT)
nwsnut$(PPUEXT) : nwsnut.pp ../netware/nwsnut.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
#
# TP7 Compatible RTL Units
#

7
rtl/openbsd/Makefile.fpc
View File

@ -10,7 +10,7 @@ fpcpackage=y
[target]
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix \
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix \
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \
sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) \
@ -215,10 +215,7 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
endif
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
initc$(PPUEXT) : $(UNIXINC)/initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
bsd$(PPUEXT) : $(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
#

2
rtl/palmos/Makefile.fpc
View File

@ -22,7 +22,7 @@ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \
# varutils variants \
# matrix ucomplex \
# $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) winsock sockets
# initc $(CMEMUNIT) signals \
# $(INITCUNIT) $(CMEMUNIT) signals \
# crt graph \
# wincrt winmouse winevent printer \
# video mouse keyboard \

4
rtl/solaris/Makefile.fpc
View File

@ -10,7 +10,7 @@ loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
$(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
baseunix unixutil $(UNIXCPUNIT) \
$(TERMIOUNIT) unix initc $(CMEMUNIT) \
$(TERMIOUNIT) unix $(INITCUNIT) $(CMEMUNIT) \
sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \
$(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \
$(ERRORSUNIT) \
@ -196,5 +196,3 @@ cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUE
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) unixtype$(PPUEXT)
$(COMPILER) $(INC)/ctypes.pp
initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)

4
rtl/watcom/Makefile.fpc
View File

@ -20,7 +20,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(IS
rsts=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT)
implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
# dpmiexcp initc $(PORTSUNIT) profile dxeload emu387 \
# dpmiexcp $(INITCUNIT) $(PORTSUNIT) profile dxeload emu387 \
# printer graph classes \
# msmouse video mouse keyboard vesamode
@ -110,8 +110,6 @@ watcom$(PPUEXT) : watcom.pp system$(PPUEXT)
dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) system$(PPUEXT)
$(COMPILER) -Sg dpmiexcp.pp
initc$(PPUEXT) : initc.pp system$(PPUEXT)
profile$(PPUEXT) : profile.pp dpmiexcp$(PPUEXT) watcom$(PPUEXT)
dxeload$(PPUEXT) : dxeload.pp system$(PPUEXT)

2
rtl/win32/Makefile.fpc
View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
implicitunits=sysinitpas sysinitcyg sysinitgprof initc $(EXTPASUNIT) $(HEAPTRCUNIT) \
implicitunits=sysinitpas sysinitcyg sysinitgprof $(INITCUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) \
$(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) \
$(DOSUNIT) $(MESSAGESUNIT) \
$(CMEMUNIT) $(DYNLIBSUNIT) \

2
rtl/wince/Makefile.fpc
View File

@ -17,7 +17,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(FPINTRESUNIT) ctypes objpas $(MACPASUNIT) $(
$(CMEMUNIT) $(SHARMEMUNIT) \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
# initc signals \
# $(INITCUNIT) signals \
# crt graph \
# wincrt winmouse winevent printer \
# video mouse keyboard \