From: Marco Yuen <marcoy@gmail.com>
Date: Thu, 15 Dec 2011 15:50:39 +0000 (-0500)
Subject: Fix indentations and update BUILDOPTS.
X-Git-Tag: libvirt-0.9.8^0
X-Git-Url: http://git.onelab.eu/?p=libvirt.git;a=commitdiff_plain;h=bdc535933ead3e3deae468a51febf3a8d6738022

Fix indentations and update BUILDOPTS.
---

diff --git a/Makefile b/Makefile
index 9bd1e06..cfcb46b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,16 +14,16 @@ 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 $($(1)) ; \
-        fi
+		@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 $($(1)) ; \
+		fi
 endef
 
 $(eval $(call download_target,libvirt))
@@ -38,25 +38,30 @@ SPECFILE = libvirt.spec
 PWD=$(shell pwd)
 PREPARCH ?= noarch
 RPMDIRDEFS = --define "_sourcedir $(PWD)" --define "_builddir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_rpmdir $(PWD)"
-BUILDOPTS = --without polkit --without storage-disk --without storage-iscsi --without sasl --without xen --without qemu --with capng --with udev --define 'packager PlanetLab'
+BUILDOPTS = --without storage-disk --without storage-iscsi --without storage-scsi \
+	        --without storage-fs --without storage-lvm \
+	        --without polkit --without sasl --without audit --with capng --with udev \
+	        --without netcf --without avahi \
+	        --without xen --without qemu --without hyperv --without phyp --without esx \
+            --define 'packager PlanetLab'
 
 trees: sources
-        rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bp --target $(PREPARCH) $(SPECFILE)
+	rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bp --target $(PREPARCH) $(SPECFILE)
 
 srpm: sources
-        rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps $(BUILDOPTS) -bs $(SPECFILE)
+	rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bs $(SPECFILE)
 
 TARGET ?= $(shell uname -m)
 rpm: sources
-        rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps --target $(TARGET) $(BUILDOPTS) -bb $(SPECFILE)
+	rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps --target $(TARGET) $(BUILDOPTS) -bb $(SPECFILE)
 
 clean:
-		rm -f *.rpm *.tgz *.bz2 *.gz
+	rm -f *.rpm *.tgz *.bz2 *.gz
 
 ++%: varname=$(subst +,,$@)
 ++%:
-        @echo "$(varname)=$($(varname))"
+		@echo "$(varname)=$($(varname))"
 +%: varname=$(subst +,,$@)
 +%:
-        @echo "$($(varname))"
+		@echo "$($(varname))"