mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-11 09:46:11 +02:00
Replace all objpas unit references by $(OBJPASUNIT) OS Makefile.fpc
This commit is contained in:
parent
bb20f8f318
commit
6b636fc22d
@ -66,7 +66,7 @@ SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
|
||||
# Dos unit, local source
|
||||
DOSDIR=.
|
||||
# Dos unit uses objfpc mode
|
||||
DOS_DEPS_OS=objpas$(PPUEXT)
|
||||
DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
|
||||
|
||||
ifeq ($(ARCH),aarch64)
|
||||
CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT)
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=prt0 prt1
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(PORTSUNIT) $(OS2DEFUNIT) $(DOSCALLSUNIT) $(DOSCALL2UNIT) $(KBDCALLSUNIT) \
|
||||
$(MOUCALLSUNIT) $(VIOCALLSUNIT) $(SO32DLLUNIT) \
|
||||
$(PMBITMAPUNIT) $(PMWINUNIT) $(PMGPIUNIT) $(PMSTDDLGUNIT) \
|
||||
|
@ -12,7 +12,7 @@ loaders=$(LOADERS)
|
||||
# not all targets include enough features to build all units so
|
||||
# the common units which are not compiled for all CPUs are stored in
|
||||
# CPU_SPECIFIC_COMMON_UNITS
|
||||
units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) objpas $(ISO7185UNIT) $(EXTPASUNIT) heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \
|
||||
units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \
|
||||
# $(MACPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT)
|
||||
$(STRINGSUNIT) \
|
||||
$(SORTBASEUNIT) \
|
||||
@ -68,7 +68,7 @@ CPU_SPECIFIC_COMMON_UNITS=
|
||||
# Dos unit, local source
|
||||
DOSDIR=.
|
||||
# Dos unit uses objfpc mode
|
||||
DOS_DEPS_OS=objpas$(PPUEXT)
|
||||
DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
|
||||
|
||||
ifeq ($(ARCH),arm)
|
||||
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=$(LOADERS)
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(SORTBASEUNIT) $(SYSUTILSUNIT) \
|
||||
$(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CTYPESUNIT) \
|
||||
$(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=$(LOADERS)
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(SORTBASEUNIT) $(SYSUTILSUNIT) \
|
||||
$(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CTYPESUNIT) \
|
||||
$(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \
|
||||
|
@ -142,7 +142,7 @@ dos$(PPUEXT) : $(UNIXINC)/dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(
|
||||
#
|
||||
|
||||
sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
|
||||
objpas$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT)
|
||||
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
|
||||
|
||||
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=nwpre prelude
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(DOSUNIT) $(SYSCONSTUNIT) \
|
||||
$(INITCUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) \
|
||||
$(CHARSETUNIT) $(CPALLUNIT) $(MMXUNIT) $(GETOPTSUNIT) \
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=prt0
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(PORTSUNIT) $(OS2DEFUNIT) $(DOSCALLSUNIT) $(DOSCALL2UNIT) $(KBDCALLSUNIT) \
|
||||
$(MOUCALLSUNIT) $(VIOCALLSUNIT) $(SO32DLLUNIT) \
|
||||
$(PMBITMAPUNIT) $(PMWINUNIT) $(PMGPIUNIT) $(PMSTDDLGUNIT) \
|
||||
|
@ -7,12 +7,12 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders= prt0
|
||||
units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) \
|
||||
$(CTYPESUNIT) \
|
||||
$(CHARSETUNIT) $(CPALLUNIT) \
|
||||
$(SYSCONSTUNIT) \
|
||||
systraps pilot
|
||||
#units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
#units=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
# $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \
|
||||
# windows messages $(DYNLIBSUNIT) \
|
||||
# dos objects \
|
||||
@ -132,7 +132,7 @@ pilot$(PPUEXT) : pilot.pp $(SYSTEMUNIT)$(PPUEXT) systraps$(PPUEXT)
|
||||
# Other system-independent RTL Units
|
||||
#
|
||||
|
||||
fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
|
||||
fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/fmtbcd.pp
|
||||
|
||||
#####################################################################
|
||||
|
@ -57,7 +57,7 @@ CPU_DEPS_CPU=$(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||
else
|
||||
CPU_DEPS_CPU=$(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||
endif
|
||||
DOS_DEPS_OS=objpas$(PPUEXT)
|
||||
DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(SORTBASEUNIT) $(SYSUTILSUNIT) $(DOSUNIT) \
|
||||
$(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CTYPESUNIT) \
|
||||
$(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \
|
||||
|
@ -6,7 +6,7 @@
|
||||
main=rtl
|
||||
|
||||
[target]
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(FPINTRESUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(FPINTRESUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(CPU_UNITS) $(HEAPTRCUNIT) $(LINEINFOUNIT) \
|
||||
$(WINDOWSUNIT) $(MESSAGESUNIT) $(DYNLIBSUNIT) \
|
||||
$(DOSUNIT) \
|
||||
|
Loading…
Reference in New Issue
Block a user