* Patch from Giulio Bernardi to fix installation

git-svn-id: trunk@10668 -

utils/fpcres/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/24]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/04]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -386,6 +386,9 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=fpcres
 endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override TARGET_PROGRAMS+=fpcres
+endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=fpcres
 endif
@@ -420,172 +423,175 @@ ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_PROGRAMS+=fpcres
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler  target
+override CLEAN_UNITS+=msghandler paramparser sourcehandler target
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@@ -1516,6 +1522,10 @@ ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-RES=1
 endif
+ifeq ($(FULL_TARGET),arm-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-RES=1
+endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-RES=1
@@ -1765,15 +1775,6 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 .PHONY: fpc_exes
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
@@ -2136,3 +2137,5 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
+fpcres$(EXEEXT): target.pas msghandler.pas paramparser.pas sourcehandler.pas fpcres.pas

utils/fpcres/Makefile.fpc

@@ -1,10 +1,12 @@
 #
-#   Makefile.fpc for FPCMake
+#   Makefile.fpc for fpcres
 #
 
 [target]
 programs=fpcres
-units=msghandler paramparser sourcehandler  target
+
+[clean]
+units=msghandler paramparser sourcehandler target
 
 [require]
 packages=rtl fcl-res
@@ -16,3 +18,5 @@ fpcpackage=y
 fpcdir=../..
 
 [rules]
+.NOTPARALLEL:
+fpcres$(EXEEXT): target.pas msghandler.pas paramparser.pas sourcehandler.pas fpcres.pas

utils/fpcreslipo/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/24]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/04]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -386,6 +386,9 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=fpcreslipo
 endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override TARGET_PROGRAMS+=fpcreslipo
+endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=fpcreslipo
 endif
@@ -420,172 +423,175 @@ ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_PROGRAMS+=fpcreslipo
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=msghandler paramparser sourcehandler
+override CLEAN_UNITS+=msghandler paramparser sourcehandler
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@@ -1516,6 +1522,10 @@ ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-RES=1
 endif
+ifeq ($(FULL_TARGET),arm-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-RES=1
+endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-RES=1
@@ -1765,15 +1775,6 @@ EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 .PHONY: fpc_exes
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
@@ -2136,3 +2137,5 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
+fpcreslipo$(EXEEXT): msghandler.pp paramparser.pp sourcehandler.pp fpcreslipo.pp

utils/fpcreslipo/Makefile.fpc

@@ -1,9 +1,11 @@
 #
-#   Makefile.fpc for FPCMake
+#   Makefile.fpc for fpcreslipo
 #
 
 [target]
 programs=fpcreslipo
+
+[clean]
 units=msghandler paramparser sourcehandler
 
 [require]
@@ -16,3 +18,5 @@ fpcpackage=y
 fpcdir=../..
 
 [rules]
+.NOTPARALLEL:
+fpcreslipo$(EXEEXT): msghandler.pp paramparser.pp sourcehandler.pp fpcreslipo.pp