diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-17 15:43:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-17 15:56:10 +0100 |
| commit | 27c36c7bddb3c8bb27fe55972833344145eaba59 (patch) | |
| tree | 71a1af11b9079af04b92ce00a05f9444c85f5409 /solenv | |
| parent | 59a6665e78bbb0c05a079d636fb18aba77b09452 (diff) | |
gbuild: UnoApiTarget: initialize target local vars
Fixes the problem in offapi, where a rebuild after changing an IDL file
would produce an offapi.rdb that contained the stale content of the
old version of the IDL file. This was because in offapi 2 rdb files are
built, offapi.rdb and types.rdb, and types.rdb is a merge of udkapi.rdb
and offapi.rdb, hence it depends on offapi.rdb. Unfortunately this means
that the UNOAPI_MERGE variable for types.rdb is inherited to
offapi.rdb, with the result that after the workdir offapi.rdb is built
from .urd files, it is overwritten by a merge of udkapi.rdb and a stale
offapi.rdb from the solver.
(cherry picked from commit f25ef2b904652ab3162c61864eeb5a2381bb796f)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index e5575775a833..b6700e6b638d 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -61,6 +61,10 @@ define gb_UnoApiTarget_UnoApiTarget $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1)))) $(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) +$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := gb_UnoApiTarget_HPPFILES_$(1) := gb_UnoApiTarget_IDLFILES_$(1) := |