diff options
| author | srinivas%netscape.com <devnull@localhost> | 1999-07-23 16:35:29 +0000 |
|---|---|---|
| committer | srinivas%netscape.com <devnull@localhost> | 1999-07-23 16:35:29 +0000 |
| commit | c35ebfeb00f355a9cd0064a40792929a3e41ad33 (patch) | |
| tree | 3138acfd92bedf2fd2b30df4de1b9ebafefb9789 | |
| parent | c402ea8b9f4d129494fd30bf9dc1f4c5ccacf36f (diff) | |
| download | nspr-hg-c35ebfeb00f355a9cd0064a40792929a3e41ad33.tar.gz | |
Port to Aplha-NT; checkin for bob meader <bob@guiduck.com>.TEMPLATE_19990726_BASE
| -rw-r--r-- | config/Makefile | 10 | ||||
| -rw-r--r-- | makefile.win | 14 |
2 files changed, 22 insertions, 2 deletions
diff --git a/config/Makefile b/config/Makefile index 6a48ed63..e52ce589 100644 --- a/config/Makefile +++ b/config/Makefile @@ -84,6 +84,13 @@ 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 @@ -96,5 +103,6 @@ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) ifeq ($(MOZ_OS2_TOOLS),VACPP) $(LINK) $(EXEFLAGS) $< else - $(CC) $(XCFLAGS) $< $(XLDOPTS) -o $@ + $(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@ endif + diff --git a/makefile.win b/makefile.win index 6684d7a1..6c45879f 100644 --- a/makefile.win +++ b/makefile.win @@ -49,17 +49,29 @@ GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16 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. |