From 123d6e44d8315c31be4fed935a749a8da81f4241 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 5 Mar 2008 15:35:42 +0000
Subject: [PATCH] INTEGRATION: CWS nowrapcmd2 (1.21.4); FILE MERGED 2008/02/29
 23:38:26 vq 1.21.4.1: #i85207# Remove WRAPCMDs.

---
 solenv/inc/wntmsci11.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index d43e089e6b40..9a34a45466a9 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: wntmsci11.mk,v $
 #
-#   $Revision: 1.21 $
+#   $Revision: 1.22 $
 #
-#   last change: $Author: obo $ $Date: 2008-02-25 16:43:08 $
+#   last change: $Author: kz $ $Date: 2008-03-05 16:35:42 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -48,14 +48,14 @@ AFLAGS=/c /Cp /coff
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
 ARCH_FLAGS*=
 
-CC*:=$(WRAPCMD) cl
+CC*:=cl
 .IF "$(bndchk)" != ""
 CXX*=nmcl
 .ELSE
 .IF "$(truetime)" != ""
 CXX*=nmcl /NMttOn
 .ELSE
-CXX*:=$(WRAPCMD) cl
+CXX*:=cl
 .ENDIF
 .ENDIF # "$(bndchk)" != ""
 
@@ -223,7 +223,7 @@ CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
-LINK=$(WRAPCMD) link $(NOLOGO) /MACHINE:IX86
+LINK=link $(NOLOGO) /MACHINE:IX86
 LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
 .IF "$(PRODUCT)"!="full"
 .ELSE
@@ -316,8 +316,8 @@ MFC_INCLUDE*=$(COMPATH)$/atlmfc$/include
 MFC_LIB*=$(COMPATH)$/atlmfc$/lib
 .ENDIF
 
-LIBMGR=$(WRAPCMD) lib $(NOLOGO)
-IMPLIB=$(WRAPCMD) lib
+LIBMGR=lib $(NOLOGO)
+IMPLIB=lib
 LIBFLAGS=
 
 IMPLIBFLAGS=-machine:IX86
@@ -325,7 +325,7 @@ IMPLIBFLAGS=-machine:IX86
 MAPSYM=
 MAPSYMFLAGS=
 
-RC=$(WRAPCMD) rc
+RC=rc
 RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
 RCLINK=rc
 RCLINKFLAGS=
@@ -336,7 +336,7 @@ DLLPOSTFIX=mi
 PCHPOST=.pch
 
 CSC*=$(FLIPCMD) csc
-VBC*=$(WRAPCMD) vbc
+VBC*=vbc
 
 ADVAPI32LIB=advapi32.lib
 SHELL32LIB=shell32.lib