summaryrefslogtreecommitdiff
path: root/offapi/util/makefile.mk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-06-04 01:28:25 +0000
committerOliver Bolte <obo@openoffice.org>2004-06-04 01:28:25 +0000
commitcb618f1c1429dbbf03cb1353191a172d0a643a8b (patch)
treea094b25cb8474c3183e47aa62f4eb9e99d4c0fb6 /offapi/util/makefile.mk
parentf5ec1ff15e3e63d65780c884de427d439fe567be (diff)
INTEGRATION: CWS sb18 (1.74.4); FILE MERGED
2004/05/21 11:58:15 sb 1.74.4.2: RESYNC: (1.74-1.75); FILE MERGED 2004/05/19 14:22:45 sb 1.74.4.1: #i21150# For now, call regcompare with -u.
Diffstat (limited to 'offapi/util/makefile.mk')
-rw-r--r--offapi/util/makefile.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 9012ca159494..e7649ef057d2 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.75 $
+# $Revision: 1.76 $
#
-# last change: $Author: hr $ $Date: 2004-04-13 11:59:55 $
+# last change: $Author: obo $ $Date: 2004-06-04 02:28:25 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -180,9 +180,12 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udk
#JSC: The type library has changed, all temporary not checked types are removed
# and will be check from now on.
# ATTENTION: no special handling for types is allowed.
+#
+#SB: Once the reference rdbs are new-style registries with explicit published
+# types, the "-u" should be removed again from the calls to regcompare:
$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
- +$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db
- +$(REGCOMPARE) -f -t -r1 $(REFERENCE_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db \
+ +$(REGCOMPARE) -f -t -u -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db
+ +$(REGCOMPARE) -f -t -u -r1 $(REFERENCE_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db \
&& echo > $(REGISTRYCHECKFLAG)
.INCLUDE : target.mk