aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2006-07-20 23:51:25 +0000
committerMike Baker <mbm@openwrt.org>2006-07-20 23:51:25 +0000
commit8206b94ce28e560918fa68101f3bbe4b7f9b7de9 (patch)
tree182ea707f160f3ca7f7ce76e40cc25a680a3e424
parent42fb2160c46f0bd58ab25972956ee0fffa5d8461 (diff)
downloadupstream-8206b94ce28e560918fa68101f3bbe4b7f9b7de9.tar.gz
upstream-8206b94ce28e560918fa68101f3bbe4b7f9b7de9.tar.bz2
upstream-8206b94ce28e560918fa68101f3bbe4b7f9b7de9.zip
update prereqs
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4179 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/prereq.mk27
1 files changed, 16 insertions, 11 deletions
diff --git a/include/prereq.mk b/include/prereq.mk
index 6b3621dbac..6642ce40e3 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -6,29 +6,30 @@
#
include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/verbose.mk
$(TMP_DIR):
mkdir -p $@
prereq:
- @echo
- @if [ -f $(TMP_DIR)/.prereq-error ]; then \
+ echo
+ if [ -f $(TMP_DIR)/.prereq-error ]; then \
cat $(TMP_DIR)/.prereq-error; \
echo; \
rm -rf $(TMP_DIR); \
false; \
fi
- @rm -rf $(TMP_DIR)
- @mkdir -p $(TMP_DIR)
+ rm -rf $(TMP_DIR)
+ mkdir -p $(TMP_DIR)
+
+.SILENT: $(TMP_DIR) prereq
define Require
ifeq ($$(CHECK_$(1)),)
prereq: prereq-$(1)
prereq-$(1): $(TMP_DIR) FORCE
- @echo -n "Checking '$(1)'... "
- @if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \
+ echo -n "Checking '$(1)'... "
+ if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \
echo 'ok.'; \
else \
echo 'failed.'; \
@@ -38,6 +39,8 @@ define Require
check-$(1): FORCE
$(call Require/$(1))
CHECK_$(1):=1
+
+ .SILENT: prereq-$(1) check-$(1)
endif
endef
@@ -69,7 +72,7 @@ define Require/working-gcc
endef
$(eval $(call Require,working-gcc, \
- No working GNU C Compiler was found on your system. \
+ No working GNU C Compiler (gcc) was found on your system. \
))
define Require/working-g++
@@ -78,7 +81,7 @@ define Require/working-g++
endef
$(eval $(call Require,working-g++, \
- No working GNU C++ Compiler was found on your system. \
+ No working GNU C++ Compiler (g++) was found on your system. \
))
define Require/zlib
@@ -87,7 +90,7 @@ define Require/zlib
endef
$(eval $(call Require,zlib, \
- The development version of zlib was not found on your system. \
+ No zlib development files were not found on your system. \
))
@@ -115,4 +118,6 @@ $(eval $(call RequireCommand,patch, \
Please install patch. \
))
-
+$(eval $(call RequireCommand,perl, \
+ Please install perl. \
+))