From a3454e556c58d80c6a25b54f0a81f3555ae012dd Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Mon, 2 Mar 2009 10:22:27 +0000
Subject: [PATCH] tools: remove dependency on components This dependency is not
 required (anymore), and solves doing 'make tools' which failed because
 IDEIntf was not yet build when building the synedit component

git-svn-id: trunk@18868 -
---
 Makefile     | 218 ++++++++++++++++++++++++++-------------------------
 Makefile.fpc |   2 +-
 2 files changed, 112 insertions(+), 108 deletions(-)

diff --git a/Makefile b/Makefile
index f960c765d8..ae563e9b0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/01/24]
 #
 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 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
@@ -114,6 +114,10 @@ FPC:=$(shell $(FPCPROG) -PB)
 endif
 ifneq ($(findstring Error,$(FPC)),)
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+else
+ifeq ($(strip $(wildcard $(FPC))),)
+FPC:=$(firstword $(FPCPROG))
+endif
 endif
 else
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
@@ -2606,409 +2610,409 @@ fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 ifeq ($(FULL_TARGET),i386-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
 TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
+TARGET_DIRS_COMPONENTS=1
 endif
 ifdef TARGET_DIRS_LCL
 lcl_all:
@@ -3055,51 +3059,6 @@ lcl:
 	$(MAKE) -C lcl all
 .PHONY: lcl_all lcl_debug lcl_smart lcl_release lcl_units lcl_examples lcl_shared lcl_install lcl_sourceinstall lcl_exampleinstall lcl_distinstall lcl_zipinstall lcl_zipsourceinstall lcl_zipexampleinstall lcl_zipdistinstall lcl_clean lcl_distclean lcl_cleanall lcl_info lcl_makefiles lcl
 endif
-ifdef TARGET_DIRS_COMPONENTS
-components_all:
-	$(MAKE) -C components all
-components_debug:
-	$(MAKE) -C components debug
-components_smart:
-	$(MAKE) -C components smart
-components_release:
-	$(MAKE) -C components release
-components_units:
-	$(MAKE) -C components units
-components_examples:
-	$(MAKE) -C components examples
-components_shared:
-	$(MAKE) -C components shared
-components_install:
-	$(MAKE) -C components install
-components_sourceinstall:
-	$(MAKE) -C components sourceinstall
-components_exampleinstall:
-	$(MAKE) -C components exampleinstall
-components_distinstall:
-	$(MAKE) -C components distinstall
-components_zipinstall:
-	$(MAKE) -C components zipinstall
-components_zipsourceinstall:
-	$(MAKE) -C components zipsourceinstall
-components_zipexampleinstall:
-	$(MAKE) -C components zipexampleinstall
-components_zipdistinstall:
-	$(MAKE) -C components zipdistinstall
-components_clean:
-	$(MAKE) -C components clean
-components_distclean:
-	$(MAKE) -C components distclean
-components_cleanall:
-	$(MAKE) -C components cleanall
-components_info:
-	$(MAKE) -C components info
-components_makefiles:
-	$(MAKE) -C components makefiles
-components:
-	$(MAKE) -C components all
-.PHONY: components_all components_debug components_smart components_release components_units components_examples components_shared components_install components_sourceinstall components_exampleinstall components_distinstall components_zipinstall components_zipsourceinstall components_zipexampleinstall components_zipdistinstall components_clean components_distclean components_cleanall components_info components_makefiles components
-endif
 ifdef TARGET_DIRS_PACKAGER/REGISTRATION
 packager/registration_all:
 	$(MAKE) -C packager/registration all
@@ -3235,6 +3194,51 @@ packager:
 	$(MAKE) -C packager all
 .PHONY: packager_all packager_debug packager_smart packager_release packager_units packager_examples packager_shared packager_install packager_sourceinstall packager_exampleinstall packager_distinstall packager_zipinstall packager_zipsourceinstall packager_zipexampleinstall packager_zipdistinstall packager_clean packager_distclean packager_cleanall packager_info packager_makefiles packager
 endif
+ifdef TARGET_DIRS_COMPONENTS
+components_all:
+	$(MAKE) -C components all
+components_debug:
+	$(MAKE) -C components debug
+components_smart:
+	$(MAKE) -C components smart
+components_release:
+	$(MAKE) -C components release
+components_units:
+	$(MAKE) -C components units
+components_examples:
+	$(MAKE) -C components examples
+components_shared:
+	$(MAKE) -C components shared
+components_install:
+	$(MAKE) -C components install
+components_sourceinstall:
+	$(MAKE) -C components sourceinstall
+components_exampleinstall:
+	$(MAKE) -C components exampleinstall
+components_distinstall:
+	$(MAKE) -C components distinstall
+components_zipinstall:
+	$(MAKE) -C components zipinstall
+components_zipsourceinstall:
+	$(MAKE) -C components zipsourceinstall
+components_zipexampleinstall:
+	$(MAKE) -C components zipexampleinstall
+components_zipdistinstall:
+	$(MAKE) -C components zipdistinstall
+components_clean:
+	$(MAKE) -C components clean
+components_distclean:
+	$(MAKE) -C components distclean
+components_cleanall:
+	$(MAKE) -C components cleanall
+components_info:
+	$(MAKE) -C components info
+components_makefiles:
+	$(MAKE) -C components makefiles
+components:
+	$(MAKE) -C components all
+.PHONY: components_all components_debug components_smart components_release components_units components_examples components_shared components_install components_sourceinstall components_exampleinstall components_distinstall components_zipinstall components_zipsourceinstall components_zipexampleinstall components_zipdistinstall components_clean components_distclean components_cleanall components_info components_makefiles components
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
@@ -3473,7 +3477,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-.PHONY: lcl packager/registration ideintf packager components bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide purge examples install lazbuild
+.PHONY: lcl components packager/registration ideintf packager bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide purge examples install lazbuild
 ide: 
 	$(MAKE) -C ide ide
 idepkg:
@@ -3490,10 +3494,10 @@ starter:
 lazbuild: lazbuilder
 lazbuilder:
 	$(MAKE) -C ide lazbuilder
-tools: lcl components
+tools: lcl
 	$(MAKE) -C tools
 examples: lcl components
-all: lcl packager/registration ideintf packager components ide starter lazbuilder
+all: lcl components packager/registration ideintf packager ide starter lazbuilder
 cleanide:
 	$(MAKE) -C ide cleanide
 cleanlaz: cleanide
diff --git a/Makefile.fpc b/Makefile.fpc
index 5eb0a8b10e..fb45e50f17 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -80,7 +80,7 @@ lazbuilder:
 	$(MAKE) -C ide lazbuilder
 
 #-----------------------------------------------------------------------------
-tools: lcl components
+tools: lcl
 	$(MAKE) -C tools
 	
 #-----------------------------------------------------------------------------