[Libreoffice-commits] core.git: 5 commits - lingucomponent/Library_guesslang.mk RepositoryExternal.mk scp2/InstallModule_ooo.mk scp2/InstallModule_sdkoo.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk                |    2 +-
 lingucomponent/Library_guesslang.mk  |    9 ++++-----
 scp2/InstallModule_ooo.mk            |    5 ++++-
 scp2/InstallModule_sdkoo.mk          |    2 ++
 solenv/gbuild/InstallModuleTarget.mk |    2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 8ede32d15735b78e3528107bfbcfb69e3beb7439
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 12 19:03:31 2013 +0200

    add missing dep
    
    Change-Id: I2535fb641ba6e0f3c651868143e70ca0bbd88d5e

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4906986..4c39b53 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -15,7 +15,10 @@ endif
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
 
-$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,ooo))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
+	ooo \
+	ooobinarytable \
+))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	DISABLE_ATL \
commit 0cc5368c84e0b3fd9718af8e286bca459e8f116e
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 12 19:06:25 2013 +0200

    extend function to allow list of args
    
    Change-Id: If95f0e97e4f0b0efae976d6fea43abbaa02fdbac

diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 91e6521..2f34826 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -244,7 +244,7 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 endef
 
 define gb_InstallModuleTarget_use_auto_install_libs
-$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_AutoInstall_get_target,$(2))
+$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(foreach ai,$(2),$(call gb_AutoInstall_get_target,$(ai)))
 
 endef
 
commit 37c1ae54e07ee49ee84e9af4c0ed2e9d18786bb9
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 12 19:00:50 2013 +0200

    add missing dep
    
    Change-Id: I6b66cd78e36022c8a5d6b45489d2e2ade323a72c

diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 6bb2c54..0669195 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk))
+
 ifneq ($(DOXYGEN),)
 $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
 	-DDOXYGEN \
commit 523a304a6db0c12bba74a26d8fe37d00ff60cc99
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 12 18:22:55 2013 +0200

    fix copypasta
    
    Change-Id: I950a87b5fbfe1b2f90068fbca273b69b8ab4b75f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dd0e9d2..e064b1b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -728,7 +728,7 @@ else
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,exttextcat)/src/.libs/libexttextcat-2.0.a\
 )
-$(call gb_LinkTarget_use_external_project,$(1),mythes)
+$(call gb_LinkTarget_use_external_project,$(1),exttextcat)
 endif
 
 
commit 7b003de40398e4efdb556199cc613af42cf55ce4
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 12 18:07:44 2013 +0200

    move externals together
    
    Change-Id: I8c28241fc836551360711b984f8785da5e43e0e8

diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk
index a03dac2..bd81963 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -12,7 +12,10 @@ $(eval $(call gb_Library_Library,guesslang))
 
 $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
 
-$(eval $(call gb_Library_use_external,guesslang,boost_headers))
+$(eval $(call gb_Library_use_externals,guesslang,\
+	boost_headers \
+	libexttextcat \
+))
 
 $(eval $(call gb_Library_use_sdk_api,guesslang))
 
@@ -25,10 +28,6 @@ $(eval $(call gb_Library_use_libraries,guesslang,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_externals,guesslang,\
-	libexttextcat \
-))
-
 $(eval $(call gb_Library_add_exception_objects,guesslang,\
 	lingucomponent/source/languageguessing/altstrfunc \
 	lingucomponent/source/languageguessing/guess \