cleaned up Makefiles, separated components into lazutils, codetools, base and bigide, added target help for components

git-svn-id: trunk@36677 -
2025-12-03 06:58:53 +01:00 · 2012-04-09 13:41:22 +00:00 · 2012-04-09 13:41:22 +00:00 · 29adb9ffcc
commit 29adb9ffcc
parent 7640a86947
11 changed files with 536 additions and 2325 deletions
--- a/1001
+++ b/1001
--- a/Makefile.fpc
+++ b/Makefile.fpc
@ -10,8 +10,8 @@ version=$(IDEVERSION)
 packages=regexpr

 [target]
-programs=lazarus startlazarus
-dirs=lcl packager/registration ideintf components
+programs=lazarus startlazarus lazbuild
+dirs=
 exampledirs=examples

 [compiler]
@ -45,22 +45,32 @@ endif

 #-----------------------------------------------------------------------------
 [rules]
-.PHONY: help lcl components packager/registration ideintf bigidecomponents lazbuild tools ide idepkg idebig cleanide bigide bigideclean useride starter all clean purge examples install
+.PHONY: help registration lazutils codetools lcl ideintf basecomponents bigidecomponents lazbuild ide idepkg idebig cleanide bigide useride starter all clean purge install

 #-----------------------------------------------------------------------------
 help:
 	@$(ECHO)
-	@$(ECHO) " Targets"
-	@$(ECHO) "   all          build minimal IDE, lazbuild, startlazarus"
-	@$(ECHO) "   clean        deletes files that 'all' creates"
-	@$(ECHO) "   lazbuild     build lazbuild and lcl with nogui widgetset"
-	@$(ECHO) "   starter      build startlazarus"
-	@$(ECHO) "   bigide       build IDE with some stable extra packages"
-	@$(ECHO) "   tools        build lazres, svn2revisioninc, updatepofiles, lrstolfm"
-	@$(ECHO) "   examples     build basic examples. Note: There are more examples having their own directory"
-	@$(ECHO) "   lcl          build lcl"
+	@$(ECHO) " Main targets"
+	@$(ECHO) "   all            build minimal IDE, lazbuild, startlazarus"
+	@$(ECHO) "   clean          deletes files that 'all' creates"
+	@$(ECHO) "   lazbuild       build lazbuild and lcl with nogui widgetset"
+	@$(ECHO) "   bigide         as all, except that the IDE is build with a lot of extra packages"
+	@$(ECHO) "   useride        calls lazbuild to build an IDE with your active profile, requires lazbuild"
 	@$(ECHO)
-	@$(ECHO) " Examples:"
+	@$(ECHO) " Sub targets"
+	@$(ECHO) "   registration   build package FCL"
+	@$(ECHO) "   lazutils       build package LazUtils, requires registration"
+	@$(ECHO) "   codetools      build package CodeTools, requires lazutils"
+	@$(ECHO) "   lcl            build package LCL, requires lazutils"
+	@$(ECHO) "   tools          build lazres, svn2revisioninc, updatepofiles, lrstolfm, requires LCL with nogui widgetset"
+	@$(ECHO) "   ideintf        build package IDEIntf, requires lcl"
+	@$(ECHO) "   basecomponents build synedit and lazcontrols for the LCL_PLATFORM, requires ideintf"
+	@$(ECHO) "   bigidecomponents build many extra packages for the LCL_PLATFORM, requires basecomponents"
+	@$(ECHO) "   starter        build startlazarus, requires basecomponents"
+	@$(ECHO) "   examples       build basic examples, requires basecomponents"
+	@$(ECHO) "                  Note: There are more examples having their own directory"
+	@$(ECHO)
+	@$(ECHO) " Usage examples:"
 	@$(ECHO)
 	@$(ECHO) " Updating svn and build a minimal IDE, startlazarus and lazbuild:"
 	@$(ECHO) "   make clean"
@ -73,12 +83,9 @@ help:
 	@$(ECHO) " Updating svn and build an IDE with your last set of packages:"
 	@$(ECHO) "   make clean"
 	@$(ECHO) "   svn up"
-	@$(ECHO) "   make clean lazbuild"
-	@$(ECHO) "   ./lazbuild --build-ide="
+	@$(ECHO) "   make clean lazbuild useride"
 	@$(ECHO)
-	@$(ECHO) "   Note: Windows users must execute 'lazbuild.exe --build-ide='"
-	@$(ECHO)
-	@$(ECHO) Clean up:
+	@$(ECHO) " Clean up:"
 	@$(ECHO) "  There is no command to clean up a svn repository completely, but"
 	@$(ECHO) "  you can use the following command under Linux/OS X:"
 	@$(ECHO) "  svn status | grep '\?' | sed -e 's/\? *//' | xargs rm -r"
@ -86,79 +93,123 @@ help:
 	@exit

 #-----------------------------------------------------------------------------
-lazutils: packager/registration
+# build package FCL (shared by all LCL_PLATFORMs)
+registration:
+	$(MAKE) -C packager/registration
+
+#-----------------------------------------------------------------------------
+# build package LazUtils, requires registration (shared by all LCL_PLATFORMs)
+lazutils:
 	$(MAKE) -C components/lazutils

 #-----------------------------------------------------------------------------
-# build lazarus exe with minimum of packages
+# build package CodeTools, requires lazutils (shared by all LCL_PLATFORMs)
+codetools:
+	$(MAKE) -C components/codetools
+
+#-----------------------------------------------------------------------------
+# build package LCLBase and LCL for LCL_PLATFORM
+# requires lazutils
+lcl:
+	$(MAKE) -C lcl
+
+#-----------------------------------------------------------------------------
+# build package IDEIntf for LCL_PLATFORM
+# requires lcl
+ideintf:
+	$(MAKE) -C ideintf
+
+#-----------------------------------------------------------------------------
+# build synedit and lazcontrols for the LCL_PLATFORM
+# (Note: lazutils and codetools are shared on all LCL platforms)
+# requires ideintf
+basecomponents:
+	$(MAKE) -C components base
+
+#-----------------------------------------------------------------------------
+# build a lot of extra packages for the LCL_PLATFORM
+# requires basecomponents
+bigidecomponents:
+	$(MAKE) -C components bigide
+
+#-----------------------------------------------------------------------------
+# build lazres, svn2revisioninc, updatepofiles, lrstolfm
+# requires codetools and LCL with nogui widgetset
+tools:
+	$(MAKE) -C tools
+
+#-----------------------------------------------------------------------------
+# build lazarus exe with minimum of packages for the LCL_PLATFORM
+# requires basecomponents and tools
 ide:
 	$(MAKE) -C ide ide

 #-----------------------------------------------------------------------------
-# build lazarus exe with user's packages
-idepkg:
-	$(MAKE) -C ide idepkg
-
-#-----------------------------------------------------------------------------
-# build lazarus exe with bigide packages
+# build lazarus exe with bigide packages for the LCL_PLATFORM
+# requires bigidecomponents and tools
 idebig:
 	$(MAKE) -C ide bigide

 #-----------------------------------------------------------------------------
-# build lazarus and packages with user's settings
+# build lazarus exe with user's packages for the LCL_PLATFORM
+# requires user's packages, idemake.cfg and staticpackages.inc
+# called by the IDE/lazbuild
+# the idemake.cfg and staticpackages.inc are created by the IDE or by lazbuild
+idepkg:
+	$(MAKE) -C ide idepkg
+
+#-----------------------------------------------------------------------------
+# calls lazbuild to build lazarus and packages with user's settings
+# requires lazbuild
+# ignores LCL_PLATFORM and OPTS
 useride: 
 	./lazbuild$(SRCEXEEXT) --build-ide=

-#-----------------------------------------------------------------------------
-# build lazarus,lcl,startlazarus with bigide packages
-bigide: lazbuild lcl ideintf bigidecomponents idebig starter
-
-#-----------------------------------------------------------------------------
-bigidecomponents:
-	$(MAKE) -C components bigidecomponents
-	
 #-----------------------------------------------------------------------------
 starter:
 	$(MAKE) -C ide starter

 #-----------------------------------------------------------------------------
-lazbuild: lazutils 
-	$(MAKE) -C components/codetools
-	$(MAKE) -C lcl lclbase intf LCL_PLATFORM=nogui
-	$(MAKE) -C ideintf all LCL_PLATFORM=nogui
-	$(MAKE) -C components/synedit all LCL_PLATFORM=nogui
-	$(MAKE) -C components/lazcontrols all LCL_PLATFORM=nogui
+lazbuild: registration lazutils codetools
+	$(MAKE) -C lcl LCL_PLATFORM=nogui
+	$(MAKE) -C tools
+	$(MAKE) -C ideintf LCL_PLATFORM=nogui
+	$(MAKE) -C components base LCL_PLATFORM=nogui
 	$(MAKE) -C ide lazbuilder LCL_PLATFORM=nogui

 #-----------------------------------------------------------------------------
-tools: lcl
-	$(MAKE) -C tools
-	
-#-----------------------------------------------------------------------------
-examples: lazutils lcl bigidecomponents
+# build examples for the LCL_PLATFORM
+# requires basecomponents
+examples:
+	$(MAKE) -C examples

 #-----------------------------------------------------------------------------
-all: lazbuild lcl ideintf components tools ide starter
+# build lazarus,lcl,lazbuild,startlazarus with base packages for the LCL_PLATFORM
+all: lazbuild lcl ideintf basecomponents ide starter
+
+#-----------------------------------------------------------------------------
+# build lazarus,lcl,lazbuild,startlazarus with bigide packages for the LCL_PLATFORM
+bigide: lazbuild lcl ideintf basecomponents bigidecomponents idebig starter

 #-----------------------------------------------------------------------------
 cleanide:
 	$(MAKE) -C ide cleanide

 cleanlaz: cleanide
+	$(MAKE) -C packager/registration clean
 	$(MAKE) -C lcl cleanall
 	$(MAKE) -C components clean
-	$(MAKE) -C packager/registration clean
 	$(MAKE) -C ideintf clean

 clean: cleanlaz
 	$(MAKE) -C . cleanlaz LCL_PLATFORM=nogui
+	$(MAKE) -C tools clean

 cleanbigide: clean

 purge: clean
 	$(MAKE) -C examples clean
 #	$(MAKE) -C doceditor clean
-	$(MAKE) -C tools clean

 cleanall: purge

@ -191,15 +242,15 @@ else
 endif


+##########################################################################
+# Debian
+##########################################################################
+
 # Build dir
 ifndef BUILDDIR
 BUILDDIR=$(BASEDIR)/build
 endif

-##########################################################################
-# Debian
-##########################################################################
-
 ifeq ($(OS_TARGET),linux)

 ifndef DEBDIR
--- a/components/Makefile
+++ b/components/Makefile
@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/09]
 #
 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 mips-linux mipsel-linux
+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-openbsd 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 mips-linux mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@ -292,198 +292,6 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_DIRS+=lazutils codetools synedit lazcontrols
-endif
-ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
@ -618,6 +426,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
 endif
@ -1615,594 +1426,39 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),mips-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_DIRS_LAZUTILS=1
-TARGET_DIRS_CODETOOLS=1
-TARGET_DIRS_SYNEDIT=1
-TARGET_DIRS_LAZCONTROLS=1
-endif
-ifdef TARGET_DIRS_LAZUTILS
-lazutils_all:
-	$(MAKE) -C lazutils all
-lazutils_debug:
-	$(MAKE) -C lazutils debug
-lazutils_smart:
-	$(MAKE) -C lazutils smart
-lazutils_release:
-	$(MAKE) -C lazutils release
-lazutils_units:
-	$(MAKE) -C lazutils units
-lazutils_examples:
-	$(MAKE) -C lazutils examples
-lazutils_shared:
-	$(MAKE) -C lazutils shared
-lazutils_install:
-	$(MAKE) -C lazutils install
-lazutils_sourceinstall:
-	$(MAKE) -C lazutils sourceinstall
-lazutils_exampleinstall:
-	$(MAKE) -C lazutils exampleinstall
-lazutils_distinstall:
-	$(MAKE) -C lazutils distinstall
-lazutils_zipinstall:
-	$(MAKE) -C lazutils zipinstall
-lazutils_zipsourceinstall:
-	$(MAKE) -C lazutils zipsourceinstall
-lazutils_zipexampleinstall:
-	$(MAKE) -C lazutils zipexampleinstall
-lazutils_zipdistinstall:
-	$(MAKE) -C lazutils zipdistinstall
-lazutils_clean:
-	$(MAKE) -C lazutils clean
-lazutils_distclean:
-	$(MAKE) -C lazutils distclean
-lazutils_cleanall:
-	$(MAKE) -C lazutils cleanall
-lazutils_info:
-	$(MAKE) -C lazutils info
-lazutils_makefiles:
-	$(MAKE) -C lazutils makefiles
-lazutils:
-	$(MAKE) -C lazutils all
-.PHONY: lazutils_all lazutils_debug lazutils_smart lazutils_release lazutils_units lazutils_examples lazutils_shared lazutils_install lazutils_sourceinstall lazutils_exampleinstall lazutils_distinstall lazutils_zipinstall lazutils_zipsourceinstall lazutils_zipexampleinstall lazutils_zipdistinstall lazutils_clean lazutils_distclean lazutils_cleanall lazutils_info lazutils_makefiles lazutils
-endif
-ifdef TARGET_DIRS_CODETOOLS
-codetools_all:
-	$(MAKE) -C codetools all
-codetools_debug:
-	$(MAKE) -C codetools debug
-codetools_smart:
-	$(MAKE) -C codetools smart
-codetools_release:
-	$(MAKE) -C codetools release
-codetools_units:
-	$(MAKE) -C codetools units
-codetools_examples:
-	$(MAKE) -C codetools examples
-codetools_shared:
-	$(MAKE) -C codetools shared
-codetools_install:
-	$(MAKE) -C codetools install
-codetools_sourceinstall:
-	$(MAKE) -C codetools sourceinstall
-codetools_exampleinstall:
-	$(MAKE) -C codetools exampleinstall
-codetools_distinstall:
-	$(MAKE) -C codetools distinstall
-codetools_zipinstall:
-	$(MAKE) -C codetools zipinstall
-codetools_zipsourceinstall:
-	$(MAKE) -C codetools zipsourceinstall
-codetools_zipexampleinstall:
-	$(MAKE) -C codetools zipexampleinstall
-codetools_zipdistinstall:
-	$(MAKE) -C codetools zipdistinstall
-codetools_clean:
-	$(MAKE) -C codetools clean
-codetools_distclean:
-	$(MAKE) -C codetools distclean
-codetools_cleanall:
-	$(MAKE) -C codetools cleanall
-codetools_info:
-	$(MAKE) -C codetools info
-codetools_makefiles:
-	$(MAKE) -C codetools makefiles
-codetools:
-	$(MAKE) -C codetools all
-.PHONY: codetools_all codetools_debug codetools_smart codetools_release codetools_units codetools_examples codetools_shared codetools_install codetools_sourceinstall codetools_exampleinstall codetools_distinstall codetools_zipinstall codetools_zipsourceinstall codetools_zipexampleinstall codetools_zipdistinstall codetools_clean codetools_distclean codetools_cleanall codetools_info codetools_makefiles codetools
-endif
-ifdef TARGET_DIRS_SYNEDIT
-synedit_all:
-	$(MAKE) -C synedit all
-synedit_debug:
-	$(MAKE) -C synedit debug
-synedit_smart:
-	$(MAKE) -C synedit smart
-synedit_release:
-	$(MAKE) -C synedit release
-synedit_units:
-	$(MAKE) -C synedit units
-synedit_examples:
-	$(MAKE) -C synedit examples
-synedit_shared:
-	$(MAKE) -C synedit shared
-synedit_install:
-	$(MAKE) -C synedit install
-synedit_sourceinstall:
-	$(MAKE) -C synedit sourceinstall
-synedit_exampleinstall:
-	$(MAKE) -C synedit exampleinstall
-synedit_distinstall:
-	$(MAKE) -C synedit distinstall
-synedit_zipinstall:
-	$(MAKE) -C synedit zipinstall
-synedit_zipsourceinstall:
-	$(MAKE) -C synedit zipsourceinstall
-synedit_zipexampleinstall:
-	$(MAKE) -C synedit zipexampleinstall
-synedit_zipdistinstall:
-	$(MAKE) -C synedit zipdistinstall
-synedit_clean:
-	$(MAKE) -C synedit clean
-synedit_distclean:
-	$(MAKE) -C synedit distclean
-synedit_cleanall:
-	$(MAKE) -C synedit cleanall
-synedit_info:
-	$(MAKE) -C synedit info
-synedit_makefiles:
-	$(MAKE) -C synedit makefiles
-synedit:
-	$(MAKE) -C synedit all
-.PHONY: synedit_all synedit_debug synedit_smart synedit_release synedit_units synedit_examples synedit_shared synedit_install synedit_sourceinstall synedit_exampleinstall synedit_distinstall synedit_zipinstall synedit_zipsourceinstall synedit_zipexampleinstall synedit_zipdistinstall synedit_clean synedit_distclean synedit_cleanall synedit_info synedit_makefiles synedit
-endif
-ifdef TARGET_DIRS_LAZCONTROLS
-lazcontrols_all:
-	$(MAKE) -C lazcontrols all
-lazcontrols_debug:
-	$(MAKE) -C lazcontrols debug
-lazcontrols_smart:
-	$(MAKE) -C lazcontrols smart
-lazcontrols_release:
-	$(MAKE) -C lazcontrols release
-lazcontrols_units:
-	$(MAKE) -C lazcontrols units
-lazcontrols_examples:
-	$(MAKE) -C lazcontrols examples
-lazcontrols_shared:
-	$(MAKE) -C lazcontrols shared
-lazcontrols_install:
-	$(MAKE) -C lazcontrols install
-lazcontrols_sourceinstall:
-	$(MAKE) -C lazcontrols sourceinstall
-lazcontrols_exampleinstall:
-	$(MAKE) -C lazcontrols exampleinstall
-lazcontrols_distinstall:
-	$(MAKE) -C lazcontrols distinstall
-lazcontrols_zipinstall:
-	$(MAKE) -C lazcontrols zipinstall
-lazcontrols_zipsourceinstall:
-	$(MAKE) -C lazcontrols zipsourceinstall
-lazcontrols_zipexampleinstall:
-	$(MAKE) -C lazcontrols zipexampleinstall
-lazcontrols_zipdistinstall:
-	$(MAKE) -C lazcontrols zipdistinstall
-lazcontrols_clean:
-	$(MAKE) -C lazcontrols clean
-lazcontrols_distclean:
-	$(MAKE) -C lazcontrols distclean
-lazcontrols_cleanall:
-	$(MAKE) -C lazcontrols cleanall
-lazcontrols_info:
-	$(MAKE) -C lazcontrols info
-lazcontrols_makefiles:
-	$(MAKE) -C lazcontrols makefiles
-lazcontrols:
-	$(MAKE) -C lazcontrols all
-.PHONY: lazcontrols_all lazcontrols_debug lazcontrols_smart lazcontrols_release lazcontrols_units lazcontrols_examples lazcontrols_shared lazcontrols_install lazcontrols_sourceinstall lazcontrols_exampleinstall lazcontrols_distinstall lazcontrols_zipinstall lazcontrols_zipsourceinstall lazcontrols_zipexampleinstall lazcontrols_zipdistinstall lazcontrols_clean lazcontrols_distclean lazcontrols_cleanall lazcontrols_info lazcontrols_makefiles lazcontrols
-endif
-all: $(addsuffix _all,$(TARGET_DIRS))
-debug: $(addsuffix _debug,$(TARGET_DIRS))
-smart: $(addsuffix _smart,$(TARGET_DIRS))
-release: $(addsuffix _release,$(TARGET_DIRS))
-units: $(addsuffix _units,$(TARGET_DIRS))
-examples: $(addsuffix _examples,$(TARGET_DIRS))
-shared: $(addsuffix _shared,$(TARGET_DIRS))
-install: $(addsuffix _install,$(TARGET_DIRS))
-sourceinstall: $(addsuffix _sourceinstall,$(TARGET_DIRS))
-exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
-zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
-zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
-zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
-zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS))
-distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
+debug:
+smart:
+release:
+units:
+examples:
+shared:
+install:
+sourceinstall:
+exampleinstall:
+distinstall:
+zipinstall:
+zipsourceinstall:
+zipexampleinstall:
+zipdistinstall:
+distclean: fpc_distclean
 info: fpc_info
-makefiles: fpc_makefiles $(addsuffix _makefiles,$(TARGET_DIRS))
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean info makefiles
+makefiles: fpc_makefiles
+.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean info makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-.PHONY: clean cleanall bigidecomponents bigideclean
-bigidecomponents: all
+.PHONY: help clean cleanall base bigide all
+help:
+	@$(ECHO)
+	@$(ECHO) " Targets"
+	@$(ECHO) "   all         build base and bigide components"
+	@$(ECHO) "   clean       deletes files that 'all' creates"
+	@$(ECHO) "   base        build synedit and lazcontrols"
+	@$(ECHO) "   bigide      build the extra packages for the bigide"
+base:
+	$(MAKE) -C synedit
+	$(MAKE) -C lazcontrols
+bigide:
 	$(MAKE) -C rtticontrols
 	$(MAKE) -C printers
 	$(MAKE) -C printers/design
@ -2223,6 +1479,7 @@ bigidecomponents: all
 	$(MAKE) -C externhelp
 	$(MAKE) -C tdbf
 	$(MAKE) -C sqldb
+all: base bigide
 cleanall:
 	$(MAKE) -C lazutils clean
 	$(MAKE) -C codetools clean
@ -2249,4 +1506,3 @@ cleanall:
 	$(MAKE) -C tdbf clean
 	$(MAKE) -C sqldb clean
 clean: cleanall
-bigideclean: clean
--- a/components/Makefile.fpc
+++ b/components/Makefile.fpc
@ -4,7 +4,7 @@
 #

 [target]
-dirs=lazutils codetools synedit lazcontrols
+dirs=

 [clean]
 files=$(wildcard ./units/*$(OEXT)) \
@ -18,57 +18,77 @@ files=$(wildcard ./units/*$(OEXT)) \
      $(wildcard ./custom/*$(RSTEXT))

 [rules]
-.PHONY: clean cleanall bigidecomponents bigideclean
+.PHONY: help clean cleanall base bigide all

-bigidecomponents: all
-        $(MAKE) -C rtticontrols
-        $(MAKE) -C printers
-        $(MAKE) -C printers/design
-        $(MAKE) -C turbopower_ipro
-        $(MAKE) -C turbopower_ipro/design
-        $(MAKE) -C fpcunit
-        $(MAKE) -C fpcunit/ide
-        $(MAKE) -C projecttemplates
-        $(MAKE) -C leakview
-        $(MAKE) -C memds
-        $(MAKE) -C sdf
-        $(MAKE) -C tachart
-        $(MAKE) -C todolist
-        $(MAKE) -C jcf2/IdePlugin/lazarus
-        $(MAKE) -C chmhelp/packages/help
-        $(MAKE) -C chmhelp/packages/idehelp
-        $(MAKE) -C instantfpc
-        $(MAKE) -C externhelp
-        $(MAKE) -C tdbf
-        $(MAKE) -C sqldb
+#-----------------------------------------------------------------------------
+help:
+	@$(ECHO)
+	@$(ECHO) " Targets"
+	@$(ECHO) "   all         build base and bigide components"
+	@$(ECHO) "   clean       deletes files that 'all' creates"
+	@$(ECHO) "   base        build synedit and lazcontrols"
+	@$(ECHO) "   bigide      build the extra packages for the bigide"
+
+#-----------------------------------------------------------------------------
+# build synedit and lazcontrols, needed by the minimum IDE
+# lazutils is needed by the LCL, do not build it again
+# (otherwise it will alter the date of lazutils.compiled)
+# codetools is built when building lazbuild, do not build it again
+base:
+	$(MAKE) -C synedit
+	$(MAKE) -C lazcontrols
+
+#-----------------------------------------------------------------------------
+# build the extra packages needed by the bigide
+bigide:
+	$(MAKE) -C rtticontrols
+	$(MAKE) -C printers
+	$(MAKE) -C printers/design
+	$(MAKE) -C turbopower_ipro
+	$(MAKE) -C turbopower_ipro/design
+	$(MAKE) -C fpcunit
+	$(MAKE) -C fpcunit/ide
+	$(MAKE) -C projecttemplates
+	$(MAKE) -C leakview
+	$(MAKE) -C memds
+	$(MAKE) -C sdf
+	$(MAKE) -C tachart
+	$(MAKE) -C todolist
+	$(MAKE) -C jcf2/IdePlugin/lazarus
+	$(MAKE) -C chmhelp/packages/help
+	$(MAKE) -C chmhelp/packages/idehelp
+	$(MAKE) -C instantfpc
+	$(MAKE) -C externhelp
+	$(MAKE) -C tdbf
+	$(MAKE) -C sqldb
+
+all: base bigide

 cleanall:
-        $(MAKE) -C lazutils clean
-        $(MAKE) -C codetools clean
-        $(MAKE) -C synedit clean
-        $(MAKE) -C lazcontrols clean
-        $(MAKE) -C rtticontrols clean
-        $(MAKE) -C printers clean
-        $(MAKE) -C printers/design clean
-        $(MAKE) -C turbopower_ipro clean
-        $(MAKE) -C turbopower_ipro/design clean
-        $(MAKE) -C fpcunit clean
-        $(MAKE) -C fpcunit/ide clean
-        $(MAKE) -C projecttemplates clean
-        $(MAKE) -C leakview clean
-        $(MAKE) -C memds clean
-        $(MAKE) -C sdf clean
-        $(MAKE) -C tachart clean
-        $(MAKE) -C todolist clean
-        $(MAKE) -C jcf2/IdePlugin/lazarus clean
-        $(MAKE) -C chmhelp/packages/help clean
-        $(MAKE) -C chmhelp/packages/idehelp clean
-        $(MAKE) -C instantfpc clean
-        $(MAKE) -C externhelp clean
-        $(MAKE) -C tdbf clean
-        $(MAKE) -C sqldb clean
+	$(MAKE) -C lazutils clean
+	$(MAKE) -C codetools clean
+	$(MAKE) -C synedit clean
+	$(MAKE) -C lazcontrols clean
+	$(MAKE) -C rtticontrols clean
+	$(MAKE) -C printers clean
+	$(MAKE) -C printers/design clean
+	$(MAKE) -C turbopower_ipro clean
+	$(MAKE) -C turbopower_ipro/design clean
+	$(MAKE) -C fpcunit clean
+	$(MAKE) -C fpcunit/ide clean
+	$(MAKE) -C projecttemplates clean
+	$(MAKE) -C leakview clean
+	$(MAKE) -C memds clean
+	$(MAKE) -C sdf clean
+	$(MAKE) -C tachart clean
+	$(MAKE) -C todolist clean
+	$(MAKE) -C jcf2/IdePlugin/lazarus clean
+	$(MAKE) -C chmhelp/packages/help clean
+	$(MAKE) -C chmhelp/packages/idehelp clean
+	$(MAKE) -C instantfpc clean
+	$(MAKE) -C externhelp clean
+	$(MAKE) -C tdbf clean
+	$(MAKE) -C sqldb clean

 clean: cleanall

-bigideclean: clean
-
--- a/examples/Makefile
+++ b/examples/Makefile
@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/11]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/09]
 #
 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 mips-linux mipsel-linux
+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-openbsd 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 mips-linux mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@ -292,7 +292,7 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=lazarus-examples
-override PACKAGE_VERSION=0.9b
+override PACKAGE_VERSION=1.0
 ifndef LCL_PLATFORM
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 LCL_PLATFORM=win32
@ -447,6 +447,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
@ -639,6 +642,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard trayicon/*$(OEXT)) $(wildcard trayicon/*$(PPUEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*.or) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard trayicon/*$(OEXT)) $(wildcard trayicon/*$(PPUEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*.or) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard trayicon/*$(OEXT)) $(wildcard trayicon/*$(PPUEXT)) $(wildcard units/$(CPU_TARGET)-$(OS_TARGET)/*.or) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
@ -831,6 +837,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override COMPILER_OPTIONS+=-gl
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override COMPILER_OPTIONS+=-gl
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_OPTIONS+=-gl
 endif
@ -1023,6 +1032,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
@ -2065,6 +2077,14 @@ REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_FPMKUNIT=1
+REQUIRE_PACKAGES_REGEXPR=1
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@ -3062,6 +3082,7 @@ help:
 	@$(ECHO)
 	@$(ECHO) " Targets"
 	@$(ECHO) "   all    build all simple examples"
+	@$(ECHO) "          Requires LCL and basecomponents, see make help of main directory"
 	@$(ECHO) "          Note: There are more complex examples in the sub directories."
 	@$(ECHO) "   clean  deletes files that 'all' creates"
 	@$(ECHO)
--- a/examples/Makefile.fpc
+++ b/examples/Makefile.fpc
@ -4,7 +4,7 @@

 [package]
 name=lazarus-examples
-version=0.9b
+version=1.0

 [target]
 units=hello \
@ -111,6 +111,7 @@ help:
 	@$(ECHO)
 	@$(ECHO) " Targets"
 	@$(ECHO) "   all    build all simple examples"
+	@$(ECHO) "          Requires LCL and basecomponents, see make help of main directory"
 	@$(ECHO) "          Note: There are more complex examples in the sub directories."
 	@$(ECHO) "   clean  deletes files that 'all' creates"
 	@$(ECHO)
--- a/lcl/Makefile.fpc
+++ b/lcl/Makefile.fpc
@ -139,31 +139,31 @@ help:
 	@$(ECHO)

 cleartarget:
-        -$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT)
+	-$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT)

 lclbase: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) compiled

 compiled:
-        $(CPPROG) -f $(STATEFILE) $(COMPILER_UNITTARGETDIR)/LCLBase.compiled
+	$(CPPROG) -f $(STATEFILE) $(COMPILER_UNITTARGETDIR)/LCLBase.compiled

 intf: $(TARGET_DIRS)

 cleanintf:
-        $(MAKE) -C interfaces clean
+	$(MAKE) -C interfaces clean

 all: lclbase compiled intf

 cleanlaz: cleanall
 cleanall: clean
-        $(MAKE) -C interfaces clean
-        $(MAKE) -C interfaces/carbon clean
-        $(MAKE) -C interfaces/cocoa clean
-        $(MAKE) -C interfaces/customdrawn clean
-        $(MAKE) -C interfaces/fpgui clean
-        $(MAKE) -C interfaces/gtk clean
-        $(MAKE) -C interfaces/gtk2 clean
-        $(MAKE) -C interfaces/nogui clean
-        $(MAKE) -C interfaces/qt clean
-        $(MAKE) -C interfaces/win32 clean
-        $(MAKE) -C interfaces/wince clean
+	$(MAKE) -C interfaces clean
+	$(MAKE) -C interfaces/carbon clean
+	$(MAKE) -C interfaces/cocoa clean
+	$(MAKE) -C interfaces/customdrawn clean
+	$(MAKE) -C interfaces/fpgui clean
+	$(MAKE) -C interfaces/gtk clean
+	$(MAKE) -C interfaces/gtk2 clean
+	$(MAKE) -C interfaces/nogui clean
+	$(MAKE) -C interfaces/qt clean
+	$(MAKE) -C interfaces/win32 clean
+	$(MAKE) -C interfaces/wince clean

--- a/tools/Makefile
+++ b/tools/Makefile
@ -292,207 +292,8 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=lazarus-tools
-override PACKAGE_VERSION=0.9b
+override PACKAGE_VERSION=1.0
 LAZDIR=..
-ifndef LCL_PLATFORM
-LCL_PLATFORM=nogui
-endif
-export LCL_PLATFORM
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_DIRS+=apiwizz
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_DIRS+=apiwizz
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
 endif
@ -884,199 +685,199 @@ ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_TARGETDIR+=.
@ -2925,263 +2726,23 @@ endif
 fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
-ifeq ($(FULL_TARGET),i386-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-openbsd)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),mips-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-TARGET_DIRS_APIWIZZ=1
-endif
-ifdef TARGET_DIRS_APIWIZZ
-apiwizz_all:
-	$(MAKE) -C apiwizz all
-apiwizz_debug:
-	$(MAKE) -C apiwizz debug
-apiwizz_smart:
-	$(MAKE) -C apiwizz smart
-apiwizz_release:
-	$(MAKE) -C apiwizz release
-apiwizz_units:
-	$(MAKE) -C apiwizz units
-apiwizz_examples:
-	$(MAKE) -C apiwizz examples
-apiwizz_shared:
-	$(MAKE) -C apiwizz shared
-apiwizz_install:
-	$(MAKE) -C apiwizz install
-apiwizz_sourceinstall:
-	$(MAKE) -C apiwizz sourceinstall
-apiwizz_exampleinstall:
-	$(MAKE) -C apiwizz exampleinstall
-apiwizz_distinstall:
-	$(MAKE) -C apiwizz distinstall
-apiwizz_zipinstall:
-	$(MAKE) -C apiwizz zipinstall
-apiwizz_zipsourceinstall:
-	$(MAKE) -C apiwizz zipsourceinstall
-apiwizz_zipexampleinstall:
-	$(MAKE) -C apiwizz zipexampleinstall
-apiwizz_zipdistinstall:
-	$(MAKE) -C apiwizz zipdistinstall
-apiwizz_clean:
-	$(MAKE) -C apiwizz clean
-apiwizz_distclean:
-	$(MAKE) -C apiwizz distclean
-apiwizz_cleanall:
-	$(MAKE) -C apiwizz cleanall
-apiwizz_info:
-	$(MAKE) -C apiwizz info
-apiwizz_makefiles:
-	$(MAKE) -C apiwizz makefiles
-apiwizz:
-	$(MAKE) -C apiwizz all
-.PHONY: apiwizz_all apiwizz_debug apiwizz_smart apiwizz_release apiwizz_units apiwizz_examples apiwizz_shared apiwizz_install apiwizz_sourceinstall apiwizz_exampleinstall apiwizz_distinstall apiwizz_zipinstall apiwizz_zipsourceinstall apiwizz_zipexampleinstall apiwizz_zipdistinstall apiwizz_clean apiwizz_distclean apiwizz_cleanall apiwizz_info apiwizz_makefiles apiwizz
-endif
 debug: fpc_debug
 smart: fpc_smart
 release: fpc_release
-units: fpc_units $(addsuffix _units,$(TARGET_DIRS))
-examples: $(addsuffix _examples,$(TARGET_DIRS))
+units: fpc_units
+examples:
 shared: fpc_shared
-install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
+install: fpc_install
 sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
+exampleinstall: fpc_exampleinstall
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
-zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
+zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
-distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
+clean: fpc_clean
+distclean: fpc_distclean
+cleanall: fpc_cleanall
 info: fpc_info
 makefiles: fpc_makefiles
 .PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
@ -3189,7 +2750,7 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .PHONY: all
-all: apiwizz_all
+all:
 	echo $(LAZARUS_LIBPATHS)
 	$(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
 	$(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT)
--- a/tools/Makefile.fpc
+++ b/tools/Makefile.fpc
@ -5,10 +5,10 @@

 [package]
 name=lazarus-tools
-version=0.9b
+version=1.0

 [target]
-dirs=apiwizz
+dirs=
 programs=lazres svn2revisioninc updatepofiles lrstolfm

 [require]
@ -19,23 +19,17 @@ packages=rtl
 options=-gl $(LAZARUS_LIBPATHS)
 unitdir=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) \
          $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-          $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+          $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
 unittargetdir=.
 targetdir=.

 [prerules]
 LAZDIR=..

-# LCL Platform
-ifndef LCL_PLATFORM
-LCL_PLATFORM=nogui
-endif
-export LCL_PLATFORM
-
 [rules]
 .PHONY: all

-all: apiwizz_all
+all:
        echo $(LAZARUS_LIBPATHS)
        $(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
        $(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT)
--- a/tools/apiwizz/Makefile
+++ b/tools/apiwizz/Makefile
@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/10/17]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/09]
 #
 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
+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-openbsd 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 mips-linux mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@ -152,12 +152,6 @@ ifdef OS_TARGET_DEFAULT
 OS_TARGET=$(OS_TARGET_DEFAULT)
 endif
 endif
-ifneq ($(words $(FPC_COMPILERINFO)),5)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
-endif
 ifndef CPU_SOURCE
 CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
 endif
@ -298,15 +292,12 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=lazarus-apiwizz
-override PACKAGE_VERSION=0.7a
+override PACKAGE_VERSION=1.0
 LAZDIR=../..
 ifndef LCL_PLATFORM
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 LCL_PLATFORM=win32
 else
-ifeq ($(OS_TARGET),wince)
-LCL_PLATFORM=wince
-else
 ifeq ($(OS_TARGET),darwin)
 LCL_PLATFORM=carbon
 else
@ -314,7 +305,6 @@ LCL_PLATFORM=gtk2
 endif
 endif
 endif
-endif
 export LCL_PLATFORM
 ifeq ($(OS_TARGET),darwin)
 ifneq ($(LCL_PLATFORM),carbon)
@ -456,6 +446,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override TARGET_PROGRAMS+=apiwizz
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override TARGET_PROGRAMS+=apiwizz
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_PROGRAMS+=apiwizz
 endif
@ -507,6 +500,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_PROGRAMS+=apiwizz
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override TARGET_PROGRAMS+=apiwizz
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override TARGET_PROGRAMS+=apiwizz
 endif
@ -645,6 +641,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override CLEAN_UNITS+=apiwizard
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override CLEAN_UNITS+=apiwizard
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override CLEAN_UNITS+=apiwizard
 endif
@ -696,6 +695,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override CLEAN_UNITS+=apiwizard
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override CLEAN_UNITS+=apiwizard
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override CLEAN_UNITS+=apiwizard
 endif
@ -834,6 +836,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override CLEAN_FILES+=*.or
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override CLEAN_FILES+=*.or
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override CLEAN_FILES+=*.or
 endif
@ -885,6 +890,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override CLEAN_FILES+=*.or
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override CLEAN_FILES+=*.or
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override CLEAN_FILES+=*.or
 endif
@ -1023,6 +1031,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
@ -1074,6 +1085,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
@ -1212,6 +1226,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@ -1263,6 +1280,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@ -1401,6 +1421,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override COMPILER_TARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override COMPILER_TARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_TARGETDIR+=.
 endif
@ -1452,6 +1475,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_TARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_TARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_TARGETDIR+=.
 endif
@ -1590,6 +1616,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 override COMPILER_UNITTARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+override COMPILER_UNITTARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_UNITTARGETDIR+=.
 endif
@ -1641,6 +1670,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_UNITTARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+override COMPILER_UNITTARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_UNITTARGETDIR+=.
 endif
@ -1854,6 +1886,7 @@ SHAREDLIBPREFIX=libfp
 STATICLIBPREFIX=libp
 IMPORTLIBPREFIX=libimp
 RSTEXT=.rst
+EXEDBGEXT=.dbg
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
 SHORTSUFFIX=v1
@ -1975,6 +2008,7 @@ BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
+EXEDBGEXT=.dSYM
 endif
 ifeq ($(OS_TARGET),gba)
 EXEEXT=.gba
@ -2226,25 +2260,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
 else
 DATESTR=
 endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=1
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
@ -2390,6 +2405,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),x86_64-openbsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
 endif
@ -2441,6 +2459,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),mips-linux)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@ -2493,6 +2514,7 @@ override FPCOPT+=-P$(ARCH)
 endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
@ -2502,6 +2524,11 @@ ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+ifndef CROSSCOMPILE
+ifneq ($(BINUTILSPREFIX),)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@ -2593,7 +2620,7 @@ override FPCOPT+=-Aas
 endif
 endif
 ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifneq ($(findstring $(OS_TARGET),linux solaris),)
+ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
 ifeq ($(CPU_TARGET),x86_64)
 override FPCOPT+=-Cg
 endif
@ -2640,9 +2667,11 @@ ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
 override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+override CLEANEXEDBGFILES+=$(EXEDBGFILES)
 ifeq ($(OS_TARGET),os2)
 override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
@ -2753,9 +2782,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
 	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
 	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@ -2889,9 +2915,11 @@ fpc_zipdistinstall:
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
 override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
+override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES))
 endif
 ifdef CLEAN_PROGRAMS
 override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
+override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS)))
 endif
 ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
@ -2908,6 +2936,9 @@ fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
 endif
+ifdef CLEANEXEDBGFILES
+	-$(DELTREE) $(CLEANEXEDBGFILES)
+endif
 ifdef CLEANPPUFILES
 	-$(DEL) $(CLEANPPUFILES)
 endif
@ -3009,7 +3040,6 @@ fpc_baseinfo:
 	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
--- a/tools/apiwizz/Makefile.fpc
+++ b/tools/apiwizz/Makefile.fpc
@ -4,7 +4,7 @@

 [package]
 name=lazarus-apiwizz
-version=0.7a
+version=1.0

 [target]
 programs=apiwizz
@ -31,9 +31,6 @@ ifndef LCL_PLATFORM
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 LCL_PLATFORM=win32
 else
-ifeq ($(OS_TARGET),wince)
-LCL_PLATFORM=wince
-else
 ifeq ($(OS_TARGET),darwin)
 LCL_PLATFORM=carbon
 else
@ -41,7 +38,6 @@ LCL_PLATFORM=gtk2
 endif
 endif
 endif
-endif
 export LCL_PLATFORM

 ifeq ($(OS_TARGET),darwin)