1.1 --- a/Makefile	Sat Jan 22 22:07:37 2005 +0000
     1.2 +++ b/Makefile	Mon Jan 24 22:34:15 2005 +0000
     1.3 @@ -31,26 +31,27 @@ all: dist
     1.4  
     1.5  # install everything into the standard system directories
     1.6  # NB: install explicitly does not check that everything is up to date!
     1.7 -install: xen.install tools.install kernels docs.install
     1.8 +install: install-tools install-xen install-kernels install-docs
     1.9 +
    1.10 +install-xen:
    1.11 +	$(MAKE) -C xen install
    1.12  
    1.13 -kernels.install:
    1.14 +install-tools:
    1.15 +	$(MAKE) -C tools install
    1.16 +
    1.17 +install-kernels:
    1.18  	cp -a $(INSTALL_DIR)/boot/* /boot/
    1.19  	cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/
    1.20  	cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
    1.21  	cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/
    1.22  
    1.23 -docs.install:
    1.24 +install-docs:
    1.25 +	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
    1.26  	sh ./docs/check_pkgs
    1.27  	-$(MAKE) -C docs install
    1.28  
    1.29 -xen.install tools.install: %.install:
    1.30 -	$(MAKE) -C $* install
    1.31 -
    1.32 -xen.dist tools.dist: %.dist:
    1.33 -	$(MAKE) -C $* dist
    1.34 -
    1.35  # build and install everything into local dist directory
    1.36 -dist: xen.dist tools.dist kernels docs.install
    1.37 +dist: xen tools kernels docs
    1.38  	$(INSTALL_DIR) $(DIST_DIR)/check
    1.39  	$(INSTALL_DATA) ./COPYING $(DIST_DIR)
    1.40  	$(INSTALL_DATA) ./README $(DIST_DIR)
    1.41 @@ -63,7 +64,8 @@ xen:
    1.42  tools:
    1.43  	$(MAKE) dist=yes -C tools install
    1.44  
    1.45 -kernels: $(addsuffix -build,$(XKERNELS))
    1.46 +kernels:
    1.47 +	for i in $(XKERNELS) ; do $(MAKE) $$i-build ; done
    1.48  
    1.49  docs:
    1.50  	sh ./docs/check_pkgs
    1.51 @@ -73,13 +75,17 @@ docs:
    1.52  kbuild: kernels
    1.53  
    1.54  # Delete the kernel build trees entirely
    1.55 -kdelete: $(addsuffix -clean,$(XKERNELS))
    1.56 +kdelete:
    1.57 +	for i in $(XKERNELS) ; do $(MAKE) $$i-delete ; done
    1.58  
    1.59  # Clean the kernel build trees
    1.60 -kclean: $(addsuffix -clean,$(XKERNELS))
    1.61 +kclean:
    1.62 +	for i in $(XKERNELS) ; do $(MAKE) $$i-clean ; done
    1.63  
    1.64  # Make patches from kernel sparse trees
    1.65 -mkpatches: $(addsuffix -xen.patch,$(ALLSPARSETREES))
    1.66 +mkpatches:
    1.67 +	for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-xen.patch ; done
    1.68 +
    1.69  
    1.70  # build xen, the tools, and a domain 0 plus unprivileged linux-xen images,
    1.71  # and place them in the install directory. 'make install' should then
    1.72 @@ -90,14 +96,16 @@ world:
    1.73  	$(MAKE) dist
    1.74  
    1.75  # clean doesn't do a kclean
    1.76 -clean: xen.clean tools.clean docs.clean
    1.77 -
    1.78 -xen.clean tools.clean docs.clean: %.clean:
    1.79 -	$(MAKE) -C $* clean
    1.80 +clean: 
    1.81 +	$(MAKE) -C xen clean
    1.82 +	$(MAKE) -C tools clean
    1.83 +	$(MAKE) -C docs clean
    1.84  
    1.85  # clean, but blow away kernel build tree plus tar balls
    1.86 -mrproper: clean $(addsuffix -delete,$(ALLKERNELS)) $(addsuffix -mrproper,$(ALLSPARSETREES))
    1.87 +mrproper: clean
    1.88  	rm -rf dist patches/tmp
    1.89 +	for i in $(ALLKERNELS) ; do $(MAKE) $$i-delete ; done
    1.90 +	for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-mrproper ; done
    1.91  
    1.92  install-twisted:
    1.93  	wget http://www.twistedmatrix.com/products/get-current.epy
    1.94 @@ -159,8 +167,13 @@ uninstall:
    1.95  	rm -rf "/usr/lib/python2.?/site-packages/xen* /usr/lib/libxc* /usr/lib/python2.?/site-packages/Xc*"
    1.96  
    1.97  # Legacy targets for compatibility
    1.98 -linux24: linux-2.4-xen0-build linux-2.4-xenU-build
    1.99 +linux24:
   1.100 +	$(MAKE) linux-2.4-xen0-build
   1.101 +	$(MAKE) linux-2.4-xenU-build
   1.102  
   1.103 -linux26: linux-2.6-xen0-build linux-2.6-xenU-build
   1.104 +linux26:
   1.105 +	$(MAKE) linux-2.6-xen0-build
   1.106 +	$(MAKE) linux-2.6-xenU-build
   1.107  
   1.108 -netbsd20: netbsd-2.0-xenU-build
   1.109 +netbsd20:
   1.110 +	$(MAKE) netbsd-2.0-xenU-build

     2.1 --- a/xen/Makefile	Sat Jan 22 22:07:37 2005 +0000
     2.2 +++ b/xen/Makefile	Mon Jan 24 22:34:15 2005 +0000
     2.3 @@ -32,14 +32,15 @@ install: $(TARGET).gz
     2.4  
     2.5  dist: install
     2.6  
     2.7 -clean: tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean
     2.8 +clean:
     2.9 +	$(MAKE) -C tools clean
    2.10 +	$(MAKE) -C common clean
    2.11 +	$(MAKE) -C drivers clean
    2.12 +	$(MAKE) -C arch/$(TARGET_ARCH) clean
    2.13  	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
    2.14  	rm -f include/asm-*/asm-offsets.h
    2.15  	rm -f tools/figlet/*.o tools/figlet/figlet
    2.16  
    2.17 -tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean : %.clean:
    2.18 -	$(MAKE) -C $* clean
    2.19 -
    2.20  $(TARGET): delete-unfresh-files include/xen/compile.h
    2.21  	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
    2.22  	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s