From ae75a0dd0b687242302ff2ad2369f7a5edaf09f3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 24 Apr 2013 18:56:34 +0200
Subject: More "Let climaker work on *.rdb.oldformat for now"

...also, the use of double use of udkapi.rdb in climaker call in
testtools/CustomTarget_bridgetest_climaker.mk looked fishy.

Change-Id: I8be22b184740d65e567df65bae51fe18066be102
---
 unoil/CustomTarget_climaker.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'unoil')

diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index 990ed26b6b2e..9d1ef46ad603 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -19,7 +19,8 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
 	$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
 
 $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
-		$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
+		$(call gb_UnoApiTarget_get_target,offapi) \
+		$(call gb_UnoApiTarget_get_target,udkapi) \
 		$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
 		$(call gb_Executable_get_runtime_dependencies,climaker) \
 		| $(unoil_CLIDIR)/.dir
@@ -31,10 +32,10 @@ $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
 		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
 		--assembly-company "LibreOffice" \
 		--assembly-description "This assembly contains metadata for the LibreOffice API." \
-		-X $(OUTDIR)/bin/udkapi.rdb \
+		-X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \
 		-r $(OUTDIR)/bin/cli_uretypes.dll \
 		--keyfile $(OUTDIR)/bin/cliuno.snk \
-		$(OUTDIR)/bin/offapi.rdb) > /dev/null)
+		$(call gb_UnoApiTarget_get_target,offapi).oldformat) > /dev/null)
 
 $(unoil_CLIDIR)/cli_oootypes.config : \
 		$(SRCDIR)/unoil/climaker/cli_oootypes_config \
-- 
cgit v1.2.3