summaryrefslogtreecommitdiff
path: root/solenv/gbuild/UnoApiTarget.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-05-16 19:55:09 +0200
committerMichael Stahl <mstahl@redhat.com>2012-05-16 23:58:44 +0200
commit236055746ffe92ce3b2a7a9316b1083da046deb9 (patch)
tree03413d6b3b2f553ec67cbaeb5a8c4854b599fb53 /solenv/gbuild/UnoApiTarget.mk
parent6cdc3b9ceb13954f82026d851ab4ca88a706cb84 (diff)
further spurious dep-file rebuild fixes:
With the way dep-file generation was changed for LinkTargets in 8b5a984d45005d3df1c89eae897d6e04612625d8, it is necessary to change all other dep-file generation the same way, because the LinkTarget dep-files are outdated wrt. the object dep-files after an initial make run, and hence if any other dep-file depends in any way (even build-order) on a generated Executable, say by depending on the corresponding target file, then the PHONY entries in the outdated LinkTarget dep-files for the executable and its linked libraries cause all these objects to be recompiled. It is not a problem that there is a rule with the dep-file as target, and another rule for the corresponding actual target that writes the dep-file as a side-effect, without dependecy between the targets: because make does processing in 2 phases, first building all included makefiles, second all other targets, it is guaranteed that the 2 commands don't race to overwrite the dep-file because (when there is no dependency between them) they will not be executed in the same phase. The only problem here is that this will probably make IDL processing a lot slower on Windows, writing all those dummy dep-files.
Diffstat (limited to 'solenv/gbuild/UnoApiTarget.mk')
-rw-r--r--solenv/gbuild/UnoApiTarget.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 5742f94058cb..03f350cd71d5 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -160,7 +160,7 @@ endef
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%)
+$(call gb_UnoApiTarget_get_dep_target,%) :
$(call gb_UnoApiTarget__command_dep,$@,$*,$(UNOAPI_IDLFILES))
endif
@@ -197,8 +197,6 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl
$(call gb_UnoApiTarget_get_dep_target,$(1)) : \
$(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
-$(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \
- $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
endif
endef