* Regenned all makefiles before 2.6.x branching.

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

2 files changed, 204 insertions, 6 deletions

diff --git a/packages/openal/Makefile b/packages/openal/Makefile
index 88b4e9cd90..05cd8f60f4 100644
--- a/packages/openal/Makefile
+++ b/packages/openal/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03]
 #
 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 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-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
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -264,6 +264,30 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(FPCPROG),)
+FPCPROG:=$(firstword $(FPCPROG))
+FPCFPMAKE:=$(shell $(FPCPROG) -PB)
+ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
+FPCFPMAKE:=$(firstword $(FPCPROG))
+endif
+else
+override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+FPMAKE_SKIP_CONFIG=-n
+export FPCFPMAKE
+export FPMAKE_SKIP_CONFIG
+endif
+else
+FPMAKE_SKIP_CONFIG=-n
+FPCFPMAKE=$(FPC)
+endif
+endif
 override PACKAGE_NAME=openal
 override PACKAGE_VERSION=2.5.1
 ifeq ($(FULL_TARGET),i386-linux)
@@ -377,6 +401,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_UNITS+=openal
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_UNITS+=openal
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_UNITS+=openal
 endif
@@ -563,6 +590,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_EXAMPLEDIRS+=examples
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_EXAMPLEDIRS+=examples
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -750,6 +780,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_INCLUDEDIR+=src
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_INCLUDEDIR+=src
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_INCLUDEDIR+=src
 endif
@@ -936,6 +969,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override COMPILER_SOURCEDIR+=src tests examples
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_SOURCEDIR+=src tests examples
 endif
@@ -1357,6 +1393,11 @@ ifeq ($(OS_TARGET),NativeNT)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1893,6 +1934,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1976,6 +2020,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
@@ -1993,6 +2046,9 @@ endif
 ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
+ifdef UNITDIR_FPMAKE_RTL
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
+endif
 endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
@@ -2105,7 +2161,7 @@ override FPCOPT+=-Aas
 endif
 endif
 ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
+ifneq ($(findstring $(OS_TARGET),linux solaris),)
 ifeq ($(CPU_TARGET),x86_64)
 override FPCOPT+=-Cg
 endif
@@ -2500,6 +2556,7 @@ fpc_baseinfo:
 	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)
 	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)
+	@$(ECHO)  FPC fpmake... $(FPCFPMAKE)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)
@@ -2698,6 +2755,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+TARGET_EXAMPLEDIRS_EXAMPLES=1
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
diff --git a/packages/openal/examples/Makefile b/packages/openal/examples/Makefile
index 827c1ff6ec..ed87983eb7 100644
--- a/packages/openal/examples/Makefile
+++ b/packages/openal/examples/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03]
 #
 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 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-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
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -264,6 +264,30 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(FPCPROG),)
+FPCPROG:=$(firstword $(FPCPROG))
+FPCFPMAKE:=$(shell $(FPCPROG) -PB)
+ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
+FPCFPMAKE:=$(firstword $(FPCPROG))
+endif
+else
+override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+FPMAKE_SKIP_CONFIG=-n
+export FPCFPMAKE
+export FPMAKE_SKIP_CONFIG
+endif
+else
+FPMAKE_SKIP_CONFIG=-n
+FPCFPMAKE=$(FPC)
+endif
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=captureplaybackopenal wavopenal  madopenal
 endif
@@ -375,6 +399,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_PROGRAMS+=captureplaybackopenal wavopenal
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_PROGRAMS+=captureplaybackopenal wavopenal
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_PROGRAMS+=captureplaybackopenal wavopenal  madopenal
 endif
@@ -797,6 +824,11 @@ ifeq ($(OS_TARGET),NativeNT)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1559,6 +1591,15 @@ REQUIRE_PACKAGES_DTS=1
 REQUIRE_PACKAGES_MODPLUG=1
 REQUIRE_PACKAGES_MATROSKA=1
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENAL=1
+REQUIRE_PACKAGES_OGGVORBIS=1
+REQUIRE_PACKAGES_A52=1
+REQUIRE_PACKAGES_DTS=1
+REQUIRE_PACKAGES_MODPLUG=1
+REQUIRE_PACKAGES_MATROSKA=1
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENAL=1
@@ -1798,6 +1839,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
@@ -1815,6 +1865,9 @@ endif
 ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
+ifdef UNITDIR_FPMAKE_RTL
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
+endif
 endif
 ifdef REQUIRE_PACKAGES_OPENAL
 PACKAGEDIR_OPENAL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /openal/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1824,6 +1877,15 @@ UNITDIR_OPENAL=$(PACKAGEDIR_OPENAL)/units/$(TARGETSUFFIX)
 else
 UNITDIR_OPENAL=$(PACKAGEDIR_OPENAL)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_OPENAL)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_OPENAL=$(PACKAGEDIR_OPENAL)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_OPENAL)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_OPENAL=$(PACKAGEDIR_OPENAL)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_OPENAL=$(PACKAGEDIR_OPENAL)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OPENAL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OPENAL) $(FPCMADE)
@@ -1841,6 +1903,9 @@ endif
 ifdef UNITDIR_OPENAL
 override COMPILER_UNITDIR+=$(UNITDIR_OPENAL)
 endif
+ifdef UNITDIR_FPMAKE_OPENAL
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENAL)
+endif
 endif
 ifdef REQUIRE_PACKAGES_OGGVORBIS
 PACKAGEDIR_OGGVORBIS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oggvorbis/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1850,6 +1915,15 @@ UNITDIR_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)/units/$(TARGETSUFFIX)
 else
 UNITDIR_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_OGGVORBIS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_OGGVORBIS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OGGVORBIS)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OGGVORBIS) $(FPCMADE)
@@ -1867,6 +1941,9 @@ endif
 ifdef UNITDIR_OGGVORBIS
 override COMPILER_UNITDIR+=$(UNITDIR_OGGVORBIS)
 endif
+ifdef UNITDIR_FPMAKE_OGGVORBIS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OGGVORBIS)
+endif
 endif
 ifdef REQUIRE_PACKAGES_A52
 PACKAGEDIR_A52:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /a52/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1876,6 +1953,15 @@ UNITDIR_A52=$(PACKAGEDIR_A52)/units/$(TARGETSUFFIX)
 else
 UNITDIR_A52=$(PACKAGEDIR_A52)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_A52)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_A52=$(PACKAGEDIR_A52)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_A52)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_A52=$(PACKAGEDIR_A52)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_A52=$(PACKAGEDIR_A52)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_A52)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_A52) $(FPCMADE)
@@ -1893,6 +1979,9 @@ endif
 ifdef UNITDIR_A52
 override COMPILER_UNITDIR+=$(UNITDIR_A52)
 endif
+ifdef UNITDIR_FPMAKE_A52
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_A52)
+endif
 endif
 ifdef REQUIRE_PACKAGES_DTS
 PACKAGEDIR_DTS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /dts/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1902,6 +1991,15 @@ UNITDIR_DTS=$(PACKAGEDIR_DTS)/units/$(TARGETSUFFIX)
 else
 UNITDIR_DTS=$(PACKAGEDIR_DTS)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_DTS)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_DTS=$(PACKAGEDIR_DTS)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_DTS)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_DTS=$(PACKAGEDIR_DTS)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_DTS=$(PACKAGEDIR_DTS)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_DTS)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_DTS) $(FPCMADE)
@@ -1919,6 +2017,9 @@ endif
 ifdef UNITDIR_DTS
 override COMPILER_UNITDIR+=$(UNITDIR_DTS)
 endif
+ifdef UNITDIR_FPMAKE_DTS
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_DTS)
+endif
 endif
 ifdef REQUIRE_PACKAGES_MODPLUG
 PACKAGEDIR_MODPLUG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /modplug/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1928,6 +2029,15 @@ UNITDIR_MODPLUG=$(PACKAGEDIR_MODPLUG)/units/$(TARGETSUFFIX)
 else
 UNITDIR_MODPLUG=$(PACKAGEDIR_MODPLUG)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_MODPLUG)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_MODPLUG=$(PACKAGEDIR_MODPLUG)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_MODPLUG)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_MODPLUG=$(PACKAGEDIR_MODPLUG)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_MODPLUG=$(PACKAGEDIR_MODPLUG)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MODPLUG)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MODPLUG) $(FPCMADE)
@@ -1945,6 +2055,9 @@ endif
 ifdef UNITDIR_MODPLUG
 override COMPILER_UNITDIR+=$(UNITDIR_MODPLUG)
 endif
+ifdef UNITDIR_FPMAKE_MODPLUG
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MODPLUG)
+endif
 endif
 ifdef REQUIRE_PACKAGES_MATROSKA
 PACKAGEDIR_MATROSKA:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /matroska/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1954,6 +2067,15 @@ UNITDIR_MATROSKA=$(PACKAGEDIR_MATROSKA)/units/$(TARGETSUFFIX)
 else
 UNITDIR_MATROSKA=$(PACKAGEDIR_MATROSKA)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_MATROSKA)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_MATROSKA=$(PACKAGEDIR_MATROSKA)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_MATROSKA)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_MATROSKA=$(PACKAGEDIR_MATROSKA)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_MATROSKA=$(PACKAGEDIR_MATROSKA)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MATROSKA)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MATROSKA) $(FPCMADE)
@@ -1971,6 +2093,9 @@ endif
 ifdef UNITDIR_MATROSKA
 override COMPILER_UNITDIR+=$(UNITDIR_MATROSKA)
 endif
+ifdef UNITDIR_FPMAKE_MATROSKA
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MATROSKA)
+endif
 endif
 ifdef REQUIRE_PACKAGES_MAD
 PACKAGEDIR_MAD:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mad/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1980,6 +2105,15 @@ UNITDIR_MAD=$(PACKAGEDIR_MAD)/units/$(TARGETSUFFIX)
 else
 UNITDIR_MAD=$(PACKAGEDIR_MAD)
 endif
+ifneq ($(wildcard $(PACKAGEDIR_MAD)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_MAD=$(PACKAGEDIR_MAD)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_MAD)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_MAD=$(PACKAGEDIR_MAD)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_MAD=$(PACKAGEDIR_MAD)
+endif
+endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MAD)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MAD) $(FPCMADE)
@@ -1997,6 +2131,9 @@ endif
 ifdef UNITDIR_MAD
 override COMPILER_UNITDIR+=$(UNITDIR_MAD)
 endif
+ifdef UNITDIR_FPMAKE_MAD
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MAD)
+endif
 endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
@@ -2109,7 +2246,7 @@ override FPCOPT+=-Aas
 endif
 endif
 ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
+ifneq ($(findstring $(OS_TARGET),linux solaris),)
 ifeq ($(CPU_TARGET),x86_64)
 override FPCOPT+=-Cg
 endif
@@ -2408,6 +2545,7 @@ fpc_baseinfo:
 	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)
 	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)
+	@$(ECHO)  FPC fpmake... $(FPCFPMAKE)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)