solenv/gbuild/AutoInstallLibs.mk | 5 +++--
solenv/gbuild/InstallModuleTarget.mk | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 71356b046bfc17ab54c5a784522035538edda6c8
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 25 13:06:12 2013 +0200
rebuild scp if autoinstalled libs change
Change-Id: I76cca4646bd0258cdf64a079edb017e6243839af
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index 52dff9c..53e85de 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -13,7 +13,7 @@
$(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_AutoInstallLibs_get_target,%) :
+$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk
$(call gb_Output_announce,$*,$(true),AIL,3)
echo "/* autogenerated library installs for group $(INSTALLMODULE) */"
> $@
$(call gb_Output_info,install module: $(INSTALLMODULE) contents:
$(gb_Library_MODULE_$(INSTALLMODULE)))
@@ -30,7 +30,8 @@ $(call gb_AutoInstallLibs_get_clean_target,%) :
rm -f $(call gb_AutoInstallLibs_get_target,$*)
define gb_AutoInstallLibs_AutoInstallLibs
-$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Helper_PHONY) | $(dir $(call
gb_AutoInstallLibs_get_target,$(1))).dir
+$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
+$(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call
gb_AutoInstallLibs_get_target,$(1))).dir
$(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2)
$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3)
$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4)
diff --git a/solenv/gbuild/InstallModuleTarget.mk
b/solenv/gbuild/InstallModuleTarget.mk
index d995247..0ef0780 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -169,9 +169,9 @@ define gb_ScpTarget_ScpTarget
$(call gb_ScpPreprocessTarget_ScpPreprocessTarget,$(1))
$(call gb_ScpTarget_get_target,$(1)) : $(call
gb_ScpPreprocessTarget_get_target,$(1))
-$(call gb_ScpTarget_get_target,$(1)) :| $(call
gb_ScpTarget_get_external_target,$(1))
+$(call gb_ScpTarget_get_target,$(1)) : $(call
gb_ScpTarget_get_external_target,$(1))
$(call gb_ScpTarget_get_external_target,$(1)) :| $(dir $(call
gb_ScpTarget_get_target,$(1))).dir
-$(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(call
gb_ScpTarget_get_external_target,$(1))
+$(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call
gb_ScpTarget_get_external_target,$(1))
$(call gb_ScpTarget_get_clean_target,$(1)) : $(call
gb_ScpPreprocessTarget_get_clean_target,$(1))
$(call gb_ScpTarget_get_target,$(1)) : SCP_SOURCE := $(call
gb_ScpPreprocessTarget_get_target,$(1))
$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(gb_Helper_PHONY)
@@ -221,7 +221,7 @@ $(call gb_InstallModuleTarget_get_clean_target,%) :
$(call gb_InstallModuleTarget_get_external_target,$*)
define gb_InstallModuleTarget_InstallModuleTarget
-$(call gb_InstallModuleTarget_get_target,$(1)) :| \
+$(call gb_InstallModuleTarget_get_target,$(1)) : \
$(call gb_InstallModuleTarget_get_external_target,$(1))
$(call gb_InstallModuleTarget_get_external_target,$(1)) :| \
$(dir $(call gb_InstallModuleTarget_get_target,$(1))).dir
@@ -261,7 +261,7 @@ $(call gb_InstallModuleTarget_get_external_target,$(1)) :
$(call gb_AutoInstallL
endef
define gb_InstallModuleTarget_use_custom_header
-$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call
gb_CustomTarget_get_target,$(2))
+$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call
gb_CustomTarget_get_target,$(2))
$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(call
gb_CustomTarget_get_workdir,$(2)) \
endef
@@ -276,7 +276,7 @@ $(call gb_ScpTarget_ScpTarget,$(2))
$(call gb_InstallModuleTarget_get_target,$(1)) : $(call
gb_ScpTarget_get_target,$(2))
$(call gb_InstallModuleTarget_get_clean_target,$(1)) : $(call
gb_ScpTarget_get_clean_target,$(2))
$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_FILES += $(call
gb_ScpTarget_get_target,$(2))
-$(call gb_ScpTarget_get_external_target,$(2)) :| $(call
gb_InstallModuleTarget_get_external_target,$(1))
+$(call gb_ScpTarget_get_external_target,$(2)) : $(call
gb_InstallModuleTarget_get_external_target,$(1))
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
