comparison nt/makefile.w32-in @ 35104:72dc0b4e554c

Use $(MAKETYPE) instead of $(SHELLTYPE) to select correct rule for invoking make in another directory. Amend rules accordingly. (clean): Delete $(COMPILER_TEMP_FILES) instead of *.pdb.
author Andrew Innes <andrewi@gnu.org>
date Sat, 06 Jan 2001 21:18:42 +0000
parents 03059a61bb11
children b74a256555ac
comparison
equal deleted inserted replaced
35103:2ed117dc79cf 35104:72dc0b4e554c
65 @echo Using $(THE_SHELL) as shell. 65 @echo Using $(THE_SHELL) as shell.
66 66
67 # 67 #
68 # Build emacs 68 # Build emacs
69 # 69 #
70 all: which-sh $(BLD) $(ALL) all-other-dirs-$(SHELLTYPE) 70 all: which-sh $(BLD) $(ALL) all-other-dirs-$(MAKETYPE)
71 71
72 all-other-dirs-CMD: 72 all-other-dirs-nmake:
73 cd ..\lib-src 73 cd ..\lib-src
74 $(MAKE) $(MFLAGS) all 74 $(MAKE) $(MFLAGS) all
75 cd ..\src 75 cd ..\src
76 $(MAKE) $(MFLAGS) all 76 $(MAKE) $(MFLAGS) all
77 cd ..\lisp 77 cd ..\lisp
78 $(MAKE) $(MFLAGS) all 78 $(MAKE) $(MFLAGS) all
79 cd ..\leim 79 cd ..\leim
80 $(MAKE) $(MFLAGS) all 80 $(MAKE) $(MFLAGS) all
81 cd ..\nt 81 cd ..\nt
82 82
83 all-other-dirs-SH: 83 all-other-dirs-gmake:
84 $(MAKE) $(MFLAGS) -C ../lib-src all 84 $(MAKE) $(MFLAGS) -C ../lib-src all
85 $(MAKE) $(MFLAGS) -C ../src all 85 $(MAKE) $(MFLAGS) -C ../src all
86 $(MAKE) $(MFLAGS) -C ../lisp all 86 $(MAKE) $(MFLAGS) -C ../lisp all
87 $(MAKE) $(MFLAGS) -C ../leim all 87 $(MAKE) $(MFLAGS) -C ../leim all
88 88
89 recompile: recompile-$(SHELLTYPE) 89 recompile: recompile-$(MAKETYPE)
90 90
91 recompile-CMD: 91 recompile-nmake:
92 cd ..\lisp 92 cd ..\lisp
93 $(MAKE) $(MFLAGS) recompile 93 $(MAKE) $(MFLAGS) recompile
94 cd ..\nt 94 cd ..\nt
95 95
96 recompile-SH: 96 recompile-gmake:
97 $(MAKE) $(MFLAGS) -C ../lisp recompile 97 $(MAKE) $(MFLAGS) -C ../lisp recompile
98 98
99 bootstrap: $(BLD) $(ALL) bootstrap-$(SHELLTYPE) 99 bootstrap: $(BLD) $(ALL) bootstrap-$(MAKETYPE)
100 100
101 bootstrap-CMD: 101 bootstrap-nmake:
102 cd ..\src 102 cd ..\src
103 $(MAKE) $(MFLAGS) bootstrap 103 $(MAKE) $(MFLAGS) bootstrap
104 $(MAKE) $(MFLAGS) bootstrap-clean 104 $(MAKE) $(MFLAGS) bootstrap-clean
105 cd ..\lisp 105 cd ..\lisp
106 $(MAKE) $(MFLAGS) bootstrap 106 $(MAKE) $(MFLAGS) bootstrap
107 cd ..\nt 107 cd ..\nt
108 108
109 bootstrap-SH: 109 bootstrap-gmake:
110 $(MAKE) $(MFLAGS) -C ../src bootstrap 110 $(MAKE) $(MFLAGS) -C ../src bootstrap
111 $(MAKE) $(MFLAGS) -C ../src bootstrap-clean 111 $(MAKE) $(MFLAGS) -C ../src bootstrap-clean
112 $(MAKE) $(MFLAGS) -C ../lisp bootstrap 112 $(MAKE) $(MFLAGS) -C ../lisp bootstrap
113 113
114 bootstrap-clean: bootstrap-clean-$(SHELLTYPE) 114 bootstrap-clean: bootstrap-clean-$(MAKETYPE)
115 115
116 bootstrap-clean-CMD: 116 bootstrap-clean-nmake:
117 cd ..\src 117 cd ..\src
118 $(MAKE) $(MFLAGS) bootstrap-clean 118 $(MAKE) $(MFLAGS) bootstrap-clean
119 cd ..\lisp 119 cd ..\lisp
120 $(MAKE) $(MFLAGS) bootstrap-clean 120 $(MAKE) $(MFLAGS) bootstrap-clean
121 121
122 bootstrap-clean-SH: 122 bootstrap-clean-gmake:
123 $(MAKE) $(MFLAGS) -C ../src bootstrap-clean 123 $(MAKE) $(MFLAGS) -C ../src bootstrap-clean
124 $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean 124 $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean
125 125
126 $(INSTALL_DIR): 126 $(INSTALL_DIR):
127 - mkdir "$(INSTALL_DIR)" 127 - mkdir "$(INSTALL_DIR)"
130 - mkdir "$(INSTALL_DIR)/bin" 130 - mkdir "$(INSTALL_DIR)/bin"
131 131
132 # 132 #
133 # Build and install emacs in INSTALL_DIR 133 # Build and install emacs in INSTALL_DIR
134 # 134 #
135 install: all $(INSTALL_DIR)/bin install-other-dirs-$(SHELLTYPE) 135 install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
136 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin 136 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
137 - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin 137 - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
138 - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin 138 - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
139 - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin 139 - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
140 - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin 140 - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin
152 - $(CP_DIR) icons $(INSTALL_DIR)/etc 152 - $(CP_DIR) icons $(INSTALL_DIR)/etc
153 $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF) 153 $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF)
154 - $(DEL) ../same-dir.tst 154 - $(DEL) ../same-dir.tst
155 - $(DEL) $(INSTALL_DIR)/same-dir.tst 155 - $(DEL) $(INSTALL_DIR)/same-dir.tst
156 156
157 install-other-dirs-CMD: 157 install-other-dirs-nmake:
158 cd ..\lib-src 158 cd ..\lib-src
159 $(MAKE) $(MFLAGS) install 159 $(MAKE) $(MFLAGS) install
160 cd ..\src 160 cd ..\src
161 $(MAKE) $(MFLAGS) install 161 $(MAKE) $(MFLAGS) install
162 cd ..\lisp 162 cd ..\lisp
163 $(MAKE) $(MFLAGS) install 163 $(MAKE) $(MFLAGS) install
164 cd ..\leim 164 cd ..\leim
165 $(MAKE) $(MFLAGS) install 165 $(MAKE) $(MFLAGS) install
166 cd ..\nt 166 cd ..\nt
167 167
168 install-other-dirs-SH: 168 install-other-dirs-gmake:
169 $(MAKE) $(MFLAGS) -C ../lib-src install 169 $(MAKE) $(MFLAGS) -C ../lib-src install
170 $(MAKE) $(MFLAGS) -C ../src install 170 $(MAKE) $(MFLAGS) -C ../src install
171 $(MAKE) $(MFLAGS) -C ../lisp install 171 $(MAKE) $(MFLAGS) -C ../lisp install
172 $(MAKE) $(MFLAGS) -C ../leim install 172 $(MAKE) $(MFLAGS) -C ../leim install
173 173
174 # 174 #
175 # Maintenance 175 # Maintenance
176 # 176 #
177 clean: clean-other-dirs-$(SHELLTYPE) 177 clean: clean-other-dirs-$(MAKETYPE)
178 - $(DEL) *~ *.pdb 178 - $(DEL) *~ $(COMPILER_TEMP_FILES)
179 - $(DEL_TREE) $(OBJDIR) 179 - $(DEL_TREE) $(OBJDIR)
180 - $(DEL) ../etc/DOC ../etc/DOC-X 180 - $(DEL) ../etc/DOC ../etc/DOC-X
181 181
182 clean-other-dirs-CMD: 182 clean-other-dirs-nmake:
183 cd ..\lib-src 183 cd ..\lib-src
184 $(MAKE) $(MFLAGS) clean 184 $(MAKE) $(MFLAGS) clean
185 cd ..\src 185 cd ..\src
186 $(MAKE) $(MFLAGS) clean 186 $(MAKE) $(MFLAGS) clean
187 cd ..\lisp 187 cd ..\lisp
188 $(MAKE) $(MFLAGS) clean 188 $(MAKE) $(MFLAGS) clean
189 cd ..\leim 189 cd ..\leim
190 $(MAKE) $(MFLAGS) clean 190 $(MAKE) $(MFLAGS) clean
191 cd ..\nt 191 cd ..\nt
192 192
193 clean-other-dirs-SH: 193 clean-other-dirs-gmake:
194 $(MAKE) $(MFLAGS) -C ../lib-src clean 194 $(MAKE) $(MFLAGS) -C ../lib-src clean
195 $(MAKE) $(MFLAGS) -C ../src clean 195 $(MAKE) $(MFLAGS) -C ../src clean
196 $(MAKE) $(MFLAGS) -C ../lisp clean 196 $(MAKE) $(MFLAGS) -C ../lisp clean
197 $(MAKE) $(MFLAGS) -C ../leim clean 197 $(MAKE) $(MFLAGS) -C ../leim clean
198 198