From 735b743caff1545a04ad103e1ed7698e027bf229 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 2 Nov 2007 11:40:54 +0000
Subject: INTEGRATION: CWS os2port02 (1.27.58); FILE MERGED 2007/09/30 13:00:13
 ydario 1.27.58.1: Issue number: i82034 Submitted by: ydario Reviewed by: 
 ydario Commit of changes for OS/2 CWS source code integration.

---
 xmloff/util/makefile.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'xmloff/util')

diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 5b7a7c693291..f5ae53ace6f6 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.27 $
+#   $Revision: 1.28 $
 #
-#   last change: $Author: ihi $ $Date: 2007-07-11 13:04:17 $
+#   last change: $Author: hr $ $Date: 2007-11-02 12:40:54 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -63,9 +63,11 @@ LIB1FILES=	\
 .IF "$(GUI)"!="UNX"
 LIB4TARGET= $(LB)$/ixo.lib
 LIB4FILES=	$(LB)$/_ixo.lib
+.IF "$(GUI)"!="OS2"
 LIB4OBJFILES=\
     $(OBJ)$/xmlkywd.obj
 .ENDIF
+.ENDIF
 
 SHL1TARGET= xo$(UPD)$(DLLPOSTFIX)
 SHL1IMPLIB= _ixo
@@ -88,7 +90,7 @@ SHL1STDLIBS= \
         $(SALHELPERLIB)
 
 # SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC"
+.IF "(OS)"=="SCO"
 SHL1STDLIBS+=-licg617mxp
 .ENDIF
 
-- 
cgit