From 2922e44ef8677f44796c10df6ebe1cf63dd34cab Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Tue, 17 May 2011 14:19:55 +0000 Subject: [PATCH] * limit dependency of fppkg on libcurl to those platforms for which libcurl gets compiled (fixes Windows compilation after r17479) git-svn-id: trunk@17482 - --- packages/Makefile | 8 ++++++++ packages/Makefile.fpc | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/Makefile b/packages/Makefile index e76f1e404a..8f65d5b051 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -9726,11 +9726,19 @@ cocoaint_smart: univint_smart cocoaint_release: univint_release cocoaint_shared: univint_shared endif +ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux),) fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all libcurl_all fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug libcurl_debug fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart libcurl_smart fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release libcurl_release fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared libcurl_shared +else +fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all +fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug +fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart +fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release +fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared +endif fcl-xml_all: fcl-base_all fcl-xml_debug: fcl-base_debug fcl-xml_smart: fcl-base_smart diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index f0c6ef0b07..8a7ea3773e 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -128,11 +128,19 @@ cocoaint_release: univint_release cocoaint_shared: univint_shared endif +ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux),) fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all libcurl_all fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug libcurl_debug fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart libcurl_smart fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release libcurl_release fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared libcurl_shared +else +fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all +fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug +fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart +fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release +fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared +endif fcl-xml_all: fcl-base_all fcl-xml_debug: fcl-base_debug