diff options
-rw-r--r-- | Makefile | 17 | ||||
-rw-r--r-- | tools/libxc/Makefile | 4 | ||||
-rw-r--r-- | tools/vnet/vnet-module/Makefile-2.4 | 1 | ||||
-rw-r--r-- | tools/vnet/vnetd/Makefile | 1 | ||||
-rw-r--r-- | tools/x2d2/Makefile | 2 | ||||
-rw-r--r-- | tools/xfrd/Makefile | 4 |
6 files changed, 18 insertions, 11 deletions
@@ -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 3db364201d..a0f62b9c6f 100644 --- 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 68c34c2b29..5781fca097 100644 --- 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 be13801a0c..a507666b5d 100644 --- 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 36de2856ae..fbe408107f 100644 --- 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 0b16891eaf..1b07ffa498 100644 --- 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 |