* patch from Olivier

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@10428 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 17 insertions, 3 deletions

diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile
index 3ad3a0206f..5a136a9a79 100644
--- a/packages/pxlib/Makefile
+++ b/packages/pxlib/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/14]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/01]
 #
 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
+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
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -251,6 +251,9 @@ endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 override TARGET_UNITS+=pxlib
 endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_UNITS+=pxlib
+endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=pxlib
 endif
@@ -314,6 +317,9 @@ endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 override TARGET_EXAMPLES+=ppxview
 endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_EXAMPLES+=ppxview
+endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLES+=ppxview
 endif
@@ -528,6 +534,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_SOURCEDIR+=src
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1435,6 +1444,9 @@ 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),)
@@ -1615,7 +1627,7 @@ endif
 endif
 endif
 .PHONY: fpc_units
-ifneq ($(TARGET_UNITS),)
+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
diff --git a/packages/pxlib/Makefile.fpc b/packages/pxlib/Makefile.fpc
index 6752e7ce9f..03addbc4e9 100644
--- a/packages/pxlib/Makefile.fpc
+++ b/packages/pxlib/Makefile.fpc
@@ -7,12 +7,14 @@ name=pxlib
 version=2.0.0
 
 [target]
+units_beos=pxlib
 units_linux=pxlib
 units_win32=pxlib
 units_darwin=pxlib
 units_freebsd=pxlib
 units_openbsd=pxlib
 units_netbsd=pxlib
+examples_beos=ppxview
 examples_linux=ppxview
 examples_win32=ppxview
 examples_darwin=ppxview