2
0
Эх сурвалжийг харах

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

git-svn-id: trunk@25613 -
Tomas Hajny 12 жил өмнө
parent
commit
e79246d6e6

+ 10 - 10
packages/Makefile.fpc.fpcmake

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

+ 1 - 1
packages/fppkg/Makefile.fpc.fpcmake

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

+ 1 - 1
utils/fppkg/Makefile.fpc.fpcmake

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