Jelajahi Sumber

* also let fcl-xml depend on iconvenc for beos and haiku
* regenerated using an up-to-date fpcmake

git-svn-id: trunk@12655 -

Jonas Maebe 16 tahun lalu
induk
melakukan
be2d246327
2 mengubah file dengan 7 tambahan dan 3 penghapusan
  1. 6 2
      packages/Makefile
  2. 1 1
      packages/Makefile.fpc

+ 6 - 2
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/01/02]
 #
 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-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
@@ -115,6 +115,10 @@ FPC:=$(shell $(FPCPROG) -PB)
 endif
 ifneq ($(findstring Error,$(FPC)),)
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+else
+ifeq ($(strip $(wildcard $(FPC))),)
+FPC:=$(firstword $(FPCPROG))
+endif
 endif
 else
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
@@ -8499,7 +8503,7 @@ librsvg_shared: gtk2_shared
 librsvg_smart: gtk2_smart
 librsvg_debug: gtk2_debug
 librsvg_release: gtk2_release
-ifneq ($(findstring $(OS_TARGET),linux freebsd darwin),)
+ifneq ($(findstring $(OS_TARGET),linux freebsd darwin beos haiku),)
 fcl-xml_all: iconvenc_all
 fcl-xml_shared: iconvenc_shared
 fcl-xml_smart: iconvenc_smart

+ 1 - 1
packages/Makefile.fpc

@@ -313,7 +313,7 @@ librsvg_smart: gtk2_smart
 librsvg_debug: gtk2_debug
 librsvg_release: gtk2_release
 
-ifneq ($(findstring $(OS_TARGET),linux freebsd darwin),)
+ifneq ($(findstring $(OS_TARGET),linux freebsd darwin beos haiku),)
 fcl-xml_all: iconvenc_all
 fcl-xml_shared: iconvenc_shared
 fcl-xml_smart: iconvenc_smart