diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-10 03:04:49 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-12 20:21:28 +0200 |
| commit | 5a248896bee2a20685ec32f85b3992a1b747355d (patch) | |
| tree | f41a4fcd3a1e650145a7d1c8da8e11d807a31876 /solenv | |
| parent | c5718b012fcbd19c79ff6eb07ca00a39ae643d8d (diff) | |
gbuild: use => external headers
This fixes circular dependencies.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 37e202523ad4..8d886c68e9bb 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -617,7 +617,8 @@ endif endef define gb_LinkTarget__use_internal_api_one -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))) +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_UnoApiHeadersTarget_get_$(3)target,$(api)) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) ifeq ($(gb_FULLDEPS),$(true)) @@ -995,13 +996,13 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget__use_custom_headers +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_CustomTarget_get_target,$(2)) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) endif -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_CustomTarget_get_target,$(2))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) endef @@ -1028,8 +1029,8 @@ endef # use a header package, possibly from another module (i.e. via OUTDIR) define gb_LinkTarget_use_package -$(call gb_LinkTarget_get_headers_target,$(1) : | \ - $(call gb_Package_get_target,$(strip $(2)))) +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_Package_get_target,$(strip $(2))) endef |