diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 15:30:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 15:30:47 +0000 |
| commit | f6d98bceaeed87a2569857f6309d0381a3ded2f4 (patch) | |
| tree | 3df841baa03810de375442398acfe5c547908b4b /odk/pack | |
| parent | fff8c826e67d2007cc7099c00cee8edec3f7caf3 (diff) | |
INTEGRATION: CWS jsc20 (1.85.14); FILE MERGED
2008/01/08 15:37:02 jsc 1.85.14.1: #i82046# remove local DevGuide
Diffstat (limited to 'odk/pack')
| -rw-r--r-- | odk/pack/copying/makefile.mk | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index c56c9e049507..2f5162b571f0 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.85 $ +# $Revision: 1.86 $ # -# last change: $Author: rt $ $Date: 2007-11-06 16:00:18 $ +# last change: $Author: vg $ $Date: 2008-01-28 16:30:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -48,35 +48,35 @@ DESTINCLUDELIST+=$(DESTDIRINC)$/udkversion.mk DESTINCDIRLIST={$(subst,$(INCOUT),$(DESTDIRINC) $(INCLUDEDIRLIST))} -COMPONENTLIST = \ - acceptor \ - bridgefac \ - connector \ - reflection \ - shlibloader \ - nestedreg \ - dynamicloader \ - implreg \ - introspection \ - invocation \ - invocadapt \ - javavm \ - namingservice \ - proxyfac \ - regtypeprov \ - remotebridge \ - simplereg \ - servicemgr \ - streams \ - typeconverter \ - typemgr \ - uuresolver \ - javaloader \ - security - -XMLLIST= \ - $(foreach,c,$(COMPONENTLIST) $(DESTDIRXML)$/$c.uno.xml) \ - $(DESTDIRXML)$/module-description.dtd +#COMPONENTLIST = \ +# acceptor \ +# bridgefac \ +# connector \ +# reflection \ +# shlibloader \ +# nestedreg \ +# dynamicloader \ +# implreg \ +# introspection \ +# invocation \ +# invocadapt \ +# javavm \ +# namingservice \ +# proxyfac \ +# regtypeprov \ +# remotebridge \ +# simplereg \ +# servicemgr \ +# streams \ +# typeconverter \ +# typemgr \ +# uuresolver \ +# javaloader \ +# security + +#XMLLIST= \ +# $(foreach,c,$(COMPONENTLIST) $(DESTDIRXML)$/$c.uno.xml) \ +# $(DESTDIRXML)$/module-description.dtd EXELIST = \ $(DESTDIRBIN)$/cppumaker$(EXEPOSTFIX) \ @@ -158,7 +158,6 @@ DOCUHTMLFILES+= \ $(DESTDIR2)$/index.html \ $(DESTDIRDOCU2)$/tools.html \ $(DESTDIRDOCU2)$/notsupported.html \ - $(DESTDIRDOCU2)$/DevelopersGuide_intro.html \ $(DESTDIRDOCU2)$/install.html \ $(DESTDIREXAMPLES2)$/examples.html \ $(DESTDIREXAMPLES2)$/DevelopersGuide$/examples.html @@ -206,7 +205,6 @@ INSTALLSCRIPT= \ DIR_FILE_LIST=\ $(EXELIST) \ - $(XMLLIST) \ $(LIBLIST) \ $(SETTINGSLIST) \ $(DOCUFILES) \ @@ -215,6 +213,8 @@ DIR_FILE_LIST=\ $(DESTINCLUDELIST) \ $(DESTCLASSESLIST) +# $(XMLLIST) \ + .IF "$(SOLAR_JAVA)" != "" DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll .ENDIF |