diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | c326b2f169abf875912d8d40485eead41926981d (patch) | |
| tree | 47e6a13d3411d6b43c9d4ade11ac2a34314e4ebb /moz | |
| parent | 81341944540166215d0d166bbabc2f579308b546 (diff) | |
| parent | 084b3d7eae29d9e9e6e1a65054ffe4d11cda3576 (diff) | |
CWS-TOOLING: integrate CWS sb118
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/extractfiles.mk | 5 | ||||
| -rw-r--r-- | moz/makefile.mk | 12 |
2 files changed, 0 insertions, 17 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index c8d88c015411..dedfade257db 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -386,10 +386,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) @@ -397,7 +393,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 cd7e3e67997c..050d923c48e7 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -169,13 +169,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch 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" @@ -245,7 +239,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 @@ -254,11 +247,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" |