diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 3181b899c4..66675088d7 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/27] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/30] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -774,7 +774,11 @@ endif endif export MVPROG ifndef ECHOREDIR -ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO)) +ifndef inUnix +ECHOREDIR=echo +else +ECHOREDIR=$(ECHO) +endif endif ifndef COPY COPY:=$(CPPROG) -fp @@ -1366,7 +1370,7 @@ cprt21$(OEXT) : $(CPU_TARGET)/cprt21.as $(AS) -o cprt21$(OEXT) $(CPU_TARGET)/cprt21.as gprt21$(OEXT) : $(CPU_TARGET)/gprt0.as $(AS) -o gprt21$(OEXT) $(CPU_TARGET)/gprt0.as -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp sysconst.inc systypes.inc $(CPU_TARGET)/syscalls.inc $(SYSDEPS) +$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp sysconst.inc systypes.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp systhrds$(PPUEXT): systhrds.pp $(INC)/threadh.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) @@ -1375,7 +1379,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\ $(SYSTEMUNIT)$(PPUEXT) unix$(PPUEXT) : unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ - $(CPU_TARGET)/syscalls.inc systypes.inc sysconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) \ + sysc11.inc systypes.inc sysconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) \ unixsysc.inc baseunix$(PPUEXT) : errno.inc bunxtype.inc ptypes.inc ctypes.inc \ signal.inc $(UNIXINC)/bunxh.inc bunxmain.inc ostypes.inc \ diff --git a/rtl/linux/Makefile.fpc b/rtl/linux/Makefile.fpc index 4a3b62a7f1..e9c6b17f60 100644 --- a/rtl/linux/Makefile.fpc +++ b/rtl/linux/Makefile.fpc @@ -140,7 +140,7 @@ gprt21$(OEXT) : $(CPU_TARGET)/gprt0.as # $(SYSTEMUNIT) Units ($(SYSTEMUNIT), Objpas, Strings) # -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp sysconst.inc systypes.inc $(CPU_TARGET)/syscalls.inc $(SYSDEPS) +$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp sysconst.inc systypes.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp systhrds$(PPUEXT): systhrds.pp $(INC)/threadh.inc $(SYSTEMUNIT)$(PPUEXT) @@ -157,7 +157,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\ # unix$(PPUEXT) : unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ - $(CPU_TARGET)/syscalls.inc systypes.inc sysconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) \ + sysc11.inc systypes.inc sysconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) \ unixsysc.inc baseunix$(PPUEXT) : errno.inc bunxtype.inc ptypes.inc ctypes.inc \