diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 10:32:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 14:01:08 +0100 |
| commit | 6bd0f9ba9d744b6d269eac72ae62e0bbd122a9a4 (patch) | |
| tree | 146b89c5239393beb10cb0c4c7787733b52c716c /testtools | |
| parent | decf809674a837bfddb5b9a376502927364377e8 (diff) | |
gbuild: refactor CliUnoApi
- stop copying the DLL to OUTDIR
- since that was the main reason for the separation between
CliUnoApi and CliUnoApiTarget, merge the targets;
the newly inherited variables are not expected to cause problems
- hardcode target to URE bin dir for now, no immediate need for
multiple layers
Change-Id: I428d801ec7058e1c6374d8162a4118a3fe581978
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest_climaker.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 70b5cd29fc0e..55c78a97989e 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -17,14 +17,14 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_UnoApiTarget_get_target,bridgetest) \ $(call gb_UnoApiTarget_get_target,udkapi) \ - $(OUTDIR)/bin/cli_uretypes.dll \ + $(call gb_CliUnoApi_get_target,cli_uretypes) \ $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(testtools_CLIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ - --out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \ + --out $@ -r $(call gb_CliUnoApi_get_target,cli_uretypes) \ -X $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_UnoApiTarget_get_target,bridgetest) > /dev/null) |