Port to Aplha-NT; checkin for bob meader <bob@guiduck.com>. TEMPLATE_19990726_BASE
authorsrinivas%netscape.com
Fri, 23 Jul 1999 16:35:29 +0000
changeset 732 9f3962adb6db39b6f13fcd4c6e91698a502838e2
parent 723 ff0efd11439a26793abc92ccc76b512034cc64b2
child 733 5ad33d4770d19c58f5194620f07a7f45c96b733e
child 734 6fb8fec576a6bc556a1c591840d062597434c03d
push idunknown
push userunknown
push dateunknown
Port to Aplha-NT; checkin for bob meader <bob@guiduck.com>.
config/Makefile
makefile.win
--- a/config/Makefile
+++ b/config/Makefile
@@ -79,22 +79,30 @@ PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
 
 ifeq ($(OS_ARCH),WINNT)
 TARGETS = $(PROGS)
 else
 PROGS	+= $(OBJDIR)/nsinstall$(PROG_SUFFIX)
 TARGETS = $(PROGS) $(PLSRCS:.pl=)
 endif
 
+OUTOPTION = -o
+ifeq ($(OS_ARCH), WINNT)
+ifeq ($(CPU_ARCH),ALPHA)
+OUTOPTION = /link /out:
+endif
+endif
+
 # Redefine MAKE_OBJDIR for just this directory
 define MAKE_OBJDIR
 if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
 endef
 
 export:: $(TARGETS)
 
 $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LINK) $(EXEFLAGS) $<
 else
-	$(CC) $(XCFLAGS) $< $(XLDOPTS) -o $@
+	$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
 endif
+
--- a/makefile.win
+++ b/makefile.win
@@ -44,27 +44,39 @@ GMAKE_FLAGS = $(GMAKE_FLAGS) BUILD_OPT=1
 
 !if "$(MOZ_BITS)" == "16"
 GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16
 !else
 
 GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN95
 !ifdef MOZ_DEBUG
 !ifdef MOZ_NO_DEBUG_RTL
+!IF "$(CPU)" == "ALPHA"
+PR_OBJDIR = WIN954.0ALPHA_DBG.OBJ
+!else
 PR_OBJDIR = WIN954.0_DBG.OBJ
+!endif
 !else
 GMAKE_FLAGS = $(GMAKE_FLAGS) USE_DEBUG_RTL=1
+!IF "$(CPU)" == "ALPHA"
+PR_OBJDIR = WIN954.0ALPHA_DBG.OBJD
+!else
 PR_OBJDIR = WIN954.0_DBG.OBJD
 !endif
+!endif
+!else
+!IF "$(CPU)" == "ALPHA"
+PR_OBJDIR = WIN954.0ALPHA_OPT.OBJ
 !else
 PR_OBJDIR = WIN954.0_OPT.OBJ
 !endif
+!endif
 
 !endif
-
+ 
 
 #
 # The rules.  Simply invoke gmake with the same target.
 # The default target is 'all'.  For Win16, set up the
 # environment to use the Watcom compiler, Watcom headers,
 # and Watcom libs.
 #