From 63d64cce41a7215f993fe76e2c3bc72b73f1d4a8 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Wed, 13 Sep 2023 20:00:20 +0000 Subject: [PATCH] Use FGLUNIT and CPALLUNIT variables --- rtl/aix/Makefile.fpc | 6 +++--- rtl/android/Makefile.fpc | 8 ++++---- rtl/dragonfly/Makefile.fpc | 6 +++--- rtl/embedded/Makefile.fpc | 2 +- rtl/freebsd/Makefile.fpc | 6 +++--- rtl/freertos/Makefile.fpc | 14 +++++++------- rtl/go32v2/Makefile.fpc | 6 +++--- rtl/morphos/Makefile.fpc | 2 +- rtl/msxdos/Makefile.fpc | 8 ++++---- rtl/nativent/Makefile.fpc | 4 ++-- rtl/netbsd/Makefile.fpc | 6 +++--- rtl/netwlibc/Makefile.fpc | 6 +++--- rtl/openbsd/Makefile.fpc | 6 +++--- rtl/palmos/Makefile.fpc | 6 +++--- rtl/sinclairql/Makefile.fpc | 2 +- rtl/solaris/Makefile.fpc | 6 +++--- rtl/win16/Makefile.fpc | 6 +++--- rtl/win64/Makefile.fpc | 2 +- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/rtl/aix/Makefile.fpc b/rtl/aix/Makefile.fpc index 8e64450752..2a2aeab645 100644 --- a/rtl/aix/Makefile.fpc +++ b/rtl/aix/Makefile.fpc @@ -12,8 +12,8 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $ baseunix unixutil \ termio unix initc $(CMEMUNIT) \ $(LNFOGDBUNIT) \ - sysutils typinfo math $(SORTBASEUNIT) fgl classes \ - $(CHARSETUNIT) cpall character unixcp getopts \ + sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes \ + $(CHARSETUNIT) $(CPALLUNIT) character unixcp getopts \ errors \ # ipc dl dynlibs \ @@ -161,7 +161,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) types$(PPUEXT) \ - $(SYSTEMUNIT)$(PPUEXT) fgl$(PPUEXT) sortbase$(PPUEXT) + $(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/android/Makefile.fpc b/rtl/android/Makefile.fpc index 6ec49c9256..3f7722e451 100644 --- a/rtl/android/Makefile.fpc +++ b/rtl/android/Makefile.fpc @@ -10,9 +10,9 @@ loaders=$(LOADERS) units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \ $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \ $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix linux initc $(CMEMUNIT) \ - linuxvcs sysutils typinfo math $(CHARSETUNIT) cpall character \ + linuxvcs sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) character \ getopts errors dl dynlibs \ - types sysconst cthreads $(SORTBASEUNIT) classes fgl \ + types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \ rtlconsts dos cwstring fpcylix unixcp fpwidestring \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) implicitunits=$(EXEINFOUNIT) \ @@ -47,7 +47,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos \ sysutils typinfo math \ $(CPU_UNITS) getopts \ errors sockets \ - $(SORTBASEUNIT) classes fgl sysconst rtlconsts \ + $(SORTBASEUNIT) classes $(FGLUNIT) sysconst rtlconsts \ [prerules] RTL=.. @@ -187,7 +187,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) fgl$(PPUEXT) sortbase$(PPUEXT) + sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc index 1c46ce916d..03f8c25fff 100644 --- a/rtl/dragonfly/Makefile.fpc +++ b/rtl/dragonfly/Makefile.fpc @@ -14,8 +14,8 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $( $(STRINGSUNIT) syscall sysctl baseunix unixutil character \ unix rtlconsts initc $(CMEMUNIT) \ dl termio \ - sysutils math typinfo types $(SORTBASEUNIT) classes fgl dynlibs \ - $(CPU_UNITS) $(CHARSETUNIT) cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ + sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \ + $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ errors bsd \ console \ sysconst cthreads dos cwstring \ @@ -170,7 +170,7 @@ rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(COMPILER) $(OBJPASDIR)/rtlconsts.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) fgl$(PPUEXT) sortbase$(PPUEXT) + sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index 2480df1f9f..8af9b703a1 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -223,7 +223,7 @@ endif endif ifeq ($(ARCH),riscv32) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32ec) override FPCOPT+=-Cprv32ec CPU_UNITS=CH32VxBootstrap diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index 7cd9d69cbd..7ae25c19ed 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -14,8 +14,8 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $( $(STRINGSUNIT) syscall sysctl baseunix unixutil character \ unix rtlconsts initc $(CMEMUNIT) \ dl termio \ - sysutils math typinfo types $(SORTBASEUNIT) classes fgl dynlibs \ - $(CPU_UNITS) $(CHARSETUNIT) cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ + sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \ + $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ errors bsd freebsd \ console \ sysconst cthreads dos cwstring \ @@ -180,7 +180,7 @@ rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(COMPILER) $(OBJPASDIR)/rtlconsts.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) fgl$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc index e99bc947a0..99fd990067 100644 --- a/rtl/freertos/Makefile.fpc +++ b/rtl/freertos/Makefile.fpc @@ -77,7 +77,7 @@ DOSDIR=. DOS_DEPS_OS=objpas$(PPUEXT) ifeq ($(ARCH),arm) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) ifeq ($(SUBARCH),armv7m) CPU_UNITS=stm32f103xe cortexm3 cortexm4 # thumb2_bare CPU_UNITS_DEFINED=1 @@ -179,7 +179,7 @@ endif endif ifeq ($(ARCH),i386) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) CPU_UNITS=multiboot CPU_UNITS_DEFINED=1 ifeq ($(CPU_UNITS_DEFINED),) @@ -188,7 +188,7 @@ endif endif ifeq ($(ARCH),x86_64) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) # CPU_UNITS=multiboot endif @@ -198,7 +198,7 @@ CPU_SPECIFIC_COMMON_UNITS=sysutils math endif ifeq ($(ARCH),mipsel) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) ifeq ($(SUBARCH),pic32mx) CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh CPU_UNITS_DEFINED=1 @@ -209,7 +209,7 @@ endif endif ifeq ($(ARCH),riscv32) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32imc) override FPCOPT+=-Cprv32imc CPU_UNITS=esp32c3 esp32c3idf_50000 @@ -221,7 +221,7 @@ endif endif ifeq ($(ARCH),riscv64) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) CPU_UNITS= CPU_UNITS_DEFINED=1 ifeq ($(CPU_UNITS_DEFINED),) @@ -230,7 +230,7 @@ endif endif ifeq ($(ARCH),xtensa) -CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts getopts $(LINEINFOUNIT) ifeq ($(SUBARCH),lx6) CPU_UNITS=esp32 espidf_40100 espidf_40200 espidf_40400 CPU_UNITS_DEFINED=1 diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index a1e644d5a1..15e3558852 100644 --- a/rtl/go32v2/Makefile.fpc +++ b/rtl/go32v2/Makefile.fpc @@ -9,8 +9,8 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN go32 dpmiexcp initc ports profile dxetype dxeload emu387 \ dos $(CMEMUNIT) $(SORTBASEUNIT) \ sysutils classes math typinfo \ - cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes fgl \ - msmouse $(CHARSETUNIT) cpall \ + cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) \ + msmouse $(CHARSETUNIT) $(CPALLUNIT) \ character fpwidestring unicodedata \ types sysconst rtlconst \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) @@ -133,7 +133,7 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ $(EXECPPAS) classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) fgl$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp diff --git a/rtl/morphos/Makefile.fpc b/rtl/morphos/Makefile.fpc index d9bf615e2e..f8d7ee0f9d 100644 --- a/rtl/morphos/Makefile.fpc +++ b/rtl/morphos/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl [target] #loaders=prt0 -units=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl cpall +units=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT) implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) $(SYSUTILSUNIT) \ $(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \ $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \ diff --git a/rtl/msxdos/Makefile.fpc b/rtl/msxdos/Makefile.fpc index faacff24a1..ae430298ca 100644 --- a/rtl/msxdos/Makefile.fpc +++ b/rtl/msxdos/Makefile.fpc @@ -5,13 +5,13 @@ main=rtl [target] #loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu -units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) cpall \ +units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \ getopts $(EXEINFOUNIT) $(HEAPTRCUNIT) #$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) sysconst sysutils \ # math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \ -# getopts $(SORTBASEUNIT) fgl classes \ +# getopts $(SORTBASEUNIT) $(FGLUNIT) classes \ # msmouse ports \ -# $(CHARSETUNIT) cpall ctypes \ +# $(CHARSETUNIT) $(CPALLUNIT) ctypes \ # fpwidestring character unicodedata # $(CMEMUNIT) # initc profile dxetype dxeload emu387 \ @@ -106,7 +106,7 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) \ - types$(PPUEXT) fgl$(PPUEXT) sortbase$(PPUEXT) \ + types$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) \ $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(EXECPPAS) diff --git a/rtl/nativent/Makefile.fpc b/rtl/nativent/Makefile.fpc index cf098208f4..f9b9c0ecf1 100644 --- a/rtl/nativent/Makefile.fpc +++ b/rtl/nativent/Makefile.fpc @@ -8,14 +8,14 @@ main=rtl [target] loaders= #units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT) -units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) cpall buildrtl +units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl implicitunits=ndk ndkutils ddk \ ctypes $(STRINGSUNIT) \ # $(HEAPTRCUNIT) # initc $(CMEMUNIT) dynlibs signals \ dos \ rtlconsts sysconst sysutils math types \ - typinfo fgl classes \ + typinfo $(FGLUNIT) classes \ $(CPU_UNITS) $(CHARSETUNIT) getopts \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \ # sockets printer \ diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc index 1ca0878f05..dc25afb83d 100644 --- a/rtl/netbsd/Makefile.fpc +++ b/rtl/netbsd/Makefile.fpc @@ -14,8 +14,8 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $( $(STRINGSUNIT) syscall sysctl baseunix unixutil character \ unix rtlconsts initc $(CMEMUNIT) \ dl termio \ - sysutils math typinfo types $(SORTBASEUNIT) classes fgl dynlibs \ - $(CPU_UNITS) $(CHARSETUNIT) cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ + sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \ + $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ errors bsd \ sysconst cthreads dos cwstring \ $(FPINTRESUNIT) unixcp fpwidestring \ @@ -184,7 +184,7 @@ rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(COMPILER) $(OBJPASDIR)/rtlconsts.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) fgl$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/netwlibc/Makefile.fpc b/rtl/netwlibc/Makefile.fpc index 09af8e4c91..e80e328c45 100644 --- a/rtl/netwlibc/Makefile.fpc +++ b/rtl/netwlibc/Makefile.fpc @@ -10,9 +10,9 @@ 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) fgl classes \ + initc sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes \ cpu mmx getopts \ - $(CHARSETUNIT) cpall \ + $(CHARSETUNIT) $(CPALLUNIT) \ rtlconsts math \ dynlibs $(CMEMUNIT) ctypes \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) @@ -158,7 +158,7 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) \ sysconst$(PPUEXT) types$(PPUEXT) sortbase$(PPUEXT) \ - tthread.inc fgl$(PPUEXT) + tthread.inc $(FGLUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) diff --git a/rtl/openbsd/Makefile.fpc b/rtl/openbsd/Makefile.fpc index 5225213d4a..80882efad4 100644 --- a/rtl/openbsd/Makefile.fpc +++ b/rtl/openbsd/Makefile.fpc @@ -13,8 +13,8 @@ loaders=$(LOADERS) units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix \ $(LINUXUNIT) unixtype unixutil unix ctypes bsd \ $(CPU_UNITS) dos rtlconsts \ - sysutils $(SORTBASEUNIT) fgl classes typinfo math \ - $(CHARSETUNIT) cpall character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ + sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo math \ + $(CHARSETUNIT) $(CPALLUNIT) character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ errors \ types sysctl sysconst \ $(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio \ @@ -194,7 +194,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) fgl$(PPUEXT) sortbase$(PPUEXT) + sysutils$(PPUEXT) typinfo$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp diff --git a/rtl/palmos/Makefile.fpc b/rtl/palmos/Makefile.fpc index ee8bb13cc4..608e9da839 100644 --- a/rtl/palmos/Makefile.fpc +++ b/rtl/palmos/Makefile.fpc @@ -9,7 +9,7 @@ main=rtl loaders= prt0 units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \ ctypes \ - $(CHARSETUNIT) cpall \ + $(CHARSETUNIT) $(CPALLUNIT) \ sysconst \ systraps pilot #units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \ @@ -17,11 +17,11 @@ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \ # windows messages dynlibs \ # dos objects \ # rtlconsts sysconst sysutils \ -# typinfo types fgl classes fmtbcd \ +# typinfo types $(FGLUNIT) classes fmtbcd \ # strutils convutils math dateutils \ # varutils variants \ # matrix ucomplex \ -# $(CHARSETUNIT) cpall getopts winsock sockets +# $(CHARSETUNIT) $(CPALLUNIT) getopts winsock sockets # initc $(CMEMUNIT) signals \ # crt graph \ # wincrt winmouse winevent printer \ diff --git a/rtl/sinclairql/Makefile.fpc b/rtl/sinclairql/Makefile.fpc index a2bf7889e6..8dffd42a31 100644 --- a/rtl/sinclairql/Makefile.fpc +++ b/rtl/sinclairql/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl [target] loaders=$(LOADERS) -units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl cpall +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl $(CPALLUNIT) # $(EXTPASUNIT) $(MACPASUNIT) implicitunits=si_prc \ ctypes rtlconsts $(STRINGSUNIT) \ diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc index 5d69046b09..53599568dd 100644 --- a/rtl/solaris/Makefile.fpc +++ b/rtl/solaris/Makefile.fpc @@ -11,8 +11,8 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ baseunix unixutil unixcp \ termio unix initc $(CMEMUNIT) \ - sysutils typinfo math $(SORTBASEUNIT) fgl classes \ - $(CHARSETUNIT) cpall getopts \ + sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes \ + $(CHARSETUNIT) $(CPALLUNIT) getopts \ errors \ dl dynlibs \ types sysconst character \ @@ -162,7 +162,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) types$(PPUEXT) \ - $(SYSTEMUNIT)$(PPUEXT) fgl$(PPUEXT) sortbase$(PPUEXT) + $(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/win16/Makefile.fpc b/rtl/win16/Makefile.fpc index 21d554278d..b6d93d7099 100644 --- a/rtl/win16/Makefile.fpc +++ b/rtl/win16/Makefile.fpc @@ -7,8 +7,8 @@ main=rtl loaders=prt0s prt0m prt0c prt0l prt0h units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \ wintypes winprocs win31 ports dynlibs $(SORTBASEUNIT) \ - sysconst rtlconsts sysutils math types typinfo fgl \ - classes $(CHARSETUNIT) cpu getopts cpall \ + sysconst rtlconsts sysutils math types typinfo $(FGLUNIT) \ + classes $(CHARSETUNIT) cpu getopts $(CPALLUNIT) \ unicodedata character ctypes implicitunits=\ cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ @@ -135,7 +135,7 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) \ - types$(PPUEXT) fgl$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ + types$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ winprocs$(PPUEXT) wintypes$(PPUEXT) sortbase$(PPUEXT) system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(EXECPPAS) diff --git a/rtl/win64/Makefile.fpc b/rtl/win64/Makefile.fpc index 6191c99800..fbaaa73389 100644 --- a/rtl/win64/Makefile.fpc +++ b/rtl/win64/Makefile.fpc @@ -65,7 +65,7 @@ UNITPREFIX=rtl SYSTEMUNIT=system EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) # buildrtl contains charset -# so let's state that cpall depends on buildrtl +# so let's state that $(CPALLUNIT) depends on buildrtl # to avoid charset being compiled twice CPALL_DEPS_OS=buildrtl$(PPUEXT) # exeinfo unit is inside buildrtl