summaryrefslogtreecommitdiff
path: root/offapi/util
diff options
context:
space:
mode:
authorJuergen Schmidt <jsc@openoffice.org>2002-12-02 10:34:04 +0000
committerJuergen Schmidt <jsc@openoffice.org>2002-12-02 10:34:04 +0000
commitd1c94c036199ac9d1a80cb927bc31d01952a3ab6 (patch)
treeaefa2952e6050932d13822c4efab50a937f64de2 /offapi/util
parentd4f61090a9de3ff73b5603a70d057aa16751cf66 (diff)
#105668# update type library check
Diffstat (limited to 'offapi/util')
-rw-r--r--offapi/util/makefile.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 589d86fc55b1..62a3b5341ab4 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.49 $
+# $Revision: 1.50 $
#
-# last change: $Author: mi $ $Date: 2002-11-20 15:16:30 $
+# last change: $Author: jsc $ $Date: 2002-12-02 11:34:04 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -159,9 +159,11 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
ALLTAR : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
+ +-$(RM) $(REGISTRYCHECKFLAG)
+$(GNUCOPY) -f $(UCR)$/offapi.db $@
+$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
+ +-$(RM) $(REGISTRYCHECKFLAG)
+$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
+$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
@@ -175,9 +177,11 @@ ALL : ALLDEP
ALLTAR: $(REGISTRYCHECKFLAG) autodoc
-$(REGISTRYCHECKFLAG) : $(UNOIDLDBTARGET)
- +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_RDB) -r2 $(UNOIDLDBTARGET)
- +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_DOC_RDB) -r2 $(UNOIDLDBTARGET) && echo > $(REGISTRYCHECKFLAG)
+# special work necessary for i18n reservedWords
+# ATTENTION: no special handling for other types is allowed.
+$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
+ +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_RDB) -r2 $(UCR)$/types.db -x /UCR/com/sun/star/i18n/reservedWords
+ +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db -x /UCR/com/sun/star/i18n/reservedWords && echo > $@
autodoc: $(OUT)$/misc$/offapi.autodoc