[Libreoffice-commits] .: 3 commits - solenv/gbuild

[David Tardon]

 solenv/gbuild/ExternalLib.mk |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a4bc0fa8e7da969adeb15f2a782452570ad2bf5a
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 3 07:02:22 2011 +0200

    do not escape calls if not needed

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index 36c3697..5fe8876 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -47,8 +47,8 @@ $(call gb_ExternalLib_get_target,$(1)) :
 $(call gb_ExternalLib_get_clean_target,$(1)) :
 	$$(call gb_Output_announce,$(1),$(false),MAK,3)
 	$$(call gb_Helper_abbreviate_dirs,\
-	    if test -f $$(call gb_ExternalLib_get_builddir,$(1))/Makefile ; then cd $$(call gb_ExternalLib_get_builddir,$(1)) && make uninstall ; fi ; \
-	    rm -rf $$(call gb_ExternalLib_get_target,$(1)) \
+	    if test -f $(call gb_ExternalLib_get_builddir,$(1))/Makefile ; then cd $$(call gb_ExternalLib_get_builddir,$(1)) && make uninstall ; fi ; \
+	    rm -rf $(call gb_ExternalLib_get_target,$(1)) \
 		$(call gb_ExternalLib_get_workdir,$(1)))
 
 else
commit 26eae8c557f14be99f6559e9027d4562694d10e1
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 3 06:58:21 2011 +0200

    we do not really need two rm calls here

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index fad1316..36c3697 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -48,8 +48,8 @@ $(call gb_ExternalLib_get_clean_target,$(1)) :
 	$$(call gb_Output_announce,$(1),$(false),MAK,3)
 	$$(call gb_Helper_abbreviate_dirs,\
 	    if test -f $$(call gb_ExternalLib_get_builddir,$(1))/Makefile ; then cd $$(call gb_ExternalLib_get_builddir,$(1)) && make uninstall ; fi ; \
-	    rm -f $$(call gb_ExternalLib_get_target,$(1)) ; \
-		rm -rf $(call gb_ExternalLib_get_workdir,$(1)))
+	    rm -rf $$(call gb_ExternalLib_get_target,$(1)) \
+		$(call gb_ExternalLib_get_workdir,$(1)))
 
 else
 	$$(call gb_Output_error,$(2) is not a supported ExternalLib mode)
commit d793da55d38ed3f0ff91bd581653e9ec8795f361
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 3 06:54:24 2011 +0200

    add newlines to avoid possible problems with joined lines

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index f25e79f..fad1316 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -59,6 +59,7 @@ endef
 
 define gb_ExternalLib_set_src_package
 $(call gb_ExternalLib_get_target,$(1)): $(call gb_ExternalLib_get_src_package,$(2))
+
 endef
 
 define gb_ExternalLib_add_patch
@@ -68,6 +69,7 @@ endef
 
 define gb_ExternalLib_add_patches
 $(foreach patch,$(2),$(call gb_ExternalLib_add_patch,$(1),$(patch)))
+
 endef
 
 define gb_ExternalLib_add_post_patch
@@ -77,18 +79,22 @@ endef
 
 define gb_ExternalLib_add_post_patches
 $(foreach patch,$(2),$(call gb_ExternalLib_add_patch,$(1),$(patch)))
+
 endef
 
 define gb_ExternalLib_add_conf_arg
 $(call gb_ExternalLib_get_target,$(1)): T_CONF_ARGS+=$(2)
+
 endef
 
 define gb_ExternalLib_add_cxxflags
 $(call gb_ExternalLib_get_target,$(1)) : T_CXXFLAGS += $(2)
+
 endef
 
 define gb_ExternalLib_add_cflags
 $(call gb_ExternalLib_get_target,$(1)) : T_CFLAGS += $(2)
+
 endef