ia64/xen-unstable

changeset 3545:1b6a9577c36d

bitkeeper revision 1.1159.212.44 (41f77762AXzU93deGpv_Z5doFw4oeg)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Wed Jan 26 10:56:34 2005 +0000 (2005-01-26)
parents bbfc7fe2e910 eeb8b544bff5
children d295396360fb 9f592e7728db
files Makefile tools/libxc/Makefile tools/vnet/vnet-module/Makefile-2.4 tools/vnet/vnetd/Makefile tools/x2d2/Makefile tools/xfrd/Makefile
line diff
     1.1 --- a/Makefile	Tue Jan 25 17:57:49 2005 +0000
     1.2 +++ b/Makefile	Wed Jan 26 10:56:34 2005 +0000
     1.3 @@ -11,7 +11,7 @@ INSTALL_DIR	:= $(INSTALL) -d -m0755
     1.4  INSTALL_DATA	:= $(INSTALL) -m0644
     1.5  INSTALL_PROG	:= $(INSTALL) -m0755
     1.6  
     1.7 -KERNELS ?= linux-2.6-xen0 linux-2.6-xenU  linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
     1.8 +KERNELS ?= *2.6*
     1.9  # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
    1.10  # You may use wildcards in the above e.g. KERNELS=*2.4*
    1.11  
    1.12 @@ -146,9 +146,20 @@ help:
    1.13  	@echo '                     with extreme care!)'
    1.14  
    1.15  # Use this target with extreme care!
    1.16 +uninstall: DESTDIR=
    1.17 +uninstall: D=$(DESTDIR)
    1.18  uninstall:
    1.19 -	cp -a /etc/xen /etc/xen.old && rm -rf /etc/xen 
    1.20 -	rm -rf "/usr/lib/python2.?/site-packages/xen* /usr/lib/libxc* /usr/lib/python2.?/site-packages/Xc*"
    1.21 +	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
    1.22 +	rm -rf $(D)/etc/init.d/xend*
    1.23 +	rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
    1.24 +	rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
    1.25 +	rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
    1.26 +	rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*
    1.27 +	rm -rf $(D)/usr/sbin/netfix
    1.28 +	rm -rf $(D)/usr/sbin/xfrd $(D)/usr/sbin/xm $(D)/var/lib/xen
    1.29 +	rm -rf $(D)/usr/share/doc/xen  $(D)/usr/man/man*/xentrace*
    1.30 +	rm -rf $(D)/usr/bin/xen* $(D)/usr/bin/miniterm
    1.31 +	rm -rf $(D)/boot/*xen*
    1.32  
    1.33  # Legacy targets for compatibility
    1.34  linux24:
     2.1 --- a/tools/libxc/Makefile	Tue Jan 25 17:57:49 2005 +0000
     2.2 +++ b/tools/libxc/Makefile	Wed Jan 26 10:56:34 2005 +0000
     2.3 @@ -70,8 +70,8 @@ install: all
     2.4  	$(INSTALL_DIR) $(DESTDIR)/usr/lib
     2.5  	$(INSTALL_DIR) $(DESTDIR)/usr/include
     2.6  	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
     2.7 -	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
     2.8 -	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
     2.9 +	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
    2.10 +	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
    2.11  	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
    2.12  
    2.13  clean:
     3.1 --- a/tools/vnet/vnet-module/Makefile-2.4	Tue Jan 25 17:57:49 2005 +0000
     3.2 +++ b/tools/vnet/vnet-module/Makefile-2.4	Wed Jan 26 10:56:34 2005 +0000
     3.3 @@ -61,7 +61,6 @@ CFLAGS += -Wno-trigraphs
     3.4  CFLAGS += -Wno-unused-function
     3.5  CFLAGS += -Wno-unused-parameter 
     3.6  
     3.7 -CFLAGS += -g
     3.8  CFLAGS += -O2
     3.9  CFLAGS += -fno-strict-aliasing 
    3.10  CFLAGS += -fno-common 
     4.1 --- a/tools/vnet/vnetd/Makefile	Tue Jan 25 17:57:49 2005 +0000
     4.2 +++ b/tools/vnet/vnetd/Makefile	Wed Jan 26 10:56:34 2005 +0000
     4.3 @@ -42,7 +42,6 @@ INCLUDES += -I$(GC_INCLUDE)
     4.4  CPPFLAGS += -D USE_GC
     4.5  
     4.6  #----------------------------------------------------------------------------
     4.7 -CFLAGS += -g
     4.8  CFLAGS += -Wall
     4.9  CFLAGS += $(INCLUDES) $(LIBS)
    4.10  
     5.1 --- a/tools/x2d2/Makefile	Tue Jan 25 17:57:49 2005 +0000
     5.2 +++ b/tools/x2d2/Makefile	Wed Jan 26 10:56:34 2005 +0000
     5.3 @@ -2,7 +2,7 @@ XEN_ROOT=../..
     5.4  include $(XEN_ROOT)/tools/Make.defs
     5.5  
     5.6  CC       = gcc
     5.7 -CFLAGS   = -Wall -Werror -g
     5.8 +CFLAGS   = -Wall -Werror -O3 -fno-strict-aliasing
     5.9  
    5.10  CFLAGS  += -I $(XEN_XC)
    5.11  CFLAGS  += -I $(XEN_LIBXC)
     6.1 --- a/tools/xfrd/Makefile	Tue Jan 25 17:57:49 2005 +0000
     6.2 +++ b/tools/xfrd/Makefile	Wed Jan 26 10:56:34 2005 +0000
     6.3 @@ -36,9 +36,7 @@ endif
     6.4  
     6.5  CC := gcc
     6.6  
     6.7 -CFLAGS += -g
     6.8 -CFLAGS += -Wall
     6.9 -CFLAGS += -Werror
    6.10 +CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
    6.11  CFLAGS += $(INCLUDES)
    6.12  # Make gcc generate dependencies.
    6.13  CFLAGS += -Wp,-MD,.$(@F).d