direct-io.hg

changeset 2841:3500fed096b1

bitkeeper revision 1.1159.1.345 (4188c3c3m4peCqRhMg6W2JHnjHwkDw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Nov 03 11:40:51 2004 +0000 (2004-11-03)
parents 2d1404c193f4 076976533990
children 2c276f6ac53c
files docs/Makefile netbsd-2.0-xen-sparse/nbconfig-xen netbsd-2.0-xen-sparse/nbmake-xen tools/libxc/Makefile tools/libxutil/Makefile xen/Makefile
line diff
     1.1 --- a/docs/Makefile	Wed Nov 03 07:55:09 2004 +0000
     1.2 +++ b/docs/Makefile	Wed Nov 03 11:40:51 2004 +0000
     1.3 @@ -30,10 +30,10 @@ install: all
     1.4  pdf/%.pdf: ps/%.ps
     1.5  	mkdir -p pdf ; ps2pdf $< $@
     1.6  
     1.7 -ps/%.ps: %.dvi $(GFX)
     1.8 +ps/%.ps: %.dvi
     1.9  	mkdir -p ps ; dvips -Ppdf -G0 -o $@ $<
    1.10  
    1.11 -%.dvi: src/%.tex
    1.12 +%.dvi: src/%.tex $(GFX)
    1.13  	latex $< >/dev/null
    1.14  	if [ -e $*.toc ] ; then latex $< >/dev/null ; fi
    1.15  
     2.1 --- a/netbsd-2.0-xen-sparse/nbconfig-xen	Wed Nov 03 07:55:09 2004 +0000
     2.2 +++ b/netbsd-2.0-xen-sparse/nbconfig-xen	Wed Nov 03 11:40:51 2004 +0000
     2.3 @@ -2,7 +2,7 @@
     2.4  #
     2.5  
     2.6  : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)}
     2.7 -: ${HARCH:=$(uname -i)}
     2.8 +: ${HARCH:=$(uname -i 2>/dev/null || echo i386)}
     2.9  : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
    2.10  : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
    2.11  : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
     3.1 --- a/netbsd-2.0-xen-sparse/nbmake-xen	Wed Nov 03 07:55:09 2004 +0000
     3.2 +++ b/netbsd-2.0-xen-sparse/nbmake-xen	Wed Nov 03 11:40:51 2004 +0000
     3.3 @@ -4,7 +4,7 @@
     3.4  #
     3.5  
     3.6  : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)}
     3.7 -: ${HARCH:=$(uname -i)}
     3.8 +: ${HARCH:=$(uname -i 2>/dev/null || echo i386)}
     3.9  : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
    3.10  : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
    3.11  : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
     4.1 --- a/tools/libxc/Makefile	Wed Nov 03 07:55:09 2004 +0000
     4.2 +++ b/tools/libxc/Makefile	Wed Nov 03 11:40:51 2004 +0000
     4.3 @@ -38,7 +38,8 @@ OBJS     = $(patsubst %.c,%.o,$(SRCS))
     4.4  
     4.5  LIB      = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
     4.6  
     4.7 -all: check-for-zlib mk-symlinks $(LIB)
     4.8 +all: check-for-zlib mk-symlinks
     4.9 +	$(MAKE) $(LIB)
    4.10  
    4.11  check-for-zlib:
    4.12  	@if [ ! -e /usr/include/zlib.h ]; then \
     5.1 --- a/tools/libxutil/Makefile	Wed Nov 03 07:55:09 2004 +0000
     5.2 +++ b/tools/libxutil/Makefile	Wed Nov 03 11:40:51 2004 +0000
     5.3 @@ -30,7 +30,8 @@ LIB      := $(LIB_NAME).so
     5.4  LIB      += $(LIB_NAME).so.$(MAJOR)
     5.5  LIB      += $(LIB_NAME).so.$(MAJOR).$(MINOR)
     5.6  
     5.7 -all: check-for-zlib $(LIB)
     5.8 +all: check-for-zlib
     5.9 +	$(MAKE) $(LIB)
    5.10  
    5.11  $(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
    5.12  	ln -sf $^ $@
     6.1 --- a/xen/Makefile	Wed Nov 03 07:55:09 2004 +0000
     6.2 +++ b/xen/Makefile	Wed Nov 03 11:40:51 2004 +0000
     6.3 @@ -9,8 +9,6 @@ export BASEDIR          := $(shell pwd)
     6.4  
     6.5  include Rules.mk
     6.6  
     6.7 -GENERATED_FILES := include/xen/compile.h
     6.8 -
     6.9  default: $(TARGET)
    6.10  	gzip -f -9 < $(TARGET) > $(TARGET).gz
    6.11  
    6.12 @@ -30,27 +28,23 @@ install: $(TARGET)
    6.13  dist: $(TARGET)
    6.14  	$(MAKE) prefix=`pwd`/../install dist=yes install
    6.15  
    6.16 -clean: delete-links
    6.17 +clean:
    6.18  	$(MAKE) -C figlet clean
    6.19  	$(MAKE) -C common clean
    6.20  	$(MAKE) -C drivers clean
    6.21  	$(MAKE) -C arch/$(TARGET_ARCH) clean
    6.22 -	rm -f *.o $(TARGET)* *~ core $(GENERATED_FILES)
    6.23 +	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
    6.24  
    6.25 -$(TARGET): delete-unfresh-files make-links $(GENERATED_FILES)
    6.26 +$(TARGET): delete-unfresh-files
    6.27 +	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
    6.28 +	$(MAKE) include/xen/compile.h
    6.29  	$(MAKE) -C common
    6.30  	$(MAKE) -C drivers
    6.31  	$(MAKE) -C arch/$(TARGET_ARCH)
    6.32  
    6.33 -make-links: delete-links
    6.34 -	ln -sf asm-$(TARGET_ARCH) include/asm
    6.35 -
    6.36 -delete-links:
    6.37 -	rm -f include/asm
    6.38 -
    6.39  # Blow away kernel.o because build info is stored statically within it.
    6.40  delete-unfresh-files:
    6.41 -	rm -f $(GENERATED_FILES) common/kernel.o
    6.42 +	rm -f include/xen/compile.h common/kernel.o
    6.43  
    6.44  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    6.45  include/xen/compile.h:
    6.46 @@ -71,8 +65,7 @@ include/xen/compile.h:
    6.47  	cd ./figlet && make && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../$@ && cd ..
    6.48  	@LANG=C echo >> $@
    6.49  
    6.50 -.PHONY: $(GENERATED_FILES) make-links delete-links default 
    6.51 -.PHONY: debug install clean delete-unfresh-files TAGS
    6.52 +.PHONY: default debug install dist clean delete-unfresh-files TAGS
    6.53  
    6.54  SUBDIRS = arch common drivers 
    6.55  TAGS: