diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-16 19:58:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-16 22:07:48 +0100 |
| commit | 0ef8beedb1d2ce70e4d5ec7b24afd1711db29f38 (patch) | |
| tree | 15c82b480f90aeed26641953b198a43a1a62651a /solenv/gbuild/ComponentTarget.mk | |
| parent | 268cfdf23ca410d68bc9f7fb03e32a9a603d0e6d (diff) | |
gbuild: refactor gb_Library_set_componentfile:
Reverse the dependency: now the component target depends (order-only) on the
library, which should ensure that gb_CppunitTest_add_component can set up
dependencies such that the unit test does not run concurrently with
a library loaded via UNO being overwritten.
Unfortunately this requires introducing another phony dummy library
target, on which the module can depend (because we don't want to register
the component target as a module target).
Diffstat (limited to 'solenv/gbuild/ComponentTarget.mk')
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 031d118310c5..efe481991a19 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -58,7 +58,8 @@ $(call gb_ComponentTarget_get_outdir_target,%) : define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) -$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1)) +$(call gb_ComponentTarget_get_outdir_target,$(1)) : \ + $(call gb_ComponentTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) endef |