[Libreoffice-commits] .: 3 commits - .gitignore Module_tail_build.mk RepositoryModule_ooo.mk solenv/gbuild

[Libreoffice Gerrit user]

 .gitignore              |    1 -
 Module_tail_build.mk    |   22 +++++++++++-----------
 RepositoryModule_ooo.mk |   22 +++++++++++-----------
 solenv/gbuild/Helper.mk |    2 +-
 solenv/gbuild/Module.mk |    2 +-
 5 files changed, 24 insertions(+), 25 deletions(-)

New commits:
commit 798d758577f3f5445bcc5ff71eeb99976228ca99
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Dec 14 21:24:33 2012 +0100

    use more gb_Helper_optional for consistency
    
    Change-Id: I8f68addd1e94d658ed43b8c1a59bfd51ed9b71b8

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ed471b8..34569d1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -97,17 +97,17 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
-	libcdr \
-	libcmis \
+	$(call gb_Helper_optional,CDR,libcdr) \
+	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
-	libmspub \
-	liborcus \
+	$(call gb_Helper_optional,MSPUB,libmspub) \
+	$(call gb_Helper_optional,ORCUS,liborcus) \
 	librelogo \
-	libvisio \
-	libwpd \
-	libwpg \
-	libwps \
+	$(call gb_Helper_optional,VISIO,libvisio) \
+	$(call gb_Helper_optional,WPD,libwpd) \
+	$(call gb_Helper_optional,WPG,libwpg) \
+	$(call gb_Helper_optional,WPS,libwps) \
 	libxmlsec \
 	lingucomponent \
 	linguistic \
@@ -115,7 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	MathMLDTD \
-	mdds \
+	$(call gb_Helper_optional,MDDS,mdds) \
 	Mesa \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MYTHES,mythes) \
@@ -191,7 +191,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	uui \
 	vbahelper \
 	vcl \
-	vigra \
+	$(call gb_Helper_optional,VIGRA,vigra) \
 	wizards \
 	writerfilter \
 	writerperfect \
@@ -202,7 +202,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	xmlreader \
 	xmlscript \
 	xmlsecurity \
-	xsltml \
+	$(call gb_Helper_optional,XSLTML,xsltml) \
 ))
 
 ifeq ($(MERGELIBS),TRUE)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 83347d2..b657909 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -105,25 +105,25 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
-	libcdr \
-	libcmis \
+	$(call gb_Helper_optional,CDR,libcdr) \
+	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
-	libmspub \
-	liborcus \
+	$(call gb_Helper_optional,MSPUB,libmspub) \
+	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 	librelogo \
-	libvisio \
-	libwpd \
-	libwpg \
-	libwps \
+	$(call gb_Helper_optional,VISIO,libvisio) \
+	$(call gb_Helper_optional,WPD,libwpd) \
+	$(call gb_Helper_optional,WPG,libwpg) \
+	$(call gb_Helper_optional,WPS,libwps) \
 	libxmlsec \
 	lingucomponent \
 	linguistic \
 	lotuswordpro \
 	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	MathMLDTD \
-	mdds \
+	$(call gb_Helper_optional,MDDS,mdds) \
 	Mesa \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MYTHES,mythes) \
@@ -203,7 +203,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	uui \
 	vbahelper \
 	vcl \
-	vigra \
+	$(call gb_Helper_optional,VIGRA,vigra) \
 	wizards \
 	writerfilter \
 	writerperfect \
@@ -214,7 +214,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	xmlreader \
 	xmlscript \
 	xmlsecurity \
-	xsltml \
+	$(call gb_Helper_optional,XSLTML,xsltml) \
 	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
commit 6af14cc8ecd69bbbff94fa47c14f53c94e8751e6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Dec 13 10:59:36 2012 +0100

    src.downloaded is gone
    
    Change-Id: I09a6ad82bbb54ce8329e8b2f6152e9f5a1880a68

diff --git a/.gitignore b/.gitignore
index 98585b7..ae41aee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@
 /desktop/scripts/soffice.sh
 /makefile.mk
 /Makefile
-/src.downloaded
 /intltool-extract.in
 /intltool-merge.in
 /intltool-update.in
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 97f1a81..fad1821 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -143,7 +143,7 @@ all : build unitcheck
 	$(info $(gb_Module_BUILDHINT))
 
 build : 
-	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded,$^),$(notdir $(module))),$(true),ALL,6)
+	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6)
 	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
 	$(call gb_Output_announce_title,build done.)
 	$(call gb_Output_announce_bell)
commit 9d1fedcb769e7f003e622bab174455e0ca6aab8b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Dec 14 17:18:38 2012 +0100

    fix typo
    
    Change-Id: Idcce1864902889bbbde00e5a9393195d4b591ce2

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 25cf47f..9c6b6e9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -107,7 +107,7 @@ endef
 
 # e.g. 'make CppunitTest_sw_macros_test'
 define gb_Helper_make_userfriendly_targets
-.PHONY: $(2)_$(1) $(2)_$(1)_clean
+.PHONY: $(2)_$(1) $(2)_$(1).clean
 $(2)_$(1) : $(call gb_$(2)_get_target,$(1))
 $(2)_$(1).clean :  $(call gb_$(2)_get_clean_target,$(1))
 endef