diff options
| author | David Tardon <dtardon@redhat.com> | 2012-07-29 13:59:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:15:33 +0200 |
| commit | a91b866abcf3fd93c5c92f3a113428e0834e36a5 (patch) | |
| tree | 21c0e035a2f150240797fcbfbb8065690998767c /solenv | |
| parent | 61c0a3a63d46c7a0df1f337233d6c571186adc9e (diff) | |
depend on tools as necessary
Change-Id: Ib13f95a55ffcdd7f9314744a18ae48aa123406dd
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 3c84bd3a040a..844816ac6453 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -30,6 +30,7 @@ gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc) gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET) +gb_UnoApiPartTarget_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) # The .urd files are actually created by the gb_UnoApiPartTarget__command, # invoked for the per-directory .done files. @@ -68,7 +69,8 @@ define gb_UnoApiPartTarget__command endef $(call gb_UnoApiPartTarget_get_target,%.done) : \ - $(gb_UnoApiPartTarget_IDLCTARGET) + $(gb_UnoApiPartTarget_IDLCTARGET) \ + | $(gb_UnoApiPartTarget_UCPPTARGET) $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCTARGET),$?)) ifeq ($(gb_FULLDEPS),$(true)) @@ -135,10 +137,7 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3 $(if $(4),,$(error No root has been set for the rdb file)) endef -# FIXME cannot have a dependency on $(gb_UnoApiTarget_RDBMAKERTARGET) here -# because that leads to dependency cycle because rdbmaker depends on offapi -$(call gb_UnoApiTarget_get_target,%) : $(gb_UnoApiTarget_XML2CMPTARGET) \ - $(gb_UnoApiTarget_REGCOMPARETARGET) $(gb_UnoApiTarget_REGMERGETARGET) +$(call gb_UnoApiTarget_get_target,%) : $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT)) $(call gb_UnoApiTarget__command,$@,$*) @@ -231,6 +230,7 @@ endef define gb_UnoApiTarget_merge_api $(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb))) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET) endef @@ -249,6 +249,8 @@ define gb_UnoApiTarget_set_xmlfile $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := $(SRCDIR)/$(2) $(call gb_UnoApiTarget_get_target,$(1)) : $(SRCDIR)/$(2) $(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XML2CMPTARGET) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_RDBMAKERTARGET) endef @@ -258,6 +260,7 @@ endef define gb_UnoApiTarget_set_reference_rdbfile $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPARETARGET) endef |