summaryrefslogtreecommitdiff
path: root/packages/Makefile.fpc
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-12-13 17:47:53 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-12-13 17:47:53 +0000
commit3500b87d9c09c3835ad5c6c8b1c5f7b82c629318 (patch)
tree03d5bafd69fa17c8bf5c3451c30888a4cc18b034 /packages/Makefile.fpc
parentb9eadcc9f74325921649d5077c1cbfbf13090c4e (diff)
downloadfpc-3500b87d9c09c3835ad5c6c8b1c5f7b82c629318.tar.gz
* fcl-base now depends on univint for all darwin platforms
- removed duplicate dependency rules for paszlib git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14439 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/Makefile.fpc')
-rw-r--r--packages/Makefile.fpc10
1 files changed, 2 insertions, 8 deletions
diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc
index 549cf16d41..b677d72794 100644
--- a/packages/Makefile.fpc
+++ b/packages/Makefile.fpc
@@ -74,7 +74,7 @@ fpmkunit_smart: fcl-base_smart fcl-process_smart paszlib_smart
fpmkunit_release: fcl-base_release fcl-process_release paszlib_release
fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared
-ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),)
+ifneq ($(findstring $(OS_TARGET),darwin),)
fcl-base_all: univint_all paszlib_all
fcl-base_debug: univint_debug paszlib_debug
fcl-base_smart: univint_smart paszlib_smart
@@ -95,7 +95,7 @@ fcl-extra_smart: fcl-base_smart winunits-base_smart winunits-jedi_smart
fcl-extra_release: fcl-base_release winunits-base_release winunits-jedi_release
fcl-extra_shared: fcl-base_shared winunits-base_shared winunits-jedi_shared
else
-ifneq ($(findstring $(OS_TARGET),darwin darwin),)
+ifneq ($(findstring $(OS_TARGET),darwin),)
fcl-extra_all: univint_all fcl-base_all
fcl-extra_debug: univint_debug fcl-base_debug
fcl-extra_smart: univint_smart fcl-base_release
@@ -196,12 +196,6 @@ fcl_smart: fcl-base_smart fcl-xml_smart fcl-fpcunit_smart fcl-db_smart fcl-web_s
fcl_release: fcl-base_release fcl-xml_release fcl-fpcunit_release fcl-db_release fcl-web_release fcl-registry_release fcl-passrc_release fcl-image_release fcl-net_release fcl-json_release fcl-res_release
fcl_shared: fcl-base_shared fcl-xml_shared fcl-fpcunit_shared fcl-db_shared fcl-web_shared fcl-registry_shared fcl-passrc_shared fcl-image_shared fcl-net_shared fcl-json_shared fcl-res_shared
-paszlib_all: hash_all
-paszlib_debug: hash_debug
-paszlib_smart: hash_smart
-paszlib_release: hash_release
-paszlib_shared: hash_shared
-
libpng_all: zlib_all
libpng_debug: zlib_debug
libpng_smart: zlib_smart