paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-09 10:09:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove OS rule for charset unit and use CHARSETUNIT variable

Browse Source
This commit is contained in:
Pierre Muller 2023-09-13 17:24:16 +00:00
parent 038b01bf23
commit 265d51a912
14 changed files with 16 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

@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $
termio unix initc $(CMEMUNIT) \
$(LNFOGDBUNIT) \
sysutils typinfo math sortbase fgl classes \
charset cpall character unixcp getopts \
$(CHARSETUNIT) cpall character unixcp getopts \
errors \
# ipc
dl dynlibs \
@ -206,9 +206,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp
charset$(PPUEXT) : $(INC)/charset.pp $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(INC)/charset.pp
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

5
rtl/android/Makefile.fpc
View File

@ -10,7 +10,7 @@ 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 charset cpall character \
linuxvcs sysutils typinfo math $(CHARSETUNIT) cpall character \
getopts errors dl dynlibs \
types sysconst cthreads sortbase classes fgl \
rtlconsts dos cwstring fpcylix unixcp fpwidestring \
@ -228,9 +228,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/charset.pp
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

4
rtl/dragonfly/Makefile.fpc
View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc $(CMEMUNIT) \
dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
errors bsd \
console \
sysconst cthreads dos cwstring \
@ -208,8 +208,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

5
rtl/freebsd/Makefile.fpc
View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc $(CMEMUNIT) \
dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
errors bsd freebsd \
console \
sysconst cthreads dos cwstring \
@ -227,9 +227,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

6
rtl/go32v2/Makefile.fpc
View File

@ -10,7 +10,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN
dos $(CMEMUNIT) sortbase \
sysutils classes math typinfo \
cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes fgl \
msmouse charset cpall \
msmouse $(CHARSETUNIT) cpall \
character fpwidestring unicodedata \
types sysconst rtlconst \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
@ -176,10 +176,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp
$(EXECPPAS)
charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT)
$(COMPILER) $(INC)/charset.pp
$(EXECPPAS)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
$(EXECPPAS)

8
rtl/msxdos/Makefile.fpc
View File

@ -5,13 +5,13 @@
main=rtl
[target]
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) charset cpall \
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) cpall \
getopts $(EXEINFOUNIT) $(HEAPTRCUNIT)
#$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) sysconst sysutils \
# math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \
# getopts sortbase fgl classes \
# msmouse ports \
# charset cpall ctypes \
# $(CHARSETUNIT) cpall ctypes \
# fpwidestring character unicodedata
# $(CMEMUNIT)
# initc profile dxetype dxeload emu387 \
@ -146,10 +146,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp $(REDIR)
$(EXECPPAS)
charset$(PPUEXT) : $(INC)/charset.pp $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/charset.pp
$(EXECPPAS)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
$(EXECPPAS)

2
rtl/nativent/Makefile.fpc
View File

@ -16,7 +16,7 @@ implicitunits=ndk ndkutils ddk \
dos \
rtlconsts sysconst sysutils math types \
typinfo fgl classes \
$(CPU_UNITS) charset getopts \
$(CPU_UNITS) $(CHARSETUNIT) getopts \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \
# sockets printer \
# keyboard

5
rtl/netbsd/Makefile.fpc
View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(
unix rtlconsts initc $(CMEMUNIT) \
dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \
$(CPU_UNITS) charset cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
$(CPU_UNITS) $(CHARSETUNIT) cpall getopts $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \
errors bsd \
sysconst cthreads dos cwstring \
$(FPINTRESUNIT) unixcp fpwidestring \
@ -221,9 +221,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

4
rtl/netwlibc/Makefile.fpc
View File

@ -12,7 +12,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(E
nwsnut libc dos sysconst \
initc sysutils types typinfo sortbase fgl classes \
cpu mmx getopts \
charset cpall \
$(CHARSETUNIT) cpall \
rtlconsts math \
dynlibs $(CMEMUNIT) ctypes \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
@ -189,8 +189,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

5
rtl/openbsd/Makefile.fpc
View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASU
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \
sysutils sortbase fgl classes typinfo math \
charset cpall character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(CHARSETUNIT) cpall character getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
errors \
types sysctl sysconst \
$(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio \
@ -252,9 +252,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

4
rtl/palmos/Makefile.fpc
View File

@ -9,7 +9,7 @@ main=rtl
loaders= prt0
units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \
ctypes \
charset cpall \
$(CHARSETUNIT) cpall \
sysconst \
systraps pilot
#units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
@ -21,7 +21,7 @@ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \
# strutils convutils math dateutils \
# varutils variants \
# matrix ucomplex \
# charset cpall getopts winsock sockets
# $(CHARSETUNIT) cpall getopts winsock sockets
# initc $(CMEMUNIT) signals \
# crt graph \
# wincrt winmouse winevent printer \

2
rtl/sinclairql/Makefile.fpc
View File

@ -11,7 +11,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl cpall
# $(EXTPASUNIT) $(MACPASUNIT)
implicitunits=si_prc \
ctypes rtlconsts $(STRINGSUNIT) \
sortbase charset fpwidestring \
sortbase $(CHARSETUNIT) fpwidestring \
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \
cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 \

5
rtl/solaris/Makefile.fpc
View File

@ -12,7 +12,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $
baseunix unixutil unixcp \
termio unix initc $(CMEMUNIT) \
sysutils typinfo math sortbase fgl classes \
charset cpall getopts \
$(CHARSETUNIT) cpall getopts \
errors \
dl dynlibs \
types sysconst character \
@ -205,9 +205,6 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp
charset$(PPUEXT) : $(INC)/charset.pp $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(INC)/charset.pp
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas

6
rtl/win16/Makefile.fpc
View File

@ -8,7 +8,7 @@ loaders=prt0s prt0m prt0c prt0l prt0h
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \
wintypes winprocs win31 ports dynlibs sortbase \
sysconst rtlconsts sysutils math types typinfo fgl \
classes charset cpu getopts cpall \
classes $(CHARSETUNIT) cpu getopts cpall \
unicodedata character ctypes
implicitunits=\
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
@ -175,10 +175,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
$(COMPILER) $(INC)/getopts.pp $(REDIR)
$(EXECPPAS)
charset$(PPUEXT) : $(INC)/charset.pp $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/charset.pp
$(EXECPPAS)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
$(EXECPPAS)