Replace remaining SYSINITUNITS variable by SYSINIT_UNITS

This commit is contained in:
Pierre Muller 2023-10-30 09:34:07 +00:00
parent 44cf5d776f
commit ee62aa0c13
4 changed files with 8 additions and 8 deletions

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(RESUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) $(EXEUNITS) athreads $(DOSUNIT) $(SYSUTILSUNIT) $(SYSCONSTUNIT) \
implicitunits=$(SYSINIT_UNITS) $(EXEUNITS) athreads $(DOSUNIT) $(SYSUTILSUNIT) $(SYSCONSTUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(FPWIDESTRINGUNIT) \
$(CP_UNITS) $(UNICODEDATAUNIT) \
@ -46,14 +46,14 @@ OBJPASDIR=$(RTL)/objpas
ifeq ($(ARCH),m68k)
override LOADERS=
SYSINITUNITS=si_prc
SYSINIT_UNITS=si_prc
RESUNIT=fpextres
endif
ifeq ($(ARCH),powerpc)
override LOADERS=
RESUNIT=$(FPINTRESUNIT)
SYSINITUNITS=si_prc
SYSINIT_UNITS=si_prc
EXEUNITS=$(LINEINFOUNIT) $(EXEINFOUNIT)
endif

View File

@ -8,7 +8,7 @@ main=rtl
[target]
loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) \
implicitunits=$(SYSINIT_UNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(TYPESUNIT) \
$(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \
$(CHARSETUNIT) $(GETOPTSUNIT) \
@ -42,7 +42,7 @@ PROCINC=$(RTL)/$(CPU_TARGET)
AMIINC=$(RTL)/amicommon
UNITPREFIX=rtl
LOADERS=prt0
SYSINITUNITS=si_prc
SYSINIT_UNITS=si_prc
# Paths
OBJPASDIR=$(RTL)/objpas

View File

@ -53,7 +53,7 @@ INC=$(RTL)/inc
PROCINC=$(RTL)/$(CPU_TARGET)
UNIXINC=$(RTL)/unix
HAIKUINC=$(RTL)/haiku
SYSINITUNITS=si_c si_dllc
SYSINIT_UNITS=si_c si_dllc
UNITPREFIX=rtl
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)

View File

@ -8,7 +8,7 @@ main=rtl
[target]
#loaders=prt0
units=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) $(SYSUTILSUNIT) \
implicitunits=$(SYSINIT_UNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) $(SYSUTILSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \
$(FPWIDESTRINGUNIT) $(EXEINFOUNIT) $(LINEINFOUNIT) \
@ -41,7 +41,7 @@ COMMON=$(RTL)/common
PROCINC=$(RTL)/$(CPU_TARGET)
AMIINC=$(RTL)/amicommon
UNITPREFIX=rtl
SYSINITUNITS=si_prc
SYSINIT_UNITS=si_prc
# Paths
OBJPASDIR=$(RTL)/objpas