[Libreoffice-commits] .: 2 commits - basctl/AllLangResTarget_basctl.mk formula/AllLangResTarget_for.mk solenv/gbuild

Matus Kukan mkukan at kemper.freedesktop.org
Mon Mar 26 16:49:30 PDT 2012


 basctl/AllLangResTarget_basctl.mk |    4 +++-
 formula/AllLangResTarget_for.mk   |    1 +
 solenv/gbuild/Module.mk           |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f64d58e3e1c65589163a1255b36fde4cbd84b3a0
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Mar 26 23:01:46 2012 +0200

    more dependencies and include paths

diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index e4dffd1..d238350 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,6 +54,8 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
 	basctl/source/dlged/managelang.src \
 ))
 
-$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
+$(call gb_SrsTemplateTarget_get_target,basctl/res) : \
+	$(call gb_Package_get_target,svx_globlmn_hrc) \
+	$(call gb_Package_get_target,svx_inc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 7eb72e3..0cc451e 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res))
 
 $(eval $(call gb_SrsTarget_set_include,formula/res,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/formula/inc \
     -I$(SRCDIR)/formula/source/core/inc \
 ))
 
commit 5686fe0ad1ecd09dbe05dd1a36064f8be96321d6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Mar 25 18:46:08 2012 +0200

    be consistent

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 64d7d13..15237eb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -145,7 +145,7 @@ unitcheck :
 	$(call gb_Output_announce_bell)
 
 slowcheck :
-	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCHK,6)
+	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SLC,6)
 	$(call gb_Output_announce_title,all slowtests checked.)
 	$(call gb_Output_announce_bell)
 


More information about the Libreoffice-commits mailing list