summaryrefslogtreecommitdiff
path: root/packages/Makefile
diff options
context:
space:
mode:
authormichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-01-27 08:17:18 +0000
committermichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-01-27 08:17:18 +0000
commit0035d03728954f22367650f524d0299df52cc4ad (patch)
treefd7df49eebc8e17054a48116fb14464a7da62863 /packages/Makefile
parentb0827b1243b4ee6f3d82d2fea981e3778601fa92 (diff)
downloadfpc-0035d03728954f22367650f524d0299df52cc4ad.tar.gz
Removed wince dependency of fcl-xml on iconv_enc
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@12619 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/Makefile')
-rw-r--r--packages/Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/packages/Makefile b/packages/Makefile
index b82f60b0f0..b26175cb8e 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/12/11]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/23]
#
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,10 +115,6 @@ 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)))))
@@ -8501,7 +8497,7 @@ librsvg_shared: gtk2_shared
librsvg_smart: gtk2_smart
librsvg_debug: gtk2_debug
librsvg_release: gtk2_release
-ifeq ($(findstring $(OS_TARGET),win32 win64 solaris),)
+ifeq ($(findstring $(OS_TARGET),win32 win64 solaris wince),)
fcl-xml_all: iconvenc_all
fcl-xml_shared: iconvenc_shared
fcl-xml_smart: iconvenc_smart