ia64/xen-unstable
changeset 4360:1ce17c2d32c5
bitkeeper revision 1.1236.1.146 (42487c63RNAgA2iD3MzC_827ws4_gA)
merge
merge
author | kaf24@firebug.cl.cam.ac.uk |
---|---|
date | Mon Mar 28 21:51:31 2005 +0000 (2005-03-28) |
parents | 6966b0183ab8 a5114e03a054 |
children | 9d9beae42280 |
files | BitKeeper/etc/ignore xen/Makefile |
line diff
1.1 --- a/BitKeeper/etc/ignore Mon Mar 28 21:16:12 2005 +0000 1.2 +++ b/BitKeeper/etc/ignore Mon Mar 28 21:51:31 2005 +0000 1.3 @@ -44,12 +44,14 @@ docs/user/internals.pl 1.4 docs/user/labels.pl 1.5 docs/user/user.css 1.6 docs/user/user.html 1.7 +extras/mini-os/h/hypervisor-ifs 1.8 extras/mini-os/h/xen-public 1.9 extras/mini-os/mini-os.* 1.10 install/* 1.11 linux-*-xen0/* 1.12 linux-*-xenU/* 1.13 linux-*.patch 1.14 +linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh 1.15 linux-xen-sparse 1.16 mkddbxen 1.17 netbsd-*-tools/* 1.18 @@ -61,14 +63,38 @@ patches/ebtables.diff 1.19 patches/tmp/* 1.20 pristine-* 1.21 tools/*/build/lib*/*.py 1.22 +tools/Makefile.smh 1.23 tools/balloon/balloon 1.24 +tools/blktap/Makefile.smh 1.25 +tools/blktap/blkcow 1.26 +tools/blktap/blkcowgnbd 1.27 +tools/blktap/blkcowimg 1.28 +tools/blktap/blkdump 1.29 +tools/blktap/blkgnbd 1.30 +tools/blktap/blkimg 1.31 +tools/blktap/blockstore.dat 1.32 +tools/blktap/blockstored 1.33 +tools/blktap/bstest 1.34 +tools/blktap/parallax 1.35 +tools/blktap/vdi.dot 1.36 +tools/blktap/vdi.ps 1.37 +tools/blktap/vdi_create 1.38 +tools/blktap/vdi_fill 1.39 +tools/blktap/vdi_list 1.40 +tools/blktap/vdi_snap 1.41 +tools/blktap/vdi_snap_list 1.42 +tools/blktap/vdi_tree 1.43 +tools/blktap/vdi_validate 1.44 +tools/blktap/xen/* 1.45 tools/check/.* 1.46 +tools/cmdline/* 1.47 tools/cmdline/xen/* 1.48 tools/ioemu/iodev/device-model 1.49 tools/libxc/xen/* 1.50 tools/misc/miniterm/miniterm 1.51 tools/misc/xen_cpuperf 1.52 tools/misc/xenperf 1.53 +tools/tests/test_x86_emulator 1.54 tools/vnet/gc 1.55 tools/vnet/gc*/* 1.56 tools/vnet/vnet-module/*.ko 1.57 @@ -83,6 +109,7 @@ tools/xcs/xcsdump 1.58 tools/xentrace/xentrace 1.59 tools/xfrd/xfrd 1.60 xen/BLOG 1.61 +xen/TAGS 1.62 xen/arch/x86/asm-offsets.s 1.63 xen/arch/x86/boot/mkelf32 1.64 xen/ddb/* 1.65 @@ -92,37 +119,14 @@ xen/drivers/pci/gen-devlist 1.66 xen/figlet/figlet 1.67 xen/include/asm 1.68 xen/include/asm-*/asm-offsets.h 1.69 +xen/include/hypervisor-ifs/arch 1.70 xen/include/public/public 1.71 xen/include/xen/*.new 1.72 xen/include/xen/banner.h 1.73 xen/include/xen/compile.h 1.74 +xen/tags 1.75 xen/tools/elf-reloc 1.76 xen/tools/figlet/figlet 1.77 xen/xen 1.78 xen/xen-syms 1.79 xen/xen.* 1.80 -linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh 1.81 -tools/Makefile.smh 1.82 -tools/blktap/Makefile.smh 1.83 -tools/blktap/blkcow 1.84 -tools/blktap/blkcowgnbd 1.85 -tools/blktap/blkcowimg 1.86 -tools/blktap/blkdump 1.87 -tools/blktap/blkgnbd 1.88 -tools/blktap/blkimg 1.89 -tools/blktap/blockstore.dat 1.90 -tools/blktap/parallax 1.91 -tools/blktap/vdi.dot 1.92 -tools/blktap/vdi.ps 1.93 -tools/blktap/vdi_create 1.94 -tools/blktap/vdi_fill 1.95 -tools/blktap/vdi_list 1.96 -tools/blktap/vdi_snap 1.97 -tools/blktap/vdi_snap_list 1.98 -tools/blktap/vdi_tree 1.99 -tools/blktap/vdi_validate 1.100 -tools/blktap/xen/* 1.101 -tools/cmdline/* 1.102 -tools/tests/test_x86_emulator 1.103 -tools/blktap/blockstored 1.104 -tools/blktap/bstest
2.1 --- a/xen/Makefile Mon Mar 28 21:16:12 2005 +0000 2.2 +++ b/xen/Makefile Mon Mar 28 21:51:31 2005 +0000 2.3 @@ -103,7 +103,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h 2.4 echo ""; \ 2.5 echo "#endif") <$< >$@ 2.6 2.7 -.PHONY: default debug install dist clean delete-unfresh-files TAGS 2.8 +.PHONY: default debug install dist clean delete-unfresh-files TAGS tags 2.9 2.10 SUBDIRS = arch/$(TARGET_ARCH) common drivers 2.11 TAGS: 2.12 @@ -111,5 +111,10 @@ TAGS: 2.13 find include -type d \( -name "asm-*" -o -name config \) -prune -o \ 2.14 -name '*.h' -print; \ 2.15 find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | etags - 2.16 +tags: 2.17 + ( find include/asm-$(TARGET_ARCH) -name '*.h'; \ 2.18 + find include -type d \( -name "asm-*" -o -name config \) -prune -o \ 2.19 + -name '*.h' -print; \ 2.20 + find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | xargs ctags 2.21 MAP: 2.22 nm $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map