Browse Source

Regenerate Makefile's

Pierre Muller 2 years ago
parent
commit
607c603e0f

+ 1 - 3
rtl/aix/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/amiga/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/android/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/aros/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/atari/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 3 - 3
rtl/beos/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b
@@ -881,7 +879,9 @@ UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 BASEUNIXDIR=.
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
+endif
 ifdef RELEASE
 override FPCOPT+=-Ur
 endif

+ 1 - 3
rtl/darwin/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/dragonfly/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/embedded/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/emx/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/freebsd/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/freertos/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/gba/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/go32v2/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/haiku/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/java/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/linux/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/macos/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/morphos/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/msdos/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/msxdos/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/nativent/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/nds/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/netbsd/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 3 - 3
rtl/netware/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b
@@ -880,7 +878,9 @@ COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
 UNITPREFIX=rtl
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
+endif
 DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
 override FPCOPT+=-Ur

+ 1 - 3
rtl/netwlibc/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/openbsd/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/os2/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/palmos/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/sinclairql/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/solaris/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 3 - 4
rtl/symbian/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b
@@ -875,14 +873,15 @@ CPUNITSBASE=$(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT
 CPUNITS=$(addprefix $(NS_CPUNITS),$(CPUNITSBASE))
 RTL=..
 INC=$(RTL)/inc
-UNIXINC=$(RTL)/unix
 COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
 SYMBIANINC=./symbianinc
 UIQINC=./uiqinc
 UNITPREFIX=rtl
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
+endif
 OBJPASDIR=$(RTL)/objpas
 ifeq ($(ARCH),i386)
 CPU_UNITS=cpu mmx

+ 1 - 3
rtl/wasi/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 3 - 3
rtl/watcom/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b
@@ -879,7 +877,9 @@ INC=../inc
 PROCINC=../$(CPU_TARGET)
 UNITPREFIX=rtl
 SYSTEMUNIT=system
+ifndef FPC_DOTTEDUNITS
 RTLCONSTSUNIT=rtlconst
+endif
 DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT)
 SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
 ifdef RELEASE

+ 1 - 3
rtl/wii/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/win16/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/win32/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/win64/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/wince/Makefile

@@ -789,9 +789,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b

+ 1 - 3
rtl/zxspectrum/Makefile

@@ -790,9 +790,7 @@ PROFILEUNIT=profile
 RASPI2UNIT=raspi2
 RASPI3UNIT=raspi3
 RASPIUARTUNIT=raspiuart
-ifeq ($(RTLCONSTSUNIT),)
-  RTLCONSTSUNIT=rtlconsts
-endif
+RTLCONSTSUNIT=rtlconsts
 SAM3X8EUNIT=sam3x8e
 SAMD51P19AUNIT=samd51p19a
 SC32442BUNIT=sc32442b