Skip to content

Commit 1501985

Browse files
committed
Correctly invoke recursive make
Why it should be done this way: https://www.gnu.org/software/make/manual/make.html#MAKE-Variable
1 parent 9f24141 commit 1501985

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -226,15 +226,15 @@ bin/loadp2: loadp2/build/loadp2
226226
cp $< $@
227227

228228
spin2cpp/build/flexspin:
229-
make -C spin2cpp OPT=-O1
229+
$(MAKE) -C spin2cpp OPT=-O1
230230
spin2cpp/build/flexcc:
231-
make -C spin2cpp OPT=-O1
231+
$(MAKE) -C spin2cpp OPT=-O1
232232

233233
proploader-$(OS)-build/bin/proploader: bin/flexspin
234-
make -C PropLoader OS=$(OS) SPINCMP="`pwd`/bin/flexspin"
234+
$(MAKE) -C PropLoader OS=$(OS) SPINCMP="`pwd`/bin/flexspin"
235235

236236
loadp2/build/loadp2: bin/flexspin
237-
make -C loadp2 P2ASM="`pwd`/bin/flexspin -2 -I`pwd`/spin2cpp/include"
237+
$(MAKE) -C loadp2 P2ASM="`pwd`/bin/flexspin -2 -I`pwd`/spin2cpp/include"
238238

239239
# rules for Win32 binaries
240240

@@ -265,23 +265,23 @@ bin/loadp2.exe: loadp2/build-win32/loadp2.exe
265265
mv bin/loadp2.signed.exe bin/loadp2.exe
266266

267267
spin2cpp/build-win32/flexspin.exe:
268-
make -C spin2cpp CROSS=win32
268+
$(MAKE) -C spin2cpp CROSS=win32
269269
spin2cpp/build-win32/flexcc.exe:
270-
make -C spin2cpp CROSS=win32
270+
$(MAKE) -C spin2cpp CROSS=win32
271271

272272
ifneq ($(OS),msys)
273273
proploader-msys-build/bin/proploader.exe:
274-
make -C PropLoader CROSS=win32 SPINCMP="`pwd`/bin/flexspin"
274+
$(MAKE) -C PropLoader CROSS=win32 SPINCMP="`pwd`/bin/flexspin"
275275
endif
276276

277277
ifneq ($(OS),macosx)
278278
proploader-macosx-build/bin/proploader:
279-
make -C PropLoader CROSS=macosx SPINCMP="`pwd`/bin/flexspin"
279+
$(MAKE) -C PropLoader CROSS=macosx SPINCMP="`pwd`/bin/flexspin"
280280
endif
281281

282282
ifneq ($(OS),msys)
283283
loadp2/build-win32/loadp2.exe:
284-
make -C loadp2 CROSS=win32 P2ASM="`pwd`/bin/flexspin -2 -I`pwd`/spin2cpp/include"
284+
$(MAKE) -C loadp2 CROSS=win32 P2ASM="`pwd`/bin/flexspin -2 -I`pwd`/spin2cpp/include"
285285
endif
286286

287287
$(RESOBJ): $(RES_RC)
@@ -308,12 +308,12 @@ bin/flexcc.mac: spin2cpp/build-macosx/flexcc
308308
$(SIGNMAC) $@
309309

310310
spin2cpp/build-macosx/flexspin:
311-
make -C spin2cpp CROSS=macosx
311+
$(MAKE) -C spin2cpp CROSS=macosx
312312
spin2cpp/build-macosx/flexcc:
313-
make -C spin2cpp CROSS=macosx
313+
$(MAKE) -C spin2cpp CROSS=macosx
314314

315315
loadp2/build-macosx/loadp2:
316-
make -C loadp2 CROSS=macosx
316+
$(MAKE) -C loadp2 CROSS=macosx
317317

318318
## Other rules
319319

@@ -327,7 +327,7 @@ board/P2ES_sdcard.bin: board/sdcard/sdboot.binary
327327
mv board/sdcard/sdboot.binary board/P2ES_sdcard.bin
328328

329329
board/sdcard/sdboot.binary: bin/flexspin board/sdcard
330-
(make -C board/sdcard P2CC="`pwd`/bin/flexspin -2 -I`pwd`/spin2cpp/include")
330+
$(MAKE) -C board/sdcard P2CC="`pwd`/bin/flexspin -2 -I`pwd`/spin2cpp/include"
331331
rm -f board/sdcard/*.p2asm
332332

333333
board/P2ES_flashloader.spin2: loadp2/board/P2ES_flashloader.spin2

0 commit comments

Comments
 (0)