summaryrefslogtreecommitdiff
path: root/offapi/util
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-20 09:18:17 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-20 09:18:17 +0000
commita6b1973c8edcca89ea82f48f6d42ab242c26eec7 (patch)
tree56afe1c428c205820fec1fe1fa60414b0a6e0597 /offapi/util
parentd94cf8100d80f5d8a3521413537733e2366afb9d (diff)
INTEGRATION: CWS sdk03 (1.58.2); FILE MERGED
2003/06/13 14:04:54 mba 1.58.2.1: #110230#: draft interfaces in frame removed
Diffstat (limited to 'offapi/util')
-rw-r--r--offapi/util/makefile.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 53de7af46394..2d489a62debd 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.58 $
+# $Revision: 1.59 $
#
-# last change: $Author: vg $ $Date: 2003-06-10 10:58:11 $
+# last change: $Author: vg $ $Date: 2003-06-20 10:18:17 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -98,7 +98,6 @@ UNOIDLDBFILES= \
$(UCR)$/cssfcontrol.db \
$(UCR)$/cssform.db \
$(UCR)$/cssformula.db \
- $(UCR)$/cssframe.db \
$(UCR)$/cssinstallation.db \
$(UCR)$/cssi18n.db \
$(UCR)$/cssldap.db \
@@ -149,11 +148,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)
+ +-$(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)
+ +-$(RM) $(REGISTRYCHECKFLAG)
+$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
+$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb