bitkeeper revision 1.1159.223.42 (41f77751X73w7_t6jI0dgGV6N-Bweg)

More build system fixes and tweaks.

diff --git a/Makefile b/Makefile
index d1d7ba5df4ae39e20b441f95377ecbab86c8d5f0..33bac70d43dcf33cf4f79c299a9137c82092cd8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ INSTALL_DIR   := $(INSTALL) -d -m0755
 INSTALL_DATA   := $(INSTALL) -m0644
 INSTALL_PROG   := $(INSTALL) -m0755
 
-KERNELS ?= linux-2.6-xen0 linux-2.6-xenU  linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
+KERNELS ?= *2.6*
 # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
 # You may use wildcards in the above e.g. KERNELS=*2.4*
 
@@ -146,9 +146,20 @@ help:
        @echo '                     with extreme care!)'
 
 # Use this target with extreme care!
+uninstall: DESTDIR=
+uninstall: D=$(DESTDIR)
 uninstall:
-       cp -a /etc/xen /etc/xen.old && rm -rf /etc/xen 
-       rm -rf "/usr/lib/python2.?/site-packages/xen* /usr/lib/libxc* /usr/lib/python2.?/site-packages/Xc*"
+       [ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
+       rm -rf $(D)/etc/init.d/xend*
+       rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
+       rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
+       rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
+       rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*
+       rm -rf $(D)/usr/sbin/netfix
+       rm -rf $(D)/usr/sbin/xfrd $(D)/usr/sbin/xm $(D)/var/lib/xen
+       rm -rf $(D)/usr/share/doc/xen  $(D)/usr/man/man*/xentrace*
+       rm -rf $(D)/usr/bin/xen* $(D)/usr/bin/miniterm
+       rm -rf $(D)/boot/*xen*
 
 # Legacy targets for compatibility
 linux24:

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 3db364201d9832dc007365a1fd0c4248abfcd99e..a0f62b9c6f26a215a9bb00e33536572fe088402f 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -69,8 +69,8 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)/usr/lib
        $(INSTALL_DIR) $(DESTDIR)/usr/include
        $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
-       ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
-       ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
+       ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
+       ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
        $(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
 
 clean:

diff --git a/tools/vnet/vnet-module/Makefile-2.4 b/tools/vnet/vnet-module/Makefile-2.4
index 68c34c2b2941d74692e74dbd5655cb07a377e13a..5781fca09710d994afd021fd52c042a9b2f30116 100644 (file)
--- a/tools/vnet/vnet-module/Makefile-2.4
+++ b/tools/vnet/vnet-module/Makefile-2.4
@@ -61,7 +61,6 @@ CFLAGS += -Wno-trigraphs
 CFLAGS += -Wno-unused-function
 CFLAGS += -Wno-unused-parameter 
 
-CFLAGS += -g
 CFLAGS += -O2
 CFLAGS += -fno-strict-aliasing 
 CFLAGS += -fno-common 

diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile
index be13801a0cf4cf1df5ce9741c0736b1f2a2489e3..a507666b5dabee7365205e495d89c1e4ab6f23ea 100644 (file)
--- a/tools/vnet/vnetd/Makefile
+++ b/tools/vnet/vnetd/Makefile
@@ -42,7 +42,6 @@ INCLUDES += -I$(GC_INCLUDE)
 CPPFLAGS += -D USE_GC
 
 #----------------------------------------------------------------------------
-CFLAGS += -g
 CFLAGS += -Wall
 CFLAGS += $(INCLUDES) $(LIBS)
 

diff --git a/tools/x2d2/Makefile b/tools/x2d2/Makefile
index 36de2856ae4c9e93e3d828fc2705de6bb178ab6e..fbe408107f1fcf00d5a9c01ba0d410cd99376195 100644 (file)
--- a/tools/x2d2/Makefile
+++ b/tools/x2d2/Makefile
@@ -2,7 +2,7 @@ XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Make.defs
 
 CC       = gcc
-CFLAGS   = -Wall -Werror -g
+CFLAGS   = -Wall -Werror -O3 -fno-strict-aliasing
 
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)

diff --git a/tools/xfrd/Makefile b/tools/xfrd/Makefile
index 0b16891eaf499e310d486935529a365c69208328..1b07ffa4980d2a5f71b0950fd13fc33caee07594 100644 (file)
--- a/tools/xfrd/Makefile
+++ b/tools/xfrd/Makefile
@@ -36,9 +36,7 @@ endif
 
 CC := gcc
 
-CFLAGS += -g
-CFLAGS += -Wall
-CFLAGS += -Werror
+CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
 CFLAGS += $(INCLUDES)
 # Make gcc generate dependencies.
 CFLAGS += -Wp,-MD,.$(@F).d