X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/cf807efd13ca47672871d0c50d23274fe34c3114..08c781ae46007809f09674e45e1fdbaa0353e597:/include/prereq.mk diff --git a/include/prereq.mk b/include/prereq.mk index eda7ca35a..4a55c89ff 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -1,38 +1,37 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -$(TMP_DIR): - mkdir -p $@ +ifneq ($(__prereq_inc),1) +__prereq_inc:=1 prereq: if [ -f $(TMP_DIR)/.prereq-error ]; then \ echo; \ cat $(TMP_DIR)/.prereq-error; \ + rm -f $(TMP_DIR)/.prereq-error; \ echo; \ - rm -rf $(TMP_DIR); \ false; \ fi - rm -rf $(TMP_DIR) - mkdir -p $(TMP_DIR) -.SILENT: $(TMP_DIR) prereq +.SILENT: prereq +endif define Require export PREREQ_CHECK=1 ifeq ($$(CHECK_$(1)),) prereq: prereq-$(1) - prereq-$(1): $(TMP_DIR) FORCE + prereq-$(1): FORCE echo -n "Checking '$(1)'... " if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ - echo -e "$(strip $(2))" >> $(TMP_DIR)/.prereq-error; \ + echo -e "$(PKG_NAME): $(strip $(2))" | perl -ne 's/\\\s*/\n/g,print' >> $(TMP_DIR)/.prereq-error; \ fi check-$(1): FORCE @@ -52,3 +51,12 @@ define RequireCommand $$(eval $$(call Require,$(1),$(2))) endef +define RequireHeader + define Require/$(1) + [ -e "$(1)" ] + endef + + $$(eval $$(call Require,$(1),$(2))) +endef + +.NOTPARALLEL: