summaryrefslogtreecommitdiff
path: root/cli_ure/unotypes
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-03-09 13:04:42 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-03-09 13:04:42 +0000
commit6b98e7a7be164d536a05e822637af827cad486d0 (patch)
tree0df0cf748d06c011e90994f109f1ea73201cc1bc /cli_ure/unotypes
parenta8b7bd9d348f27d6755432197d1a4478acc38a70 (diff)
INTEGRATION: CWS vq29 (1.14.8); FILE MERGED
2006/03/07 18:32:05 vq 1.14.8.1: #i62624# Fix parallel building for W32.
Diffstat (limited to 'cli_ure/unotypes')
-rw-r--r--cli_ure/unotypes/makefile.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk
index 0805b2b072d3..760fe5d8c13a 100644
--- a/cli_ure/unotypes/makefile.mk
+++ b/cli_ure/unotypes/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.15 $
+# $Revision: 1.16 $
#
-# last change: $Author: rt $ $Date: 2006-03-09 10:54:34 $
+# last change: $Author: rt $ $Date: 2006-03-09 14:04:42 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -76,7 +76,8 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
# --assembly-copyright "2003" \
#do not forget to deliver cli_types.config. It is NOT embedded in the policy file.
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_types.config
+# iz62624: Add dependency for "$(OUT)$/bin$/cli_types.dll" because climaker locks cliuno.mk.
+$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_types.config $(OUT)$/bin$/cli_types.dll
+$(WRAPCMD) AL.exe -out:$@ \
-version:$(CLI_TYPES_POLICY_VERSION) \
-keyfile:$(BIN)$/cliuno.snk \