icu/ExternalPackage_icu.mk | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
New commits: commit 12ee1efbcd53d1550d209c89bf5553bc0d9794a9 Author: Peter Foley <[email protected]> Date: Fri Dec 28 09:22:34 2012 -0500 fix icu build Change-Id: Iacb4deeb29d20d8369e09d55c0b0d36324a48ce8 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 51544b2..ce5f06d 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -61,23 +61,22 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\ source/lib/libicutulo.so \ )) else -$(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicudata$(gb_Library_DLLEXT) \ - source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicuuc$(gb_Library_DLLEXT) \ - source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicui18n$(gb_Library_DLLEXT) \ - source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicule$(gb_Library_DLLEXT) \ - source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicutu$(gb_Library_DLLEXT) \ -)) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) + $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genccode \ source/bin/genbrk \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
