Browse Source

* fix missing dependency of fppkg on fpmkunit (unnoticed on some targets due to dependency import via fcl-web)

git-svn-id: branches/fixes_2_6@25611 -
Tomas Hajny 12 years ago
parent
commit
9910d46b6e
4 changed files with 446 additions and 264 deletions
  1. 10 10
      packages/Makefile
  2. 10 10
      packages/Makefile.fpc
  3. 425 243
      packages/fppkg/Makefile
  4. 1 1
      packages/fppkg/Makefile.fpc

+ 10 - 10
packages/Makefile

@@ -9845,17 +9845,17 @@ cocoaint_release: univint_release
 cocoaint_shared: univint_shared
 endif
 ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux win32 win64 wince),)
-fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all
-fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug
-fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart
-fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release
-fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared
+fppkg_all: fpmkunit_all fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all
+fppkg_debug: fpmkunit_debug fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug
+fppkg_smart: fpmkunit_smart fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart
+fppkg_release: fpmkunit_release fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release
+fppkg_shared: fpmkunit_shared fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared
 else
-fppkg_all: fcl-base_all fcl-xml_all fcl-process_all paszlib_all
-fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug paszlib_debug
-fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart paszlib_smart
-fppkg_release: fcl-base_release fcl-xml_release fcl-process_release paszlib_release
-fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared paszlib_shared
+fppkg_all: fpmkunit_all fcl-base_all fcl-xml_all fcl-process_all paszlib_all
+fppkg_debug: fpmkunit_debug fcl-base_debug fcl-xml_debug fcl-process_debug paszlib_debug
+fppkg_smart: fpmkunit_smart fcl-base_smart fcl-xml_smart fcl-process_smart paszlib_smart
+fppkg_release: fpmkunit_release fcl-base_release fcl-xml_release fcl-process_release paszlib_release
+fppkg_shared: fpmkunit_shared fcl-base_shared fcl-xml_shared fcl-process_shared paszlib_shared
 endif
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug

+ 10 - 10
packages/Makefile.fpc

@@ -129,17 +129,17 @@ cocoaint_shared: univint_shared
 endif
 
 ifneq ($(findstring $(OS_TARGET),beos haiku freebsd darwin iphonesim solaris netbsd openbsd linux win32 win64 wince),)
-fppkg_all: fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all
-fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug
-fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart
-fppkg_release: fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release
-fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared
+fppkg_all: fpmkunit_all fcl-base_all fcl-xml_all fcl-process_all fcl-net_all paszlib_all fcl-web_all
+fppkg_debug: fpmkunit_debug fcl-base_debug fcl-xml_debug fcl-process_debug fcl-net_debug paszlib_debug fcl-web_debug
+fppkg_smart: fpmkunit_smart fcl-base_smart fcl-xml_smart fcl-process_smart fcl-net_smart paszlib_smart fcl-web_smart
+fppkg_release: fpmkunit_release fcl-base_release fcl-xml_release fcl-process_release fcl-net_release paszlib_release fcl-web_release
+fppkg_shared: fpmkunit_shared fcl-base_shared fcl-xml_shared fcl-process_shared fcl-net_shared paszlib_shared fcl-web_shared
 else
-fppkg_all: fcl-base_all fcl-xml_all fcl-process_all paszlib_all
-fppkg_debug: fcl-base_debug fcl-xml_debug fcl-process_debug paszlib_debug
-fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart paszlib_smart
-fppkg_release: fcl-base_release fcl-xml_release fcl-process_release paszlib_release
-fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared paszlib_shared
+fppkg_all: fpmkunit_all fcl-base_all fcl-xml_all fcl-process_all paszlib_all
+fppkg_debug: fpmkunit_debug fcl-base_debug fcl-xml_debug fcl-process_debug paszlib_debug
+fppkg_smart: fpmkunit_smart fcl-base_smart fcl-xml_smart fcl-process_smart paszlib_smart
+fppkg_release: fpmkunit_release fcl-base_release fcl-xml_release fcl-process_release paszlib_release
+fppkg_shared: fpmkunit_shared fcl-base_shared fcl-xml_shared fcl-process_shared paszlib_shared
 endif
 
 fcl-xml_all: fcl-base_all

File diff suppressed because it is too large
+ 425 - 243
packages/fppkg/Makefile


+ 1 - 1
packages/fppkg/Makefile.fpc

@@ -35,7 +35,7 @@ fpcpackage=y
 fpcdir=../..
 
 [require]
-packages=fcl-base fcl-xml fcl-process paszlib
+packages=fpmkunit fcl-base fcl-xml fcl-process paszlib
 tools=data2inc
 packages_darwin=univint fcl-net fcl-web
 packages_iphonesim=univint fcl-net fcl-web

Some files were not shown because too many files changed in this diff