--- Merging r16209 into '.':

U    utils/Makefile.fpc
C    utils/Makefile
Summary of conflicts:
  Text conflicts: 1

# revisions: 16209
------------------------------------------------------------------------
r16209 | jonas | 2010-10-23 21:53:36 +0200 (Sat, 23 Oct 2010) | 2 lines
Changed paths:
   M /trunk/utils/Makefile
   M /trunk/utils/Makefile.fpc

  * build fpcres also for haiku (patch by Olivier Coursière, mantis #17696)

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16240 -

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/08/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/20]
 #
 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 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
@@ -285,7 +285,7 @@ ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg  fpcres
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
@@ -2898,6 +2898,7 @@ TARGET_DIRS_H2PAS=1
 TARGET_DIRS_FPRCP=1
 TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
+TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_FPPKG=1

utils/Makefile.fpc

@@ -13,6 +13,7 @@ programs_linux=grab_vcsa
 dirs_win32=fpmc fpcres
 dirs_win64=fpmc fpcres
 dirs_wince=fpcres
+dirs_haiku=fpcres
 dirs_linux=fpcres
 dirs_freebsd=fpcres
 dirs_openbsd=fpcres