summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-11-02 11:40:32 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-11-02 11:40:32 +0000
commit278bf37c44f2a7caec3d2e54f4463f20e6dcf9f8 (patch)
tree42899b045dfaf5c891c59958d0d2f51a47b2b92a
parent80c2e6f0b04863bddea0963d3a76bb1e1e6eccee (diff)
INTEGRATION: CWS os2port02 (1.10.60); FILE MERGED
2007/09/30 13:00:13 ydario 1.10.60.1: Issue number: i82034 Submitted by: ydario Reviewed by: ydario Commit of changes for OS/2 CWS source code integration.
-rw-r--r--xmloff/source/transform/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk
index 6d95e3911600..76916aaa12e8 100644
--- a/xmloff/source/transform/makefile.mk
+++ b/xmloff/source/transform/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: ihi $ $Date: 2007-07-11 13:04:00 $
+# last change: $Author: hr $ $Date: 2007-11-02 12:40:32 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -90,7 +90,7 @@ SHL1STDLIBS = \
$(SALHELPERLIB) \
$(SALLIB) \
$(TOOLSLIB)
-.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
SHL1STDLIBS += -lxo$(OFFICEUPD)$(DLLPOSTFIX)
.ELSE
SHL1STDLIBS += ixo.lib