summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-01-17 08:09:39 +0000
committerEric Andersen <andersen@codepoet.org>2003-01-17 08:09:39 +0000
commita413a043f777611cf15419a4408ee60f0404b1a3 (patch)
tree21bed37a126d6eb70d40cf90534ccdf9c6462fcb
parentcd5135a43204cebeae8dceaf5b9fc3f8ff8f9348 (diff)
downloadbuildroot-novena-a413a043f777611cf15419a4408ee60f0404b1a3.tar.gz
buildroot-novena-a413a043f777611cf15419a4408ee60f0404b1a3.zip
update handling of 'make'
-rw-r--r--make/cramfsroot.mk4
-rw-r--r--make/gcc_target.mk1
-rw-r--r--make/jffs2root.mk2
-rw-r--r--make/linux.mk12
-rw-r--r--make/slang.mk2
-rw-r--r--make/tinylogin.mk6
-rw-r--r--make/user-mode-linux.mk8
7 files changed, 17 insertions, 18 deletions
diff --git a/make/cramfsroot.mk b/make/cramfsroot.mk
index 47d1f423c..2de865a93 100644
--- 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 cf513c3e6..fac222848 100644
--- 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 dd897a7d3..806845108 100644
--- 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 8d70ca213..96cafa733 100644
--- 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 80b6aa77c..6dde02f36 100644
--- 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 ccfb5e93e..7af9f4e6a 100644
--- 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 c7d22e9b8..04ee8df34 100644
--- 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)