From 5f845545bfd280af978bec9967ed06f6478bce8a Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 12 Jan 2010 18:49:59 +0100
Subject: sb118: #i108269# first step of removing tcsh support

---
 moz/extractfiles.mk |  5 -----
 moz/makefile.mk     | 12 ------------
 2 files changed, 17 deletions(-)

(limited to 'moz')

diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index 81e04ab80ad6..dc126ce70287 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -390,10 +390,6 @@ $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 
 
 $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
-.IF "$(USE_SHELL)"=="4nt"
-    $(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
-    $(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ELSE
 .IF "$(OS)"!="SOLARIS"
     $(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
     $(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
@@ -401,7 +397,6 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
     $(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
     $(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
 .ENDIF			# "$(OS)"!="SOLARIS"
-.ENDIF
 
 .IF "$(GUI)"=="UNX"
     chmod -R 775 $(INCCOM)
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 0aabda002e2e..b7c95c642b8e 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -171,13 +171,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ
 
 CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
 
-.IF "$(USE_SHELL)"!="4nt"
 BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
-.ELSE
-# This construct is needed because unitools.mk defines GNUMAKE using $ENV_TOOLS.
-# $ENV_TOOLS doesn't exist for OOo builds and the cygwin make is needed.
-BUILD_ACTION:=make
-.ENDIF
 
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
@@ -247,7 +241,6 @@ MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst
 .ELSE
 MOZTOOLS_EXTRACT:=$(MISC)$/build$/moztools
 .ENDIF
-.IF "$(USE_SHELL)"!="4nt"
 .IF "$(COM)"=="GCC"
 MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztoolsinst
 PATH!:=$(PATH):$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(shell @cygpath $(MOZ_TOOLS_DOS))/vc71/bin
@@ -256,11 +249,6 @@ SET_MOZ_TOOLS_INSTALL_BAT:=export "MOZ_TOOLS=$(MOZ_TOOLS_DOS)"
 MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztools\vc8-moztools
 PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH)
 .ENDIF
-.ELSE # "$(USE_SHELL)"!="4nt"
-# MOZ_TOOLS must contain an absolute path
-MOZ_TOOLS_DOS:=$(shell @echo %@SFN[$(MISC)])\build\moztools\vc8-moztools
-PATH!:=$(MOZ_TOOLS_DOS)\bin;$(PATH)
-.ENDIF # "$(USE_SHELL)"!="4nt"
 
 MOZ_TOOLS:=$(subst,\,/ $(MOZ_TOOLS_DOS))
 .IF "$(COM)"=="GCC"
-- 
cgit