diff options
| author | Andrew Innes | 2001-01-06 21:18:05 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-01-06 21:18:05 +0000 |
| commit | 6da21b33f531d8e40ff3f8d57e41395a9cddb907 (patch) | |
| tree | 535384affbb36877ddd49bb658ba6deac449dd6f | |
| parent | df6c4c2b832c61896a4eb8a1b6ed3adc1a12a65e (diff) | |
| download | emacs-6da21b33f531d8e40ff3f8d57e41395a9cddb907.tar.gz emacs-6da21b33f531d8e40ff3f8d57e41395a9cddb907.zip | |
(EMACS_ICON_PATH): Delete definition.
(COMPILER_TEMP_FILES): New definition.
(MAKETYPE): New definition.
| -rw-r--r-- | nt/gmake.defs | 7 | ||||
| -rw-r--r-- | nt/nmake.defs | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nt/gmake.defs b/nt/gmake.defs index 6589986ab2f..96dd1f88ebf 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs | |||
| @@ -76,6 +76,8 @@ SHELLTYPE=SH | |||
| 76 | SETLOADPATH=EMACSLOADPATH=$(CURDIR)/../lisp | 76 | SETLOADPATH=EMACSLOADPATH=$(CURDIR)/../lisp |
| 77 | endif | 77 | endif |
| 78 | 78 | ||
| 79 | MAKETYPE=gmake | ||
| 80 | |||
| 79 | # Cygwin has changed quoting rules somewhat since b20, in a way that | 81 | # Cygwin has changed quoting rules somewhat since b20, in a way that |
| 80 | # affects makefiles using sh as the command processor, so we need to | 82 | # affects makefiles using sh as the command processor, so we need to |
| 81 | # detect which rules to use. | 83 | # detect which rules to use. |
| @@ -184,6 +186,8 @@ BLD = $(OBJDIR)/$(ARCH) | |||
| 184 | $(BLD): $(OBJDIR) | 186 | $(BLD): $(OBJDIR) |
| 185 | -mkdir "$(BLD)" | 187 | -mkdir "$(BLD)" |
| 186 | 188 | ||
| 189 | COMPILER_TEMP_FILES = | ||
| 190 | |||
| 187 | CP = cp -f | 191 | CP = cp -f |
| 188 | CP_DIR = cp -rf | 192 | CP_DIR = cp -rf |
| 189 | DEL = rm | 193 | DEL = rm |
| @@ -217,9 +221,6 @@ DQUOTE = \" | |||
| 217 | 221 | ||
| 218 | endif | 222 | endif |
| 219 | 223 | ||
| 220 | # The location of the icon file | ||
| 221 | EMACS_ICON_PATH = ../nt/emacs.ico | ||
| 222 | |||
| 223 | ifdef NODEBUG | 224 | ifdef NODEBUG |
| 224 | DEBUG_FLAG = | 225 | DEBUG_FLAG = |
| 225 | else | 226 | else |
diff --git a/nt/nmake.defs b/nt/nmake.defs index f979c9688f1..27c1ca342a0 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs | |||
| @@ -22,6 +22,8 @@ all: | |||
| 22 | THE_SHELL = $(COMSPEC) | 22 | THE_SHELL = $(COMSPEC) |
| 23 | SHELLTYPE=CMD | 23 | SHELLTYPE=CMD |
| 24 | 24 | ||
| 25 | MAKETYPE=nmake | ||
| 26 | |||
| 25 | ALL_DEPS = $** | 27 | ALL_DEPS = $** |
| 26 | 28 | ||
| 27 | SUBSYSTEM_WINDOWS=-subsystem:windows | 29 | SUBSYSTEM_WINDOWS=-subsystem:windows |
| @@ -140,6 +142,8 @@ BLD = $(OBJDIR)/$(ARCH) | |||
| 140 | $(BLD): $(OBJDIR) | 142 | $(BLD): $(OBJDIR) |
| 141 | -mkdir "$(BLD)" | 143 | -mkdir "$(BLD)" |
| 142 | 144 | ||
| 145 | COMPILER_TEMP_FILES = *.pdb | ||
| 146 | |||
| 143 | CP = cp -f | 147 | CP = cp -f |
| 144 | CP_DIR = cp -rf | 148 | CP_DIR = cp -rf |
| 145 | IFNOTSAMEDIR = if not exist ..\same-dir.tst | 149 | IFNOTSAMEDIR = if not exist ..\same-dir.tst |
| @@ -153,9 +157,6 @@ DQUOTE = \" | |||
| 153 | DEL = rm | 157 | DEL = rm |
| 154 | DEL_TREE = rm -r | 158 | DEL_TREE = rm -r |
| 155 | 159 | ||
| 156 | # The location of the icon file | ||
| 157 | EMACS_ICON_PATH = ../nt/emacs.ico | ||
| 158 | |||
| 159 | !ifdef NODEBUG | 160 | !ifdef NODEBUG |
| 160 | DEBUG_FLAG = | 161 | DEBUG_FLAG = |
| 161 | !else | 162 | !else |