diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-05 08:47:10 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-05 09:32:33 +0200 |
| commit | 02b6e89e3c00b857b19ac59f03ba008f179629fb (patch) | |
| tree | cf2bfb588ecdea5d45a5be8825e77ac5fe034388 /solenv | |
| parent | b13282fd804dd3e8eb590ea2017e348bcaf78197 (diff) | |
Revert "gbuild: fix generated deps for API headers"
It's been quite a time since the big header move. I suppose this iss not
needed anymore.
This reverts commit 1b2f3b9c64c7903dfa56953b91db4f5f105e4e7d.
Conflicts:
solenv/gbuild/UnoApi.mk
Change-Id: Iea817c17a2559e853709d3b7686365dd29e12ea8
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 6897af929d0a..c3ee107903f7 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -12,15 +12,6 @@ gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref) gb_UnoApi_ENABLE_INSTALL := $(and $(filter host,$(gb_Side)),$(filter ODK,$(BUILD_TYPE))) -# 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,\ @@ -44,8 +35,6 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1 $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) -$(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)))) |