strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS jl104 (1.87.12); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2008-06-25 10:48:12 +00:00
parent 27350a9796
commit 936a7082e4
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
odk/pack/copying/makefile.mk
View file

@ -8,7 +8,7 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.87 $ # $Revision: 1.88 $
# #
# This file is part of OpenOffice.org. # This file is part of OpenOffice.org.
# #
@ -106,6 +106,16 @@ EXELIST += \
$(DESTDIRBIN)$/regcomp $(DESTDIRBIN)$/regcomp
.ENDIF .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" .IF "$(GUI)"=="WNT"
LIBLIST = \ LIBLIST = \
$(DESTDIRLIB)$/istore.lib \ $(DESTDIRLIB)$/istore.lib \
@ -203,6 +213,7 @@ INSTALLSCRIPT= \
DIR_FILE_LIST=\ DIR_FILE_LIST=\
$(EXELIST) \ $(EXELIST) \
$(CLILIST) \
$(LIBLIST) \ $(LIBLIST) \
$(SETTINGSLIST) \ $(SETTINGSLIST) \
$(DOCUFILES) \ $(DOCUFILES) \
@ -211,8 +222,6 @@ DIR_FILE_LIST=\
$(DESTINCLUDELIST) \ $(DESTINCLUDELIST) \
$(DESTCLASSESLIST) $(DESTCLASSESLIST)
# $(XMLLIST) \
.IF "$(SOLAR_JAVA)" != "" .IF "$(SOLAR_JAVA)" != ""
DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll
.ENDIF .ENDIF
@ -238,7 +247,6 @@ MYZIPLIST=com$/* win$/*
all : \ all : \
$(DIR_FILE_LIST) \ $(DIR_FILE_LIST) \
$(DIR_FILE_FLAG) \ $(DIR_FILE_FLAG) \
$(MYZIPTARGET)
#-------------------------------------------------- #--------------------------------------------------
# use global rules # use global rules