--- Merging r18791 into '.':

C    packages/fcl-extra/Makefile.fpc
C    packages/fcl-extra/Makefile
C    packages/fcl-net/Makefile.fpc
C    packages/fcl-net/Makefile
C    packages/fcl-res/Makefile.fpc
C    packages/fcl-res/Makefile
C    packages/fcl-passrc/Makefile.fpc
C    packages/fcl-passrc/Makefile
C    packages/fcl-registry/Makefile.fpc
C    packages/fcl-registry/Makefile
U    packages/fastcgi/Makefile.fpc
C    packages/fastcgi/Makefile
C    packages/fcl-image/Makefile.fpc
C    packages/fcl-image/Makefile
U    packages/fcl-web/Makefile.fpc
C    packages/fcl-web/Makefile
C    packages/fcl-base/Makefile.fpc
C    packages/fcl-base/Makefile
C    packages/fcl-async/Makefile.fpc
C    packages/fcl-async/Makefile
C    packages/fcl-json/Makefile.fpc
C    packages/fcl-json/Makefile
C    packages/fcl-js/Makefile.fpc
C    packages/fcl-js/Makefile
Summary of conflicts:
  Text conflicts: 22

# revisions: 18791
------------------------------------------------------------------------
r18791 | jonas | 2011-08-20 19:25:52 +0200 (Sat, 20 Aug 2011) | 3 lines
Changed paths:
   M /trunk/packages/fastcgi/Makefile
   M /trunk/packages/fastcgi/Makefile.fpc
   M /trunk/packages/fcl-async/Makefile
   M /trunk/packages/fcl-async/Makefile.fpc
   M /trunk/packages/fcl-base/Makefile
   M /trunk/packages/fcl-base/Makefile.fpc
   M /trunk/packages/fcl-extra/Makefile
   M /trunk/packages/fcl-extra/Makefile.fpc
   M /trunk/packages/fcl-image/Makefile
   M /trunk/packages/fcl-image/Makefile.fpc
   M /trunk/packages/fcl-js/Makefile
   M /trunk/packages/fcl-js/Makefile.fpc
   M /trunk/packages/fcl-json/Makefile
   M /trunk/packages/fcl-json/Makefile.fpc
   M /trunk/packages/fcl-net/Makefile
   M /trunk/packages/fcl-net/Makefile.fpc
   M /trunk/packages/fcl-passrc/Makefile
   M /trunk/packages/fcl-passrc/Makefile.fpc
   M /trunk/packages/fcl-registry/Makefile
   M /trunk/packages/fcl-registry/Makefile.fpc
   M /trunk/packages/fcl-res/Makefile
   M /trunk/packages/fcl-res/Makefile.fpc
   M /trunk/packages/fcl-web/Makefile
   M /trunk/packages/fcl-web/Makefile.fpc

  * mark all fpmake Makefiles with .NOTPARALLEL:, because they don't declare
    dependencies between all of their internal targets

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@19212 -

packages/fastcgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/09/11]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris 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 mipsel-linux
@@ -188,7 +188,11 @@ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
 else
+ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)
+TARGETSUFFIX=$(OS_TARGET)
+else
 TARGETSUFFIX=$(FULL_TARGET)
+endif
 SOURCESUFFIX=$(FULL_SOURCE)
 endif
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -2215,6 +2219,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpmake: fpmake.pp
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
 all:	fpmake

packages/fastcgi/Makefile.fpc

@@ -26,6 +26,7 @@ endif
 LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
+.NOTPARALLEL:
 fpmake: fpmake.pp
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
 all:	fpmake

packages/fcl-web/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/09/11]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris 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 mipsel-linux
@@ -188,7 +188,11 @@ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
 else
+ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)
+TARGETSUFFIX=$(OS_TARGET)
+else
 TARGETSUFFIX=$(FULL_TARGET)
+endif
 SOURCESUFFIX=$(FULL_SOURCE)
 endif
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -2215,6 +2219,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpmake: fpmake.pp
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
 all:	fpmake
@@ -2235,7 +2240,6 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
 distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
 else
 distclean:	
-ifdef inUnix	
 	{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi;  }
 else
 	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)

packages/fcl-web/Makefile.fpc

@@ -26,6 +26,8 @@ endif
 LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
 
 [rules]
+.NOTPARALLEL:
+
 fpmake: fpmake.pp
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
 all:	fpmake