[PATCH] gbuild: fix generated deps for API headers

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3506

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/3506/1

gbuild: fix generated deps for API headers

This should be reverted after some time, as it solves a one-time
problem.

Change-Id: Iaa4bc17267a24bd744573e56108b8d207936629c
---
M solenv/gbuild/UnoApi.mk
1 file changed, 11 insertions(+), 0 deletions(-)



diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 7e8b9d9..bb690cf 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -25,6 +25,15 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+# NOTE: This is needed temporarily to force rebuild with API files from
+# $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl
+# file would not rebuild a .cxx if it still depended on the $(OUTDIR)
+# version of the header.
+define gb_UnoApi__make_outdir_headers_rule
+$(OUTDIR)/inc/$(1)/%.hdl $(OUTDIR)/inc/$(1)/%.hpp :
+	@true
+endef
+
 .PHONY : $(call gb_UnoApi_get_clean_target,%)
 $(call gb_UnoApi_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
@@ -46,6 +55,8 @@
 
 $(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
 
+$(call gb_UnoApi__make_outdir_headers_rule,$(1))
+
 $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1))))

-- 
To view, visit https://gerrit.libreoffice.org/3506
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa4bc17267a24bd744573e56108b8d207936629c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon at redhat.com>