From fab7a005101de8c16083903c3efecf7de3e3f47c Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 24 Jan 2006 15:43:44 +0000
Subject: INTEGRATION: CWS sb42 (1.3.12); FILE MERGED 2005/12/01 16:58:34 jl
1.3.12.1: #58239# test did not build
---
cli_ure/qa/climaker/makefile.mk | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
(limited to 'cli_ure')
diff --git a/cli_ure/qa/climaker/makefile.mk b/cli_ure/qa/climaker/makefile.mk
index fe821cdd2b33..3d560ed8a3db 100644
--- a/cli_ure/qa/climaker/makefile.mk
+++ b/cli_ure/qa/climaker/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: rt $ $Date: 2005-10-19 11:53:11 $
+# last change: $Author: hr $ $Date: 2006-01-24 16:43:44 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -38,8 +38,11 @@ PRJNAME := cli_ure
TARGET := test_climaker
PACKAGE = climaker
+#we use the climaker which is build by this project
+CLIMAKER*=$(WRAPCMD) $(BIN)$/climaker
.INCLUDE: settings.mk
+
#----- compile .java files -----------------------------------------
JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar
@@ -105,7 +108,7 @@ $(OUTDIR)$/types.rdb: $(OUTDIR)$/types.urd
$(REGMERGE) $@ /UCR $<
$(OUTDIR)$/cli_test_types.dll: $(OUTDIR)$/types.rdb $(BIN)$/climaker.exe $(BIN)$/cli_types.dll
- $(BIN)$/$(CLIMAKER) $(CLIMAKERFLAGS) --out $@ \
+ $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ \
-r $(BIN)$/cli_types.dll \
-X $(SOLARBINDIR)$/types.rdb \
$(OUTDIR)$/types.rdb
--
cgit