* Fixed mistake made in r19962 with fpmkunit dependencies

git-svn-id: trunk@19963 -

packages/Makefile

@@ -9624,11 +9624,11 @@ fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_d
 fcl_smart: fcl-base_smart fcl-xml_smart fcl-fpcunit_smart fcl-db_smart fcl-web_smart fcl-registry_smart fcl-passrc_smart fcl-image_smart fcl-net_smart fcl-json_smart fcl-res_smart
 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
-libpng_all: zlib_all fpmkunit
-libpng_debug: zlib_debug fpmkunit
-libpng_smart: zlib_smart fpmkunit
-libpng_release: zlib_release fpmkunit
-libpng_shared: zlib_shared fpmkunit
+libpng_all: zlib_all fpmkunit_all
+libpng_debug: zlib_debug fpmkunit_debug
+libpng_smart: zlib_smart fpmkunit_smart
+libpng_release: zlib_release fpmkunit_release
+libpng_shared: zlib_shared fpmkunit_shared
 ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),)
 cairo_all: x11_all fcl-image_all
 cairo_debug: x11_debug fcl-image_debug
@@ -9696,11 +9696,11 @@ imlib_shared: gtk1_shared x11_shared
 imlib_smart: gtk1_smart x11_smart
 imlib_debug: gtk1_debug x11_debug
 imlib_release: gtk1_release x11_release
-ldap_all: hash_all fpmkunit
-ldap_shared: hash_shared fpmkunit
-ldap_smart: hash_smart fpmkunit
-ldap_debug: hash_debug fpmkunit
-ldap_release: hash_release fpmkunit
+ldap_all: hash_all fpmkunit_all
+ldap_shared: hash_shared fpmkunit_shared
+ldap_smart: hash_smart fpmkunit_smart
+ldap_debug: hash_debug fpmkunit_debug
+ldap_release: hash_release fpmkunit_release
 libpng_all: zlib_all
 libpng_shared: zlib_shared
 libpng_smart: zlib_smart
@@ -9763,11 +9763,11 @@ ptc_shared: hermes_shared fcl-base_shared
 ptc_smart: hermes_smart fcl-base_smart
 ptc_debug: hermes_debug fcl-base_debug
 ptc_release: hermes_release fcl-base_release
-librsvg_all: gtk2_all fpmkunit
-librsvg_shared: gtk2_shared fpmkunit
-librsvg_smart: gtk2_smart fpmkunit
-librsvg_debug: gtk2_debug fpmkunit
-librsvg_release: gtk2_release fpmkunit
+librsvg_all: gtk2_all fpmkunit_all
+librsvg_shared: gtk2_shared fpmkunit_shared
+librsvg_smart: gtk2_smart fpmkunit_smart
+librsvg_debug: gtk2_debug fpmkunit_debug
+librsvg_release: gtk2_release fpmkunit_release
 ifneq ($(findstring $(OS_TARGET),linux freebsd darwin iphonesim beos haiku),)
 fcl-xml_all: iconvenc_all
 fcl-xml_shared: iconvenc_shared
@@ -9780,33 +9780,33 @@ opencl_debug:  opengl_debug
 opencl_smart:  opengl_smart
 opencl_release:  opengl_release
 opencl_shared:  opengl_shared
-libc_all: fpmkunit
-libc_shared: fpmkunit
-libc_smart: fpmkunit
-libc_debug: fpmkunit
-libc_release: fpmkunit
-libcurl_all: fpmkunit
-libcurl_shared: fpmkunit
-libcurl_smart: fpmkunit
-libcurl_debug: fpmkunit
-libcurl_release: fpmkunit
-libgd_all: fpmkunit
-libgd_shared: fpmkunit
-libgd_smart: fpmkunit
-libgd_debug: fpmkunit
-libgd_release: fpmkunit
-libogcfpc_all: fpmkunit
-libogcfpc_shared: fpmkunit
-libogcfpc_smart: fpmkunit
-libogcfpc_debug: fpmkunit
-libogcfpc_release: fpmkunit
-libsee_all: fpmkunit
-libsee_shared: fpmkunit
-libsee_smart: fpmkunit
-libsee_debug: fpmkunit
-libsee_release: fpmkunit
-liblua_all: fpmkunit
-liblua_shared: fpmkunit
-liblua_smart: fpmkunit
-liblua_debug: fpmkunit
-liblua_release: fpmkunit
+libc_all: fpmkunit_all
+libc_shared: fpmkunit_shared
+libc_smart: fpmkunit_smart
+libc_debug: fpmkunit_debug
+libc_release: fpmkunit_release
+libcurl_all: fpmkunit_all
+libcurl_shared: fpmkunit_shared
+libcurl_smart: fpmkunit_smart
+libcurl_debug: fpmkunit_debug
+libcurl_release: fpmkunit_release
+libgd_all: fpmkunit_all
+libgd_shared: fpmkunit_shared
+libgd_smart: fpmkunit_smart
+libgd_debug: fpmkunit_debug
+libgd_release: fpmkunit_release
+libogcfpc_all: fpmkunit_all
+libogcfpc_shared: fpmkunit_shared
+libogcfpc_smart: fpmkunit_smart
+libogcfpc_debug: fpmkunit_debug
+libogcfpc_release: fpmkunit_release
+libsee_all: fpmkunit_all
+libsee_shared: fpmkunit_shared
+libsee_smart: fpmkunit_smart
+libsee_debug: fpmkunit_debug
+libsee_release: fpmkunit_release
+liblua_all: fpmkunit_all
+liblua_shared: fpmkunit_shared
+liblua_smart: fpmkunit_smart
+liblua_debug: fpmkunit_debug
+liblua_release: fpmkunit_release

packages/Makefile.fpc

@@ -250,11 +250,11 @@ 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
 
-libpng_all: zlib_all fpmkunit
-libpng_debug: zlib_debug fpmkunit
-libpng_smart: zlib_smart fpmkunit
-libpng_release: zlib_release fpmkunit
-libpng_shared: zlib_shared fpmkunit
+libpng_all: zlib_all fpmkunit_all
+libpng_debug: zlib_debug fpmkunit_debug
+libpng_smart: zlib_smart fpmkunit_smart
+libpng_release: zlib_release fpmkunit_release
+libpng_shared: zlib_shared fpmkunit_shared
 
 ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),)
 cairo_all: x11_all fcl-image_all
@@ -332,11 +332,11 @@ imlib_smart: gtk1_smart x11_smart
 imlib_debug: gtk1_debug x11_debug
 imlib_release: gtk1_release x11_release
 
-ldap_all: hash_all fpmkunit
-ldap_shared: hash_shared fpmkunit
-ldap_smart: hash_smart fpmkunit
-ldap_debug: hash_debug fpmkunit
-ldap_release: hash_release fpmkunit
+ldap_all: hash_all fpmkunit_all
+ldap_shared: hash_shared fpmkunit_shared
+ldap_smart: hash_smart fpmkunit_smart
+ldap_debug: hash_debug fpmkunit_debug
+ldap_release: hash_release fpmkunit_release
 
 libpng_all: zlib_all
 libpng_shared: zlib_shared
@@ -413,11 +413,11 @@ ptc_smart: hermes_smart fcl-base_smart
 ptc_debug: hermes_debug fcl-base_debug
 ptc_release: hermes_release fcl-base_release
 
-librsvg_all: gtk2_all fpmkunit
-librsvg_shared: gtk2_shared fpmkunit
-librsvg_smart: gtk2_smart fpmkunit
-librsvg_debug: gtk2_debug fpmkunit
-librsvg_release: gtk2_release fpmkunit
+librsvg_all: gtk2_all fpmkunit_all
+librsvg_shared: gtk2_shared fpmkunit_shared
+librsvg_smart: gtk2_smart fpmkunit_smart
+librsvg_debug: gtk2_debug fpmkunit_debug
+librsvg_release: gtk2_release fpmkunit_release
 
 ifneq ($(findstring $(OS_TARGET),linux freebsd darwin iphonesim beos haiku),)
 fcl-xml_all: iconvenc_all
@@ -433,39 +433,39 @@ opencl_smart:  opengl_smart
 opencl_release:  opengl_release
 opencl_shared:  opengl_shared
 
-libc_all: fpmkunit
-libc_shared: fpmkunit
-libc_smart: fpmkunit
-libc_debug: fpmkunit
-libc_release: fpmkunit
+libc_all: fpmkunit_all
+libc_shared: fpmkunit_shared
+libc_smart: fpmkunit_smart
+libc_debug: fpmkunit_debug
+libc_release: fpmkunit_release
 
-libcurl_all: fpmkunit
-libcurl_shared: fpmkunit
-libcurl_smart: fpmkunit
-libcurl_debug: fpmkunit
-libcurl_release: fpmkunit
+libcurl_all: fpmkunit_all
+libcurl_shared: fpmkunit_shared
+libcurl_smart: fpmkunit_smart
+libcurl_debug: fpmkunit_debug
+libcurl_release: fpmkunit_release
 
-libgd_all: fpmkunit
-libgd_shared: fpmkunit
-libgd_smart: fpmkunit
-libgd_debug: fpmkunit
-libgd_release: fpmkunit
+libgd_all: fpmkunit_all
+libgd_shared: fpmkunit_shared
+libgd_smart: fpmkunit_smart
+libgd_debug: fpmkunit_debug
+libgd_release: fpmkunit_release
 
-libogcfpc_all: fpmkunit
-libogcfpc_shared: fpmkunit
-libogcfpc_smart: fpmkunit
-libogcfpc_debug: fpmkunit
-libogcfpc_release: fpmkunit
+libogcfpc_all: fpmkunit_all
+libogcfpc_shared: fpmkunit_shared
+libogcfpc_smart: fpmkunit_smart
+libogcfpc_debug: fpmkunit_debug
+libogcfpc_release: fpmkunit_release
 
-libsee_all: fpmkunit
-libsee_shared: fpmkunit
-libsee_smart: fpmkunit
-libsee_debug: fpmkunit
-libsee_release: fpmkunit
+libsee_all: fpmkunit_all
+libsee_shared: fpmkunit_shared
+libsee_smart: fpmkunit_smart
+libsee_debug: fpmkunit_debug
+libsee_release: fpmkunit_release
 
-liblua_all: fpmkunit
-liblua_shared: fpmkunit
-liblua_smart: fpmkunit
-liblua_debug: fpmkunit
-liblua_release: fpmkunit
+liblua_all: fpmkunit_all
+liblua_shared: fpmkunit_shared
+liblua_smart: fpmkunit_smart
+liblua_debug: fpmkunit_debug
+liblua_release: fpmkunit_release