X-Git-Url: http://git.onelab.eu/?p=omf.git;a=blobdiff_plain;f=Makefile;h=8e624a8199fdd514bec1a2435f3b82bc88d75fd4;hp=604e8b6c9e6469d730d751fdee5e368b3ffae334;hb=b4f292f95db365643b79436d75c536ac73cd1429;hpb=e463256d11740a4e0fae3b35d5263841398d232b

diff --git a/Makefile b/Makefile
index 604e8b6..8e624a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,54 @@
 # $Id: Makefile 16421 2010-01-04 11:29:55Z thierry $
 # $URL: svn+ssh://thierry@svn.planet-lab.org/svn/madwifi/trunk/Makefile $
 #
-WEBFETCH	:= curl -H Pragma: -O -R -S --fail --show-error
-SHA1SUM		= sha1sum
+WEBFETCH		:= curl -H Pragma: -O -R -S --fail --show-error
+SHA1SUM			:= sha1sum
 
-# default - overridden by the build
-SPECFILE	= omf-resctl.spec
+ALL += omf-resctl
+omf-resctl-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/omf-resctl-5.3-1ubuntu2-2.noarch.rpm
+omf-resctl-SHA1SUM	:= 6f48dd1cb7505ba9301c55f9889fd78842510b68
+omf-resctl		:= $(notdir $(omf-resctl-URL))
+ALL += omf-common
+omf-common-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/omf-common-5.3-1ubuntu3-2.noarch.rpm
+omf-common-SHA1SUM	:= aceaca433ffa6b3ea2b8f62dd57fc739ed01c442
+omf-common		:= $(notdir $(omf-common-URL))
+ALL += liblog4r
+liblog4r-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/liblog4r-ruby1.8-1.2-1.noarch.rpm
+liblog4r-SHA1SUM	:= daf29f5e23665d835a922cb2dda693ba9aca4e07
+liblog4r		:= $(notdir $(liblog4r-URL))
+ALL += libxmpp4r
+libxmpp4r-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
+libxmpp4r-SHA1SUM	:= 7db1a6260435aca494f9b5e36517568a7f63e5c8
+libxmpp4r		:= $(notdir $(libxmpp4r-URL))
 
-main.URL	:= http://pkg.mytestbed.net/yum/base/8/i386/omf-resctl-5.3-1ubuntu2-2.noarch.rpm
-main.SHA1SUM    := 6f48dd1cb7505ba9301c55f9889fd78842510b68
-main.FILE	:= $(notdir $(main.URL))
+all: $(ALL)
+.PHONY: all
 
-# 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 'Makefile'" ; \
-	    echo "Local copy: $$(sha1sum $@)" ; \
-	    echo "In Makefile: $(main.SHA1SUM)" ; \
-	    exit 1 ; \
+##############################
+define download_target
+$(1): $($(1))
+.PHONY: $($(1))
+$($(1)): 
+	@if [ ! -e "$($(1))" ] ; then echo "$(WEBFETCH) $($(1)-URL)" ; $(WEBFETCH) $($(1)-URL) ; 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)
-.PHONY: sources
-
-#PWD=$(shell pwd)
-#PREPARCH ?= noarch
-#RPMDIRDEFS = --define "_sourcedir $(PWD)" --define "_builddir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_rpmdir $(PWD)"
-#trees: sources
-#	rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bp --target $(PREPARCH) $(SPECFILE)
-#
-#srpm: sources
-#	rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bs $(SPECFILE)
-#
-#TARGET ?= $(shell uname -m)
-#rpm: sources
-#	rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps --target $(TARGET) -bb $(SPECFILE)
-#
-#clean:
-#	rm -f *.rpm *.tgz *.bz2 *.gz
+$(eval $(call download_target,omf-resctl))
+$(eval $(call download_target,omf-common))
+$(eval $(call download_target,liblog4r))
+$(eval $(call download_target,libxmpp4r))
 
+#################### convenience, for debugging only
+# make +foo : prints the value of $(foo)
+# make ++foo : idem but verbose, i.e. foo=$(foo)
 ++%: varname=$(subst +,,$@)
 ++%:
 	@echo "$(varname)=$($(varname))"