diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:48:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:48:12 +0000 |
| commit | 936a7082e43772875f277fd83ec27a2bbefa3471 (patch) | |
| tree | bedfa294bc9d10eb59d73cd2d0a06bafded18ae1 /odk/pack | |
| parent | 27350a97964e04f3941b8eadda54f04635b66fb8 (diff) | |
INTEGRATION: CWS jl104 (1.87.12); FILE MERGED
2008/06/19 11:57:18 jl 1.87.12.2: #i88078
2008/06/19 10:01:19 jl 1.87.12.1: #i88078# moving cli-uno assemblies to odk
Diffstat (limited to 'odk/pack')
| -rw-r--r-- | odk/pack/copying/makefile.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index e90f3e62f3dd..79da29433406 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.87 $ +# $Revision: 1.88 $ # # This file is part of OpenOffice.org. # @@ -107,6 +107,16 @@ EXELIST += \ .ENDIF .IF "$(GUI)"=="WNT" +CLILIST = \ + $(DESTDIRCLI)$/cli_basetypes.dll \ + $(DESTDIRCLI)$/cli_uretypes.dll \ + $(DESTDIRCLI)$/cli_oootypes.dll \ + $(DESTDIRCLI)$/cli_ure.dll \ + $(DESTDIRCLI)$/cli_cppuhelper.dll +.ENDIF + + +.IF "$(GUI)"=="WNT" LIBLIST = \ $(DESTDIRLIB)$/istore.lib \ $(DESTDIRLIB)$/ireg.lib \ @@ -203,6 +213,7 @@ INSTALLSCRIPT= \ DIR_FILE_LIST=\ $(EXELIST) \ + $(CLILIST) \ $(LIBLIST) \ $(SETTINGSLIST) \ $(DOCUFILES) \ @@ -211,8 +222,6 @@ DIR_FILE_LIST=\ $(DESTINCLUDELIST) \ $(DESTCLASSESLIST) -# $(XMLLIST) \ - .IF "$(SOLAR_JAVA)" != "" DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll .ENDIF @@ -238,7 +247,6 @@ MYZIPLIST=com$/* win$/* all : \ $(DIR_FILE_LIST) \ $(DIR_FILE_FLAG) \ - $(MYZIPTARGET) #-------------------------------------------------- # use global rules |