diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-24 15:04:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-24 15:04:56 +0000 |
| commit | 037286e39c01000eb016caf0630997a5778bb1e5 (patch) | |
| tree | afc60d52d40aa2774af941af407b650dc83de155 /writerfilter/unocomponent | |
| parent | INTEGRATION: CWS xf02bigcleanup (1.6.4); FILE MERGED (diff) | |
| download | core-037286e39c01000eb016caf0630997a5778bb1e5.tar.gz core-037286e39c01000eb016caf0630997a5778bb1e5.zip | |
INTEGRATION: CWS xf02bigcleanup (1.7.20); FILE MERGED
2008/01/23 11:22:39 fridrich_strba 1.7.20.1: binning odiapi and related debug services. I asked henning, so if I break something, you can lynch him instead of me :-)
Diffstat (limited to 'writerfilter/unocomponent')
| -rw-r--r-- | writerfilter/unocomponent/makefile.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk index fd901a5a8a77..9114a816626e 100644 --- a/writerfilter/unocomponent/makefile.mk +++ b/writerfilter/unocomponent/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: hbrinkm $ $Date: 2007-04-13 10:43:14 $ +# last change: $Author: vg $ $Date: 2008-01-24 16:04:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,14 +50,10 @@ SLOFILES=$(SLO)$/component.obj SHL1TARGET=$(TARGET) .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" -ODIAPILIB=-lodiapi -RTFTOKLIB=-lrtftok DOCTOKLIB=-ldoctok OOXMLLIB=-looxml RESOURCEMODELLIB=-lresourcemodel .ELIF "$(GUI)"=="WNT" -ODIAPILIB=$(LB)$/iodiapi.lib -RTFTOKLIB=$(LB)$/irtftok.lib DOCTOKLIB=$(LB)$/idoctok.lib OOXMLLIB=$(LB)$/iooxml.lib RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib @@ -68,17 +64,11 @@ SHL1STDLIBS=$(SALLIB)\ $(COMPHELPERLIB)\ $(CPPUHELPERLIB)\ $(UCBHELPERLIB)\ - $(ODIAPILIB) \ - $(RTFTOKLIB) \ $(DOCTOKLIB) \ $(OOXMLLIB) \ $(RESOURCEMODELLIB) SHL1LIBS=\ - $(SLB)$/debugservices_xxml.lib \ - $(SLB)$/debugservices_rtftok.lib \ - $(SLB)$/debugservices_odsl.lib \ - $(SLB)$/debugservices_rtfsl.lib \ $(SLB)$/debugservices_doctok.lib \ $(SLB)$/debugservices_ooxml.lib |