diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-24 00:33:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-24 09:17:05 +0200 |
| commit | 4a0b39f592210b19e4dbf4b8c797969942269d80 (patch) | |
| tree | ba4c6166c0b57bce5ab826c682a280e326e4f2ba /testtools | |
| parent | 80fb8b775c34080b983648a2b596e17ba58850b6 (diff) | |
Get rid of UnoApiMerge_types
(The "statistic" target in offapi/UnoApiMerge_types.mk appears to have been
dead code already for quite a while.)
Change-Id: I0852ebf1f765ba881abb6ce4db496e949076fc64
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest_climaker.mk | 5 | ||||
| -rw-r--r-- | testtools/CustomTarget_bridgetest_javamaker.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 16f606f55ed4..19086d2e51ba 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -32,7 +32,8 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(testtools_CLIDIR)/cli_types_bridgetest.dll $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ - $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ + $(call gb_UnoApiTarget_get_target,udkapi) \ + $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(testtools_CLIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) @@ -40,7 +41,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ --out $@ \ - -X $(OUTDIR)/bin/types.rdb \ + -X $(call gb_UnoApiTarget_get_target,udkapi) \ -r $(OUTDIR)/bin/cli_uretypes.dll \ $< > /dev/null) diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index cf20bc006844..90d9956f13d0 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -32,12 +32,12 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_ $(testtools_JAVADIR)/done : \ $(call gb_UnoApiTarget_get_target,bridgetest) \ - $(OUTDIR)/bin/types.rdb \ + $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(testtools_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ rm -r $(testtools_JAVADIR) && \ - $(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@) + $(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $<) && touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |