X-Git-Url: http://git.onelab.eu/?p=madwifi.git;a=blobdiff_plain;f=Makefile;h=ee56db06a4c1d17f04480b7a095696851eb25da9;hp=90f2fce2468f3b430f740bf500e19953b1e0125e;hb=HEAD;hpb=15286a23c4d87e03bdaca3e7d94bb69d074f864b

diff --git a/Makefile b/Makefile
index 90f2fce..ee56db0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,41 @@
-# $Id$
-WEBFETCH	:= curl -H Pragma: -O -R -S --fail --show-error
-SHA1SUM	= sha1sum
-
-# default - overridden by the build
-SPECFILE = madwifi.spec
-
-#main.URL	:= http://mirror.onelab.eu/third-party/madwifi-trunk-r3878-20081204.tar.bz2
-#main.SHA1SUM    := 085c839559349f4d61c08f1acba680b3e5c762b1
-main.URL	:= http://build.planet-lab.org/third-party/madwifi-0.9.4.tar.bz2
-main.SHA1SUM	:= 5de5842a662fbca17507003c3b09956c37fa4d79
-main.FILE	:= $(notdir $(main.URL))
-
-# Thierry - when called from within the build, PWD is /build
-SOURCEFILES := $(main.FILE)
-
-$(main.FILE): #FORCE
-	@if [ ! -e "$@" ] ; then echo "$(WEBFETCH) $(main.URL)" ; $(WEBFETCH) $(main.URL) ; fi
-	@if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi
-	@if test "$$(sha1sum $@ | awk '{print $$1}')" != "$(main.SHA1SUM)" ; then \
-	    echo "sha1sum of the downloaded $@ does not match the one from 'sources' file" ; \
-	    echo "Local copy: $$(sha1sum $@)" ; \
-	    echo "In sources: $$(grep $@ sources)" ; \
-	    exit 1 ; \
+#
+WEBFETCH	:= wget
+SHA1SUM		:= sha1sum
+
+ALL		+= madwifi
+madwifi-URL1	:= http://mirror.onelab.eu/third-party/madwifi-trunk-r4132-20100921.tar.gz
+madwifi-URL2	:= http://planet-lab.org/third-party/madwifi-trunk-r4132-20100921.tar.gz
+madwifi-SHA1SUM := 67b16da3cba977028e5f1ffa8ba4d367b1acfaa1
+madwifi		:= $(notdir $(madwifi-URL1))
+
+##############################
+define download_target
+$(1): $($(1))
+.PHONY: $(1)
+$($(1)): 
+	@if [ ! -e "$($(1))" ] ; then \
+	{ echo Using primary; echo "$(WEBFETCH) $($(1)-URL1)" ; $(WEBFETCH) $($(1)-URL1) ; } || \
+	{ echo Using secondary; echo "$(WEBFETCH) $($(1)-URL2)" ; $(WEBFETCH) $($(1)-URL2) ; } ; fi
+	@if [ ! -e "$($(1))" ] ; then echo "Could not download source file: $($(1)) does not exist" ; exit 1 ; fi
+	@if test "$$$$($(SHA1SUM) $($(1)) | awk '{print $$$$1}')" != "$($(1)-SHA1SUM)" ; then \
+	    echo "sha1sum of the downloaded $($(1)) does not match the one from 'Makefile'" ; \
+	    echo "Local copy: $$$$($(SHA1SUM) $($(1)))" ; \
+	    echo "In Makefile: $($(1)-SHA1SUM)" ; \
+	    false ; \
 	else \
-	    ls -l $@ ; \
+	    ls -l $($(1)) ; \
 	fi
+endef
 
-sources: $(SOURCEFILES)
+$(eval $(call download_target,madwifi))
+
+sources: $(ALL)
 .PHONY: sources
 
+####################
+# default - overridden by the build
+SPECFILE = madwifi.spec
+
 PWD=$(shell pwd)
 PREPARCH ?= noarch
 RPMDIRDEFS = --define "_sourcedir $(PWD)" --define "_builddir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_rpmdir $(PWD)"