* manually merged r26132-r26133 from trunk (fixes cross-building)

git-svn-id: branches/fixes_2_6@26134 -

utils/fpdoc/Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-25 rev 23995]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-11-16 rev 26097]
 #
 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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
+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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku aix
-LIMIT83fs = go32v2 os2 emx watcom
+LIMIT83fs = go32v2 os2 emx watcom msdos
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
@@ -265,6 +265,7 @@ endif
 ifndef BINUTILSPREFIX
 ifndef CROSSBINDIR
 ifdef CROSSCOMPILE
+ifneq ($(OS_TARGET),msdos)
 ifndef DARWIN2DARWIN
 ifneq ($(CPU_TARGET),jvm)
 BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
@@ -283,6 +284,9 @@ endif
 endif
 endif
 endif
+else
+BINUTILSPREFIX=$(OS_TARGET)-
+endif
 endif
 endif
 endif
@@ -533,6 +537,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart
 endif
+ifeq ($(FULL_TARGET),i8086-msdos)
+override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc
 endif
@@ -749,6 +756,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc
 endif
+ifeq ($(FULL_TARGET),i8086-msdos)
+override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf dw_dxml fpdocproj fpdocxmlopts mkfpdoc
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst
 endif
@@ -965,6 +975,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst
 endif
+ifeq ($(FULL_TARGET),i8086-msdos)
+override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst fpdocopts.rst
+endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_OPTIONS+=-S2h
@@ -1182,6 +1195,9 @@ endif
 ifeq ($(FULL_TARGET),jvm-android)
 override COMPILER_OPTIONS+=-S2h
 endif
+ifeq ($(FULL_TARGET),i8086-msdos)
+override COMPILER_OPTIONS+=-S2h
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1592,6 +1608,11 @@ SHAREDLIBEXT=.jar
 SHORTSUFFIX=android
 endif
 endif
+ifeq ($(OS_TARGET),msdos)
+STATICLIBPREFIX=
+STATICLIBEXT=.a
+SHORTSUFFIX=d16
+endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -1745,6 +1766,15 @@ PPUMOVE:=$(firstword $(PPUMOVE))
 endif
 endif
 export PPUMOVE
+ifndef BIN2OBJ
+BIN2OBJ:=$(strip $(wildcard $(addsuffix /bin2obj$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(BIN2OBJ),)
+BIN2OBJ= __missing_command_BIN2OBJ
+else
+BIN2OBJ:=$(firstword $(BIN2OBJ))
+endif
+endif
+export BIN2OBJ
 ifndef FPCMAKE
 FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(FPCMAKE),)
@@ -1781,6 +1811,7 @@ ASNAME=$(BINUTILSPREFIX)as
 LDNAME=$(BINUTILSPREFIX)ld
 ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
+NASMNAME=$(BINUTILSPREFIX)nasm
 ifndef ASPROG
 ifdef CROSSBINDIR
 ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@@ -1809,10 +1840,18 @@ else
 ARPROG=$(ARNAME)
 endif
 endif
+ifndef NASMPROG
+ifdef CROSSBINDIR
+NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)
+else
+NASMPROG=$(NASMNAME)
+endif
+endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
 AR=$(ARPROG)
+NASM=$(NASMPROG)
 ifdef inUnix
 PPAS=./ppas$(SRCBATCHEXT)
 else
@@ -2441,6 +2480,14 @@ REQUIRE_PACKAGES_FCL-PASSRC=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 REQUIRE_PACKAGES_CHM=1
 endif
+ifeq ($(FULL_TARGET),i8086-msdos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_FCL-PASSRC=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_CHM=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -3339,6 +3386,15 @@ 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
+ifndef BIN2OBJ
+BIN2OBJ:=$(strip $(wildcard $(addsuffix /bin2obj$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(BIN2OBJ),)
+BIN2OBJ= __missing_command_BIN2OBJ
+else
+BIN2OBJ:=$(firstword $(BIN2OBJ))
+endif
+endif
+export BIN2OBJ
 all: fpc_all
 debug: fpc_debug
 smart: fpc_smart
@@ -3367,11 +3423,9 @@ endif
 fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\
   dw_latex.pp dwlinear.pp dw_txt.pp dw_linrtf.pp css.inc plusimage.inc minusimage.inc
 makeskel$(EXEEXT): makeskel.pp dglobals.pp
-css.inc: fpdoc.css ../bin2obj$(EXEEXT)
-	../bin2obj$(SRCEXEEXT) -o css.inc -c DefaultCSS fpdoc.css
-plusimage.inc: images/plus.png ../bin2obj$(SRCEXEEXT)
-	../bin2obj$(SRCEXEEXT) -o plusimage.inc -c PlusImageData images/plus.png
-minusimage.inc: images/minus.png ../bin2obj$(SRCEXEEXT)
-	../bin2obj$(SRCEXEEXT) -o minusimage.inc -c MinusImageData images/minus.png
-../bin2obj$(SRCEXEEXT):
-	$(MAKE) -C .. bin2obj$(SRCEXEEXT)
+css.inc: fpdoc.css
+	$(BIN2OBJ) -o css.inc -c DefaultCSS fpdoc.css
+plusimage.inc: images/plus.png
+	$(BIN2OBJ) -o plusimage.inc -c PlusImageData images/plus.png
+minusimage.inc: images/minus.png
+	$(BIN2OBJ) -o minusimage.inc -c MinusImageData images/minus.png

utils/fpdoc/Makefile.fpc

@@ -9,6 +9,7 @@ version=2.6.3
 [require]
 packages=fcl-base fcl-xml fcl-passrc fcl-process chm
 packages_darwin=univint
+tools=bin2obj
 
 [target]
 programs=fpdoc makeskel unitdiff fpclasschart
@@ -37,14 +38,12 @@ fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\
 
 makeskel$(EXEEXT): makeskel.pp dglobals.pp
 
-css.inc: fpdoc.css ../bin2obj$(EXEEXT)
-	../bin2obj$(SRCEXEEXT) -o css.inc -c DefaultCSS fpdoc.css
+css.inc: fpdoc.css
+	$(BIN2OBJ) -o css.inc -c DefaultCSS fpdoc.css
 
-plusimage.inc: images/plus.png ../bin2obj$(SRCEXEEXT)
-	../bin2obj$(SRCEXEEXT) -o plusimage.inc -c PlusImageData images/plus.png
+plusimage.inc: images/plus.png
+	$(BIN2OBJ) -o plusimage.inc -c PlusImageData images/plus.png
 
-minusimage.inc: images/minus.png ../bin2obj$(SRCEXEEXT)
-	../bin2obj$(SRCEXEEXT) -o minusimage.inc -c MinusImageData images/minus.png
+minusimage.inc: images/minus.png
+	$(BIN2OBJ) -o minusimage.inc -c MinusImageData images/minus.png
 
-../bin2obj$(SRCEXEEXT):
-	$(MAKE) -C .. bin2obj$(SRCEXEEXT)