diff --git a/components/printers/Makefile b/components/printers/Makefile
index 3708643e04..e95d035a39 100644
--- a/components/printers/Makefile
+++ b/components/printers/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/06]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/02/20]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -412,9 +412,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_UNITS+=printer4lazarus.pas
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=printer4lazarus.pas
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -574,170 +571,164 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_INCLUDEDIR+=unix/ win32/ carbon/ ./
@@ -898,9 +889,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_INCLUDEDIR+=unix/ win32/ carbon/ ./
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_INCLUDEDIR+=unix/ win32/ carbon/ ./
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=unix/ win32/ carbon/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
 endif
@@ -1060,9 +1048,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_UNITDIR+=unix/ win32/ carbon/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_UNITDIR+=unix/ win32/ carbon/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1222,9 +1207,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -2132,9 +2114,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
diff --git a/components/printers/Makefile.fpc b/components/printers/Makefile.fpc
index 4066fff250..443efd592d 100644
--- a/components/printers/Makefile.fpc
+++ b/components/printers/Makefile.fpc
@@ -1,4 +1,8 @@
+#   File generated automatically by Lazarus Package Manager
+#
 #   Makefile.fpc for Printer4Lazarus 0.5
+#
+#   This file was generated on 26-3-08
 
 [package]
 name=printer4lazarus
@@ -8,7 +12,7 @@ version=0.5
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
 unitdir=unix/ win32/ carbon/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
 includedir=unix/ win32/ carbon/ ./
-options=-dUseCache  -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+options=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
 
 [target]
 units=printer4lazarus.pas