m68k-palmos: yet another broken-over-a-decade platform build fixed

git-svn-id: trunk@36863 -

.gitattributes

@@ -9890,7 +9890,7 @@ rtl/os2/tthread.inc svneol=native#text/plain
 rtl/os2/viocalls.imp -text
 rtl/os2/viocalls.pas svneol=native#text/plain
 rtl/palmos/Makefile svneol=native#text/plain
-rtl/palmos/Makefile.fpc -text
+rtl/palmos/Makefile.fpc svneol=native#text/plain
 rtl/palmos/api/common.inc svneol=native#text/plain
 rtl/palmos/api/common.pp svneol=native#text/plain
 rtl/palmos/api/font.imn -text

rtl/palmos/Makefile.fpc

@@ -1,177 +1,203 @@
-#
-#   Makefile.fpc for Free Pascal WinCE RTL
-#
-
-[package]
-main=rtl
-
-[target]
-loaders= prt0
-units=$(SYSTEMUNIT) uuchar ctypes objpas macpas iso7185 extpas strings \
-      lnfodwrf lineinfo heaptrc \
-      windows messages dynlibs \
-      dos objects \
-      rtlconsts sysconst sysutils \
-      typinfo types fgl classes fmtbcd \
-      strutils convutils math dateutils \
-      varutils variants \
-      matrix ucomplex \
-      charset cpall getopts winsock sockets
-# initc cmem signals \
-#    crt graph \
-#    wincrt winmouse winevent  printer \
-#    video mouse keyboard \
-#    winsysut
-implicitunits=exeinfo \
-      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 \
-      cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 \
-      cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
-
-# rsts=math varutils typinfo variants classes dateutils sysconst
-
-[require]
-nortl=y
-
-[install]
-fpcpackage=y
-
-[default]
-fpcdir=../..
-target=palmos
-
-[compiler]
-includedir=$(INC) $(PROCINC) $(RTL)/palmos
-sourcedir=$(INC) $(PROCINC) $(COMMON)
-
-
-[prerules]
-# Where are the include files
-RTL=..
-INC=$(RTL)/inc
-COMMON=$(RTL)/common
-PROCINC=$(RTL)/$(CPU_TARGET)
-
-UNITPREFIX=rtl
-
-SYSTEMUNIT=system
-PRT0=prt0
-
-# Use new feature from 1.0.5 version
-# that generates release PPU files
-# which will not be recompiled
-ifdef RELEASE
-override FPCOPT+=-Ur
-endif
-
-# Paths
-OBJPASDIR=$(RTL)/objpas
-GRAPHDIR=$(INC)/graph
-
-
-
-[rules]
-.NOTPARALLEL:
-SYSTEMPPU=syspalm.ppu
-
-# Get the system independent include file names.
-# This will set the following variables : 
-# SYSINCNAMES
-include $(INC)/makefile.inc
-SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
-
-# Get the processor dependent include file names.
-# This will set the following variables : 
-# CPUINCNAMES
-include $(PROCINC)/makefile.cpu
-SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
-
-# Put system unit dependencies together.
-SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-
-
-#
-# Loaders
-#
-
-$(PRT0)$(OEXT) : $(CPU_TARGET)/$(PRT0).as
-        $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)$(PRT0)$(OEXT) $(CPU_TARGET)/$(PRT0).as
-
-
-#
-# System Units (System, Objpas, Strings)
-#
-
-$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
-        $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
-
-uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
-
-objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
-        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
-
-strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
-                   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
-                   $(SYSTEMUNIT)$(PPUEXT)
-
-#
-# System Dependent Units
-#
-
-#
-# TP7 Compatible RTL Units
-#
-
-#dos$(PPUEXT) : $(DOSDEPS) $(SYSTEMPPU)
-#	$(PP) $(OPT) dos $(REDIR)
-
-#crt$(PPUEXT) : crt.pp $(INC)/textrec.inc $(INC)/filerec.inc $(SYSTEMPPU)
-#	$(PP) $(OPT) crt $(REDIR)
-
-#objects$(PPUEXT) : $(INC)/objects.pp objinc.inc $(SYSTEMPPU)
-#	$(COPY) $(INC)/objects.pp .
-#	$(PP) $(OPT) objects $(REDIR)
-#	$(DEL) objects.pp
-
-#
-# Other system-independent RTL Units
-#
-
-fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(OBJPASDIR)/fmtbcd.pp
-
-cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
-        $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
-#####################################################################
-# Libs
-#####################################################################
-
-staticlib:
-	make clean
-	make all SMARTLINK=YES LIBNAME=fpc LIBTYPE=static
-
-sharedlib:
-	make clean
-	make all
-	$(PPUMOVE) -o fpc $(SHAREDLIBFILES)
-
-staticlibinstall: staticlib
-	$(MKDIR) $(STATIC_LIBINSTALLDIR)
-	$(MKDIR) $(STATIC_UNITINSTALLDIR)
-	$(INSTALLEXE) libfpc$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
-	$(INSTALL) *$(PPUEXT) *$(OEXT) $(STATIC_UNITINSTALLDIR)
-
-sharedlibinstall: sharedlib
-	$(MKDIR) $(SHARED_LIBINSTALLDIR)
-	$(MKDIR) $(SHARED_UNITINSTALLDIR)
-	$(INSTALLEXE) libfpc$(SHAREDLIBEXT) $(SHARED_LIBINSTALLDIR)
-	$(INSTALL) *$(PPUEXT) *$(OEXT) $(SHARED_UNITINSTALLDIR)
-	ldconfig
-
-libinstall: staticlibinstall sharedlibinstall
-
-libsclean : clean
-	-$(DEL) *$(SMARTLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-
-
+#
+#   Makefile.fpc for Free Pascal WinCE RTL
+#
+
+[package]
+main=rtl
+
+[target]
+loaders= prt0
+units=$(SYSTEMUNIT) uuchar objpas iso7185 strings \
+       ctypes \
+       charset cpall \
+       sysconst
+#units=$(SYSTEMUNIT) uuchar ctypes objpas macpas iso7185 extpas strings \
+#      lnfodwrf lineinfo heaptrc \
+#      windows messages dynlibs \
+#      dos objects \
+#      rtlconsts sysconst sysutils \
+#      typinfo types fgl classes fmtbcd \
+#      strutils convutils math dateutils \
+#      varutils variants \
+#      matrix ucomplex \
+#      charset cpall getopts winsock sockets
+# initc cmem signals \
+#    crt graph \
+#    wincrt winmouse winevent  printer \
+#    video mouse keyboard \
+#    winsysut
+implicitunits=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 \
+      cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 \
+      cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+
+# rsts=math varutils typinfo variants classes dateutils sysconst
+
+[require]
+nortl=y
+
+[install]
+fpcpackage=y
+
+[default]
+fpcdir=../..
+target=palmos
+
+[compiler]
+includedir=$(INC) $(PROCINC) $(RTL)/palmos
+sourcedir=$(INC) $(PROCINC) $(COMMON) $(OBJPAS)
+
+
+[prerules]
+# Where are the include files
+RTL=..
+INC=$(RTL)/inc
+COMMON=$(RTL)/common
+PROCINC=$(RTL)/$(CPU_TARGET)
+
+UNITPREFIX=rtl
+
+SYSTEMUNIT=system
+PRT0=prt0
+
+# Use new feature from 1.0.5 version
+# that generates release PPU files
+# which will not be recompiled
+ifdef RELEASE
+override FPCOPT+=-Ur
+endif
+
+# Paths
+OBJPASDIR=$(RTL)/objpas
+GRAPHDIR=$(INC)/graph
+
+
+
+[rules]
+.NOTPARALLEL:
+SYSTEMPPU=syspalm.ppu
+
+# Get the system independent include file names.
+# This will set the following variables : 
+# SYSINCNAMES
+include $(INC)/makefile.inc
+SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
+
+# Get the processor dependent include file names.
+# This will set the following variables : 
+# CPUINCNAMES
+include $(PROCINC)/makefile.cpu
+SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
+
+# Put system unit dependencies together.
+SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
+
+
+#
+# Loaders
+#
+
+$(PRT0)$(OEXT) : $(CPU_TARGET)/$(PRT0).as
+        $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)$(PRT0)$(OEXT) $(CPU_TARGET)/$(PRT0).as
+
+
+#
+# System Units (System, Objpas, Strings)
+#
+
+$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
+        $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
+
+uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
+
+objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
+
+strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
+                   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
+                   $(SYSTEMUNIT)$(PPUEXT)
+
+cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
+        $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
+
+iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) $(INC)/iso7185.pp
+
+#extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+#        $(COMPILER) $(INC)/extpas.pp
+
+types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/types.pp
+
+rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/rtlconsts.pp
+
+sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/sysconst.pp
+
+strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
+                   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
+                   $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) $<
+
+#
+# System Dependent Units
+#
+
+#
+# TP7 Compatible RTL Units
+#
+
+#dos$(PPUEXT) : $(DOSDEPS) $(SYSTEMPPU)
+#	$(PP) $(OPT) dos $(REDIR)
+
+#crt$(PPUEXT) : crt.pp $(INC)/textrec.inc $(INC)/filerec.inc $(SYSTEMPPU)
+#	$(PP) $(OPT) crt $(REDIR)
+
+#objects$(PPUEXT) : $(INC)/objects.pp objinc.inc $(SYSTEMPPU)
+#	$(COPY) $(INC)/objects.pp .
+#	$(PP) $(OPT) objects $(REDIR)
+#	$(DEL) objects.pp
+
+#
+# Other system-independent RTL Units
+#
+
+fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/fmtbcd.pp
+
+cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
+        $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
+#####################################################################
+# Libs
+#####################################################################
+
+#staticlib:
+#	make clean
+#	make all SMARTLINK=YES LIBNAME=fpc LIBTYPE=static
+
+#sharedlib:
+#	make clean
+#	make all
+#	$(PPUMOVE) -o fpc $(SHAREDLIBFILES)
+
+#staticlibinstall: staticlib
+#	$(MKDIR) $(STATIC_LIBINSTALLDIR)
+#	$(MKDIR) $(STATIC_UNITINSTALLDIR)
+#	$(INSTALLEXE) libfpc$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
+#	$(INSTALL) *$(PPUEXT) *$(OEXT) $(STATIC_UNITINSTALLDIR)
+
+#sharedlibinstall: sharedlib
+#	$(MKDIR) $(SHARED_LIBINSTALLDIR)
+#	$(MKDIR) $(SHARED_UNITINSTALLDIR)
+#	$(INSTALLEXE) libfpc$(SHAREDLIBEXT) $(SHARED_LIBINSTALLDIR)
+#	$(INSTALL) *$(PPUEXT) *$(OEXT) $(SHARED_UNITINSTALLDIR)
+#	ldconfig
+
+#libinstall: staticlibinstall sharedlibinstall
+#
+#libsclean : clean
+#	-$(DEL) *$(SMARTLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+
+