* added .NOTPARALLEL to chm and fcl-base Makefiles

  * added all missing dependencies to the packages Makefile
 -> make -j 2 works again under Darwin

git-svn-id: trunk@8246 -

packages/Makefile

@@ -2726,16 +2726,36 @@ makefiles: fpc_makefiles $(addsuffix _makefiles,$(TARGET_DIRS))
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+extra_all: base_all fcl-xml_all
+extra_debug: base_debug fcl-xml_debug
+extra_smart: base_smart fcl-xml_smart
+extra_release: base_release fcl-xml_release
+extra_shared: base_shared fcl-xml_shared
+fcl-base_all: base_all
+fcl-base_debug: base_debug
+fcl-base_smart: base_smart
+fcl-base_release: base_release
+fcl-base_shared: base_shared
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug
 fcl-xml_smart: fcl-base_smart
 fcl-xml_release: fcl-base_release
 fcl-xml_shared: fcl-base_shared
-fpcunit_all: fcl-xml_all
-fpcunit_debug: fcl-xml_debug
-fpcunit_smart: fcl-xml_smart
-fpcunit_release: fcl-xml_release
-fpcunit_shared: fcl-xml_shared
+fcl-image_all: fcl-base_all
+fcl-image_debug: fcl-base_debug
+fcl-image_smart: fcl-base_smart
+fcl-image_release: fcl-base_release
+fcl-image_shared: fcl-base_shared
+fcl-fpcunit_all: fcl-xml_all
+fcl-fpcunit_debug: fcl-xml_debug
+fcl-fpcunit_smart: fcl-xml_smart
+fcl-fpcunit_release: fcl-xml_release
+fcl-fpcunit_shared: fcl-xml_shared
+fcl-registry_all: fcl-xml_all
+fcl-registry_debug: fcl-xml_debug
+fcl-registry_smart: fcl-xml_smart
+fcl-registry_release: fcl-xml_release
+fcl-registry_shared: fcl-xml_shared
 fcl-net_all: fcl-passrc_all fcl-xml_all
 fcl-net_debug: fcl-passrc_debug fcl-xml_debug
 fcl-net_smart: fcl-passrc_smart fcl-xml_smart

packages/Makefile.fpc

@@ -22,17 +22,41 @@ fpcsubdir=packages
 fpcdir=..
 
 [rules]
+extra_all: base_all fcl-xml_all
+extra_debug: base_debug fcl-xml_debug
+extra_smart: base_smart fcl-xml_smart
+extra_release: base_release fcl-xml_release
+extra_shared: base_shared fcl-xml_shared
+
+fcl-base_all: base_all
+fcl-base_debug: base_debug
+fcl-base_smart: base_smart
+fcl-base_release: base_release
+fcl-base_shared: base_shared
+
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug
 fcl-xml_smart: fcl-base_smart
 fcl-xml_release: fcl-base_release
 fcl-xml_shared: fcl-base_shared
 
-fpcunit_all: fcl-xml_all
-fpcunit_debug: fcl-xml_debug
-fpcunit_smart: fcl-xml_smart
-fpcunit_release: fcl-xml_release
-fpcunit_shared: fcl-xml_shared
+fcl-image_all: fcl-base_all
+fcl-image_debug: fcl-base_debug
+fcl-image_smart: fcl-base_smart
+fcl-image_release: fcl-base_release
+fcl-image_shared: fcl-base_shared
+
+fcl-fpcunit_all: fcl-xml_all
+fcl-fpcunit_debug: fcl-xml_debug
+fcl-fpcunit_smart: fcl-xml_smart
+fcl-fpcunit_release: fcl-xml_release
+fcl-fpcunit_shared: fcl-xml_shared
+
+fcl-registry_all: fcl-xml_all
+fcl-registry_debug: fcl-xml_debug
+fcl-registry_smart: fcl-xml_smart
+fcl-registry_release: fcl-xml_release
+fcl-registry_shared: fcl-xml_shared
 
 fcl-net_all: fcl-passrc_all fcl-xml_all
 fcl-net_debug: fcl-passrc_debug fcl-xml_debug

packages/extra/chm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/04/28]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/05/31]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -1997,7 +1997,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+override FPCOPT+=-XP$(BINUTILSPREFIX) 
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -2201,6 +2201,7 @@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
@@ -2584,5 +2585,6 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 cdmcmd$(EXEEXT): chmcmd.lpr
 chmls$(EXEEXT): chmls.lpr

packages/extra/chm/Makefile.fpc

@@ -22,6 +22,8 @@ fpcpackage=y
 fpcdir=../../..
 
 [rules]
+.NOTPARALLEL:
+
 cdmcmd$(EXEEXT): chmcmd.lpr
 
 chmls$(EXEEXT): chmls.lpr

packages/fcl-base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/04/28]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/05/31]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -2443,7 +2443,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+override FPCOPT+=-XP$(BINUTILSPREFIX) 
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -2630,6 +2630,7 @@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
@@ -3013,3 +3014,4 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:

packages/fcl-base/Makefile.fpc

@@ -74,3 +74,6 @@ fpcpackage=y
 
 [default]
 fpcdir=../..
+
+[rules]
+.NOTPARALLEL: