update handling of 'make'

diff --git a/make/cramfsroot.mk b/make/cramfsroot.mk
index 47d1f423caf6e9218cc42b650859a6bf71d20411..2de865a93d389d3ac769acb4a154c62a0cfa6660 100644 (file)
--- a/make/cramfsroot.mk
+++ b/make/cramfsroot.mk
@@ -24,7 +24,7 @@ cramfs: $(CRAMFS_DIR)/mkcramfs
 cramfs-source: $(DL_DIR)/$(CRAMFS_DIR)
 
 cramfs-clean:
-       -make -C $(CRAMFS_DIR) clean
+       -$(MAKE) -C $(CRAMFS_DIR) clean
 
 cramfs-dirclean:
        rm -rf $(CRAMFS_DIR)
@@ -45,7 +45,7 @@ cramfsroot: cramfs
 cramfsroot-source: $(DL_DIR)/$(GENEXT2_SOURCE)
 
 cramfsroot-clean:
-       -make -C $(GENEXT2_DIR) clean
+       -$(MAKE) -C $(GENEXT2_DIR) clean
 
 cramfsroot-dirclean:
        rm -rf $(GENEXT2_DIR)

diff --git a/make/gcc_target.mk b/make/gcc_target.mk
index cf513c3e6022054a782d23560484c5d262fb4a47..fac222848f1a65e8f0ca50ce2ebedae25588fbdd 100644 (file)
--- a/make/gcc_target.mk
+++ b/make/gcc_target.mk
@@ -24,7 +24,6 @@
 #############################################################
 GNU_TARGET_NAME:=$(ARCH)-linux
 TARGET_LANGUAGES:=c,c++
-MAKE:=make
 
 # If you want multilib enabled, enable this...
 #MULTILIB:=--enable-multilib

diff --git a/make/jffs2root.mk b/make/jffs2root.mk
index dd897a7d3e33a5078856026b0dd2a981529f0e0c..8068451089672475e2fd9f2f0848a202430b62a8 100644 (file)
--- a/make/jffs2root.mk
+++ b/make/jffs2root.mk
@@ -40,7 +40,7 @@ jffs2root: jffs2
 jffs2root-source: $(DL_DIR)/$(GENEXT2_SOURCE)
 
 jffs2root-clean:
-       -make -C $(GENEXT2_DIR) clean
+       -$(MAKE) -C $(GENEXT2_DIR) clean
 
 jffs2root-dirclean:
        rm -rf $(GENEXT2_DIR)

diff --git a/make/linux.mk b/make/linux.mk
index 8d70ca213d6c582a1e8b21a20461db5a61e4e6bf..96cafa7332a6f7b9f83efbbe75a119993d32b61c 100644 (file)
--- a/make/linux.mk
+++ b/make/linux.mk
@@ -56,16 +56,16 @@ $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.unpacked
        #       CROSS_COMPILE=$(STAGING_DIR)/bin/$(ARCH)-uclibc-,g;" \
        #       $(LINUX_DIR)/Makefile
        -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
-       make -C $(LINUX_DIR) oldconfig include/linux/version.h
+       $(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h
        touch $(LINUX_DIR)/.configured
 
 $(LINUX_DIR)/.depend_done:  $(LINUX_DIR)/.configured
-       make -C $(LINUX_DIR) dep
+       $(MAKE) -C $(LINUX_DIR) dep
        touch $(LINUX_DIR)/.depend_done
 
 $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
-       make -C $(LINUX_DIR) $(LINUX_FORMAT)
-       make -C $(LINUX_DIR) modules
+       $(MAKE) -C $(LINUX_DIR) $(LINUX_FORMAT)
+       $(MAKE) -C $(LINUX_DIR) modules
 
 $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
        cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
@@ -73,7 +73,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
 $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL)
        rm -rf $(TARGET_DIR)/lib/modules
        rm -f $(TARGET_DIR)/sbin/cardmgr
-       make -C $(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
+       $(MAKE) -C $(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
        (cd $(TARGET_DIR)/lib/modules; ln -s $(LINUX_VERSION)/kernel/drivers .)
 
 $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
@@ -86,7 +86,7 @@ linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_
 # This has been renamed so we do _NOT_ by default run this on 'make clean'
 linuxclean: clean
        rm -f $(LINUX_KERNEL)
-       -make -C $(LINUX_DIR) clean
+       -$(MAKE) -C $(LINUX_DIR) clean
 
 linux-dirclean:
        rm -rf $(LINUX_DIR)

diff --git a/make/slang.mk b/make/slang.mk
index 80b6aa77c8da66cfb554a7447ee1a39a3a7e16cf..6dde02f36120723a20d08942e62f826b8acd430f 100644 (file)
--- a/make/slang.mk
+++ b/make/slang.mk
@@ -38,7 +38,7 @@ slang-source: $(DL_DIR)/$(SLANG_SOURCE)
 
 slang-clean:
        rm -f $(TARGET_DIR)/lib/libslang.so*
-       -make -C $(SLANG_DIR) clean
+       -$(MAKE) -C $(SLANG_DIR) clean
 
 slang-dirclean:
        rm -rf $(SLANG_DIR)

diff --git a/make/tinylogin.mk b/make/tinylogin.mk
index ccfb5e93e0cf5daa710d3f43ce0e4e0890ee5430..7af9f4e6a495bbd2d5fdff0dd966b9041d19e52a 100644 (file)
--- a/make/tinylogin.mk
+++ b/make/tinylogin.mk
@@ -33,16 +33,16 @@ $(TINYLOGIN_DIR)/Config.h: $(DL_DIR)/$(TINYLOGIN_SOURCE)
        touch $(TINYLOGIN_DIR)/Config.h
 
 $(TINYLOGIN_DIR)/tinylogin: $(TINYLOGIN_DIR)/Config.h
-       make CROSS="$(TARGET_CROSS)" -C $(TINYLOGIN_DIR)
+       $(MAKE) CROSS="$(TARGET_CROSS)" -C $(TINYLOGIN_DIR)
 
 $(TARGET_DIR)/bin/tinylogin: $(TINYLOGIN_DIR)/tinylogin
-       make CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(TINYLOGIN_DIR) install
+       $(MAKE) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(TINYLOGIN_DIR) install
 
 tinylogin: uclibc $(TARGET_DIR)/bin/tinylogin
 
 tinylogin-clean:
        rm -f $(TARGET_DIR)/bin/tinylogin
-       -make -C $(TINYLOGIN_DIR) clean
+       -$(MAKE) -C $(TINYLOGIN_DIR) clean
 
 tinylogin-dirclean:
        rm -rf $(TINYLOGIN_DIR)

diff --git a/make/user-mode-linux.mk b/make/user-mode-linux.mk
index c7d22e9b895925b9fd93c5e2a3caf5b594fdc336..04ee8df346ce60dc3c84c5ba27672609a4d80ecc 100644 (file)
--- a/make/user-mode-linux.mk
+++ b/make/user-mode-linux.mk
@@ -37,15 +37,15 @@ $(LINUX_DIR)/.set_arch: $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.set_arch  $(LINUX_KCONFIG)
        cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
-       make -C $(LINUX_DIR) oldconfig include/linux/version.h
+       $(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h
        touch $(LINUX_DIR)/.configured
 
 $(LINUX_DIR)/.depend_done:  $(LINUX_DIR)/.configured
-       make -C $(LINUX_DIR) dep
+       $(MAKE) -C $(LINUX_DIR) dep
        touch $(LINUX_DIR)/.depend_done
 
 $(LINUX_DIR)/linux: $(LINUX_DIR)/.depend_done
-       make -C $(LINUX_DIR) linux
+       $(MAKE) -C $(LINUX_DIR) linux
 
 $(LINUX_KERNEL): $(LINUX_DIR)/linux
        cp -fa $(LINUX_DIR)/linux $(LINUX_KERNEL)
@@ -55,7 +55,7 @@ user-mode-linux: $(LINUX_KERNEL)
 # Renamed so it is not cleaned by default on a make clean
 user-mode-linux_clean: clean
        rm -f $(LINUX_KERNEL)
-       -make -C $(LINUX_DIR) clean
+       -$(MAKE) -C $(LINUX_DIR) clean
 
 user-mode-linux-dirclean:
        rm -rf $(LINUX_DIR)