diff options
author | Daniel Boelzle <dbo@openoffice.org> | 2002-07-31 12:14:51 +0000 |
---|---|---|
committer | Daniel Boelzle <dbo@openoffice.org> | 2002-07-31 12:14:51 +0000 |
commit | 518aca228ceb3006e891caa4bef090d4a2680fe8 (patch) | |
tree | fad7a7570605791bab3f3d56e74d13f1d62e2dae /offapi | |
parent | 73d9da9960f1fd6ebe7b940a35f0e3749f632098 (diff) |
#101918# separating udkapi types from offapi types, merging both into applicat.rdb
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/prj/d.lst | 6 | ||||
-rw-r--r-- | offapi/util/makefile.mk | 22 |
2 files changed, 22 insertions, 6 deletions
diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst index ab4e6d9272cd..e496488dcbfe 100644 --- a/offapi/prj/d.lst +++ b/offapi/prj/d.lst @@ -65,8 +65,10 @@ mkdir: %_DEST%\idl%_EXT%\com\sun\star\xml\sax mkdir: %_DEST%\idl%_EXT%\com\sun\star\ui mkdir: %_DEST%\idl%_EXT%\com\sun\star\ui\dialogs -..\%__SRC%\ucr\offapi.db %_DEST%\bin%_EXT%\applicat.rdb -..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin%_EXT%\applicat_doc.rdb +..\%__SRC%\ucr\offapi.db %_DEST%\bin%_EXT%\offapi.rdb +..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin%_EXT%\offapi_doc.rdb +..\%__SRC%\ucr\applicat.rdb %_DEST%\bin%_EXT%\applicat.rdb +..\%__SRC%\ucrdoc\applicat_doc.db %_DEST%\bin%_EXT%\applicat_doc.rdb ..\com\sun\star\awt\*.idl %_DEST%\idl%_EXT%\com\sun\star\awt\*.idl ..\com\sun\star\chart\*.idl %_DEST%\idl%_EXT%\com\sun\star\chart\*.idl diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk index f1d166369ae9..56071f6062c3 100644 --- a/offapi/util/makefile.mk +++ b/offapi/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.40 $ +# $Revision: 1.41 $ # -# last change: $Author: af $ $Date: 2002-07-26 08:36:28 $ +# last change: $Author: dbo $ $Date: 2002-07-31 13:14:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,8 +78,8 @@ TARGET=offapi_db # ------------------------------------------------------------------ -UNOIDLDBREGS= \ - $(SOLARBINDIR)$/udkapi.rdb +#UNOIDLDBREGS= \ +# $(SOLARBINDIR)$/udkapi.rdb UNOIDLDBFILES= \ $(UCR)$/cssawt.db \ @@ -151,6 +151,20 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag # --- Targets ------------------------------------------------------ +.IF "$(depend)" == "" +ALLTAR : $(UCR)$/applicat.db $(OUT)$/ucrdoc$/applicat_doc.db + +$(UCR)$/applicat.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb + +$(GNUCOPY) -f $(UCR)$/offapi.db $@ + +regmerge $@ / $(SOLARBINDIR)$/udkapi.rdb +$(OUT)$/ucrdoc$/applicat_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb + +$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@ + +regmerge $@ / $(SOLARBINDIR)$/udkapi_doc.rdb + +.ELSE +ALL : ALLDEP +.ENDIF + .INCLUDE : target.mk .IF "$(BUILD_SOSL)"=="" |