diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-06-07 10:13:44 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-06-07 10:13:44 +0200 |
| commit | 4edc7f8eac625e30719fec69bd9b26dd9356657c (patch) | |
| tree | eb75be1da94db899a53afb6ed788e017bd783b41 /xmloff/util/makefile.mk | |
| parent | 88581862df4e46ee0f6515267ffeb46a53d1ba53 (diff) | |
| parent | f8e7afbac976ca862a801b9648fd95b2107757b2 (diff) | |
jl152 merge with DEV300_m80
Diffstat (limited to 'xmloff/util/makefile.mk')
| -rw-r--r-- | xmloff/util/makefile.mk | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index a7060d79504c..b8745b6b8fff 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -53,17 +53,8 @@ LIB1FILES= \ # --- Shared-Library ----------------------------------------------- -.IF "$(GUI)"!="UNX" -LIB4TARGET= $(LB)$/ixo.lib -LIB4FILES= $(LB)$/_ixo.lib -.IF "$(GUI)"!="OS2" -LIB4OBJFILES=\ - $(OBJ)$/xmlkywd.obj -.ENDIF -.ENDIF - SHL1TARGET= xo$(DLLPOSTFIX) -SHL1IMPLIB= _ixo +SHL1IMPLIB= i$(TARGET) SHL1USE_EXPORTS=name SHL1STDLIBS= \ @@ -86,21 +77,6 @@ SHL1STDLIBS+=-licg617mxp SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1LIBS= $(LIB1TARGET) - -SHL5STDLIBS= \ - $(TOOLSLIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) - -.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC" - SHL5STDLIBS += -lxo$(DLLPOSTFIX) -.ELSE - SHL5STDLIBS += ixo.lib -.ENDIF - # --- Def-File --------------------------------------------------------- DEF1NAME =$(SHL1TARGET) |