Makefile: replace references to make with $(MAKE)

make is not always GNU make; the latter  may go by different names.
This helps builds on systems where the default make is not GNU make.
This commit is contained in:
Tamas TEVESZ 2017-06-07 18:41:39 +02:00 committed by Paul Sokolovsky
parent f2031692d8
commit 350c0e9174

View File

@ -102,7 +102,7 @@ ifeq ($(STANDALONE),y)
endif endif
clean: clean-sdk clean: clean-sdk
make -C crosstool-NG clean MAKELEVEL=0 $(MAKE) -C crosstool-NG clean MAKELEVEL=0
-rm -rf crosstool-NG/.build/src -rm -rf crosstool-NG/.build/src
-rm -f crosstool-NG/local-patches/gcc/4.8.5/1000-* -rm -f crosstool-NG/local-patches/gcc/4.8.5/1000-*
-rm -rf $(TOOLCHAIN) -rm -rf $(TOOLCHAIN)
@ -112,7 +112,7 @@ clean-sdk:
rm -f sdk rm -f sdk
rm -f .sdk_patch_$(VENDOR_SDK) rm -f .sdk_patch_$(VENDOR_SDK)
rm -f user_rf_cal_sector_set.o empty_user_rf_pre_init.o rm -f user_rf_cal_sector_set.o empty_user_rf_pre_init.o
make -C esp-open-lwip -f Makefile.open clean $(MAKE) -C esp-open-lwip -f Makefile.open clean
clean-sysroot: clean-sysroot:
rm -rf $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/* rm -rf $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/*
@ -126,7 +126,7 @@ toolchain: $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc
$(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc: crosstool-NG/ct-ng $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc: crosstool-NG/ct-ng
cp -f 1000-mforce-l32.patch crosstool-NG/local-patches/gcc/4.8.5/ cp -f 1000-mforce-l32.patch crosstool-NG/local-patches/gcc/4.8.5/
make -C crosstool-NG -f ../Makefile _toolchain $(MAKE) -C crosstool-NG -f ../Makefile _toolchain
_toolchain: _toolchain:
./ct-ng xtensa-lx106-elf ./ct-ng xtensa-lx106-elf
@ -139,13 +139,13 @@ _toolchain:
crosstool-NG: crosstool-NG/ct-ng crosstool-NG: crosstool-NG/ct-ng
crosstool-NG/ct-ng: crosstool-NG/bootstrap crosstool-NG/ct-ng: crosstool-NG/bootstrap
make -C crosstool-NG -f ../Makefile _ct-ng $(MAKE) -C crosstool-NG -f ../Makefile _ct-ng
_ct-ng: _ct-ng:
./bootstrap ./bootstrap
./configure --prefix=`pwd` ./configure --prefix=`pwd`
make MAKELEVEL=0 $(MAKE) MAKELEVEL=0
make install MAKELEVEL=0 $(MAKE) install MAKELEVEL=0
crosstool-NG/bootstrap: crosstool-NG/bootstrap:
@echo "You cloned without --recursive, fetching submodules for you." @echo "You cloned without --recursive, fetching submodules for you."
@ -161,13 +161,13 @@ $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/lib/libcirom.a: $(TOOLCHAIN)/xtensa-lx106-
libhal: $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/libhal.a libhal: $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/libhal.a
$(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/libhal.a: $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/libhal.a: $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc
make -C lx106-hal -f ../Makefile _libhal $(MAKE) -C lx106-hal -f ../Makefile _libhal
_libhal: _libhal:
autoreconf -i autoreconf -i
PATH="$(TOOLCHAIN)/bin:$(PATH)" ./configure --host=xtensa-lx106-elf --prefix=$(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr PATH="$(TOOLCHAIN)/bin:$(PATH)" ./configure --host=xtensa-lx106-elf --prefix=$(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr
PATH="$(TOOLCHAIN)/bin:$(PATH)" make PATH="$(TOOLCHAIN)/bin:$(PATH)" $(MAKE)
PATH="$(TOOLCHAIN)/bin:$(PATH)" make install PATH="$(TOOLCHAIN)/bin:$(PATH)" $(MAKE) install
@ -348,7 +348,7 @@ user_rf_cal_sector_set.o: user_rf_cal_sector_set.c $(TOOLCHAIN)/bin/xtensa-lx106
lwip: toolchain sdk_patch lwip: toolchain sdk_patch
ifeq ($(STANDALONE),y) ifeq ($(STANDALONE),y)
make -C esp-open-lwip -f Makefile.open install \ $(MAKE) -C esp-open-lwip -f Makefile.open install \
CC=$(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc \ CC=$(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc \
AR=$(TOOLCHAIN)/bin/xtensa-lx106-elf-ar \ AR=$(TOOLCHAIN)/bin/xtensa-lx106-elf-ar \
PREFIX=$(TOOLCHAIN) PREFIX=$(TOOLCHAIN)