X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fprereq.mk;h=4a55c89ffcf9afd115aab72f64d4973c64bfc674;hp=f0db860269bce1684cf6c2bf6a93f3ed72f659e9;hb=e30e495bb1cd6df96e6b246a89c8eade514031c7;hpb=e158d8b6a7b3c883a8be74cb2327dda6374fc050 diff --git a/include/prereq.mk b/include/prereq.mk index f0db86026..4a55c89ff 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -1,10 +1,13 @@ # -# 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. # +ifneq ($(__prereq_inc),1) +__prereq_inc:=1 + prereq: if [ -f $(TMP_DIR)/.prereq-error ]; then \ echo; \ @@ -15,6 +18,7 @@ prereq: fi .SILENT: prereq +endif define Require export PREREQ_CHECK=1 @@ -27,7 +31,7 @@ define Require 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 @@ -47,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: