libexttextcat/ExternalPackage_exttextcat.mk | 6 ------ libexttextcat/Module_libexttextcat.mk | 2 +- scp2/source/ooo/file_library_ooo.scp | 9 --------- 3 files changed, 1 insertion(+), 16 deletions(-)
New commits: commit a2b3ee4abf39e47037fa9adbf44a8742379098f7 Author: David Tardon <[email protected]> Date: Tue Nov 13 07:04:34 2012 +0100 do not build package unless needed Change-Id: I7e61de3009e20aa13bdc2a333c803130eb88f36d diff --git a/libexttextcat/ExternalPackage_exttextcat.mk b/libexttextcat/ExternalPackage_exttextcat.mk index 638a741..11a2acb 100644 --- a/libexttextcat/ExternalPackage_exttextcat.mk +++ b/libexttextcat/ExternalPackage_exttextcat.mk @@ -9,11 +9,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,exttextcat,exttextcat)) -ifneq ($(COM),MSC) - $(eval $(call gb_ExternalPackage_use_external_project,exttextcat,exttextcat)) $(eval $(call gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-2.0.a)) -endif # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/Module_libexttextcat.mk b/libexttextcat/Module_libexttextcat.mk index bf65b04..43cc306 100644 --- a/libexttextcat/Module_libexttextcat.mk +++ b/libexttextcat/Module_libexttextcat.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libexttextcat)) ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO) $(eval $(call gb_Module_add_targets,libexttextcat,\ UnpackedTarball_exttextcat \ - ExternalPackage_exttextcat \ Zip_fingerprint \ )) ifeq ($(COM),MSC) @@ -21,6 +20,7 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\ )) else $(eval $(call gb_Module_add_targets,libexttextcat,\ + ExternalPackage_exttextcat \ ExternalProject_exttextcat \ )) endif commit 7b360a456b00c914b97afaa8a6ed3c0eaffd613e Author: David Tardon <[email protected]> Date: Tue Nov 13 07:01:54 2012 +0100 internal libexttextcat is built statically everywhere Change-Id: I92e42a4a677ab352e9b5a01d19c50493682eea8d diff --git a/libexttextcat/ExternalPackage_exttextcat.mk b/libexttextcat/ExternalPackage_exttextcat.mk index 6ceb585..638a741 100644 --- a/libexttextcat/ExternalPackage_exttextcat.mk +++ b/libexttextcat/ExternalPackage_exttextcat.mk @@ -14,9 +14,6 @@ ifneq ($(COM),MSC) $(eval $(call gb_ExternalPackage_use_external_project,exttextcat,exttextcat)) $(eval $(call gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-2.0.a)) -ifeq ($(OS),WNT) -$(eval $(call gb_ExternalPackage_add_file,exttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll)) -endif endif # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index e88cb71..6d4839d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1576,15 +1576,6 @@ File gid_File_Lib_Migrationoo3 #endif End -#if defined(WNT) && !defined(SYSTEM_LIBEXTTEXTCAT) -File gid_File_Lib_Libtextcat - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "libexttextcat.dll"; -End -#endif - STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
