summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 11:05:37 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 11:05:37 +0000
commit66ffdb330776dbb1a8d178e93e855465f656cd84 (patch)
tree9a0abba3e8952fbaff1d6a90a4c43c074d0471bf
parentc7e4223eba6ebeb28c195b4a02b3bfa1a7ba421e (diff)
INTEGRATION: CWS jl104 (1.7.4); FILE MERGED
2008/06/18 14:24:59 jl 1.7.4.1: #i88078# cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools
-rw-r--r--cli_ure/qa/climaker/makefile.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/cli_ure/qa/climaker/makefile.mk b/cli_ure/qa/climaker/makefile.mk
index 34211f8fd1f7..09e589811767 100644
--- a/cli_ure/qa/climaker/makefile.mk
+++ b/cli_ure/qa/climaker/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
# This file is part of OpenOffice.org.
#
@@ -73,13 +73,13 @@ CSFILES = climaker.cs testobjects.cs
$(EXETARGET): $(CSFILES) $(OUTDIR)$/cli_test_types.dll
$(GNUCOPY) -p $(BIN)$/cli_cppuhelper.dll $(OUTDIR)$/cli_cppuhelper.dll
- $(GNUCOPY) -p $(BIN)$/cli_types.dll $(OUTDIR)$/cli_types.dll
+ $(GNUCOPY) -p $(BIN)$/cli_uretypes.dll $(OUTDIR)$/cli_uretypes.dll
$(GNUCOPY) -p $(BIN)$/cli_basetypes.dll $(OUTDIR)$/cli_basetypes.dll
$(GNUCOPY) -p $(BIN)$/cli_ure.dll $(OUTDIR)$/cli_ure.dll
$(GNUCOPY) -p $(BIN)$/climaker.exe $(OUTDIR)
$(CSC) $(CSCFLAGS) -target:exe -out:$(EXETARGET) \
-reference:$(BIN)$/cli_ure.dll \
- -reference:$(BIN)$/cli_types.dll \
+ -reference:$(BIN)$/cli_uretypes.dll \
-reference:$(BIN)$/cli_basetypes.dll \
-reference:$(OUTDIR)$/cli_test_types.dll \
$(CSFILES)
@@ -103,9 +103,9 @@ $(OUTDIR)$/types.rdb: $(OUTDIR)$/types.urd
- rm $@
$(REGMERGE) $@ /UCR $<
-$(OUTDIR)$/cli_test_types.dll: $(OUTDIR)$/types.rdb $(BIN)$/climaker.exe $(BIN)$/cli_types.dll
+$(OUTDIR)$/cli_test_types.dll: $(OUTDIR)$/types.rdb $(BIN)$/climaker.exe $(BIN)$/cli_uretypes.dll
$(CLIMAKER) $(CLIMAKERFLAGS) --out $@ \
- -r $(BIN)$/cli_types.dll \
+ -r $(BIN)$/cli_uretypes.dll \
-X $(SOLARBINDIR)$/types.rdb \
$(OUTDIR)$/types.rdb