aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Innes2001-01-06 21:18:05 +0000
committerAndrew Innes2001-01-06 21:18:05 +0000
commit6da21b33f531d8e40ff3f8d57e41395a9cddb907 (patch)
tree535384affbb36877ddd49bb658ba6deac449dd6f
parentdf6c4c2b832c61896a4eb8a1b6ed3adc1a12a65e (diff)
downloademacs-6da21b33f531d8e40ff3f8d57e41395a9cddb907.tar.gz
emacs-6da21b33f531d8e40ff3f8d57e41395a9cddb907.zip
(EMACS_ICON_PATH): Delete definition.
(COMPILER_TEMP_FILES): New definition. (MAKETYPE): New definition.
-rw-r--r--nt/gmake.defs7
-rw-r--r--nt/nmake.defs7
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
76SETLOADPATH=EMACSLOADPATH=$(CURDIR)/../lisp 76SETLOADPATH=EMACSLOADPATH=$(CURDIR)/../lisp
77endif 77endif
78 78
79MAKETYPE=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
189COMPILER_TEMP_FILES =
190
187CP = cp -f 191CP = cp -f
188CP_DIR = cp -rf 192CP_DIR = cp -rf
189DEL = rm 193DEL = rm
@@ -217,9 +221,6 @@ DQUOTE = \"
217 221
218endif 222endif
219 223
220# The location of the icon file
221EMACS_ICON_PATH = ../nt/emacs.ico
222
223ifdef NODEBUG 224ifdef NODEBUG
224DEBUG_FLAG = 225DEBUG_FLAG =
225else 226else
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:
22THE_SHELL = $(COMSPEC) 22THE_SHELL = $(COMSPEC)
23SHELLTYPE=CMD 23SHELLTYPE=CMD
24 24
25MAKETYPE=nmake
26
25ALL_DEPS = $** 27ALL_DEPS = $**
26 28
27SUBSYSTEM_WINDOWS=-subsystem:windows 29SUBSYSTEM_WINDOWS=-subsystem:windows
@@ -140,6 +142,8 @@ BLD = $(OBJDIR)/$(ARCH)
140$(BLD): $(OBJDIR) 142$(BLD): $(OBJDIR)
141 -mkdir "$(BLD)" 143 -mkdir "$(BLD)"
142 144
145COMPILER_TEMP_FILES = *.pdb
146
143CP = cp -f 147CP = cp -f
144CP_DIR = cp -rf 148CP_DIR = cp -rf
145IFNOTSAMEDIR = if not exist ..\same-dir.tst 149IFNOTSAMEDIR = if not exist ..\same-dir.tst
@@ -153,9 +157,6 @@ DQUOTE = \"
153DEL = rm 157DEL = rm
154DEL_TREE = rm -r 158DEL_TREE = rm -r
155 159
156# The location of the icon file
157EMACS_ICON_PATH = ../nt/emacs.ico
158
159!ifdef NODEBUG 160!ifdef NODEBUG
160DEBUG_FLAG = 161DEBUG_FLAG =
161!else 162!else