From: Konrad Rzeszutek Wilk Date: Fri, 15 Jun 2012 18:02:11 +0000 (-0400) Subject: Makefile: Fix spaces at the end of lines X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=63222c65c441f4837e7e5ec3e2be5eb0e1c9131d;p=xentesttools%2Fbootstrap.git Makefile: Fix spaces at the end of lines Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/Makefile b/Makefile index 6283e42..da8d16b 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ help: @echo ' clean - remove compiled files' @echo ' distclean - remove all generated files' @echo '' -COMPONENTS = root_image linux syslinux +COMPONENTS = root_image linux syslinux TOP= . include sources.mk @@ -79,6 +79,7 @@ export INSTALL INSTALL_DIR INSTALL_DATA INSTALL_SCRIPT INSTALL_PROG LINUX_SRC = $(PWD)/linux LINUX_DST = $(PWD)/linux-build +ROOTIMAGE_DST = $(PWD)/root_image linux-DISTRIB_TARGET=dist/common/vmlinuz @@ -99,7 +100,7 @@ endif .PHONY: linux-dist linux-dist: linux-dist-nodep -$(LINUX_DST)/usr/gen_init_cpio: +$(LINUX_DST)/usr/gen_init_cpio: $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) usr .PHONY: linux-config @@ -117,7 +118,7 @@ $(LINUX_DST)/.config: linux.config yes "" | $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) oldconfig .PHONY: linux-modules -linux-modules: linux-config +linux-modules: linux-config @mkdir -p $(LINUX_DST)/modulespace $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) modules $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) \ @@ -271,13 +272,13 @@ endif NEB_TARGETS = linux-dist root_image-dist .PHONY: xtt-common -xtt-common: $(NEB_TARGETS) +xtt-common: $(NEB_TARGETS) $(INSTALL_DATA) syslinux/com32/modules/*.c32 dist/common/ $(INSTALL_DATA) syslinux/com32/mboot/*.c32 dist/common/ $(INSTALL_DATA) syslinux/com32/menu/*.c32 dist/common/ .PHONY: xtt-iso -xtt-iso: xtt-common +xtt-iso: xtt-common $(INSTALL_DIR) dist/iso/isolinux/ $(INSTALL_DATA) dist/common/* dist/iso/isolinux/ rm -f dist/iso/isolinux/{modules,userspace}.cpio.gz @@ -289,7 +290,7 @@ xtt-iso: xtt-common -o dist/root_image.iso dist/iso .PHONY: xtt-fat -xtt-fat: xtt-common +xtt-fat: xtt-common $(INSTALL_DIR) dist/fat/ rm -f dist/fat/{modules,userspace}.cpio.gz $(INSTALL_DATA) dist/common/* dist/fat/ @@ -330,7 +331,7 @@ xtt-fat-image-nodeps: $(MTOOLSRC) MTOOLSRC=$(MTOOLSRC) mcopy -v -p dist/fat/* z: .PHONY: xtt-pxe -xtt-pxe: xtt-common +xtt-pxe: xtt-common $(INSTALL_DIR) dist/pxe/ $(INSTALL_DATA) dist/common/* dist/pxe/ rm -f dist/pxe/{modules,userspace}.cpio.gz