bitkeeper revision 1.1236.1.7 (421d9a5b-DJu8ku3gvpHa3t6ChqYKQ)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk

tools/Makefile

@@ -25,6 +25,7 @@ install:
 	$(MAKE) -C ioemu install
 
 clean:
+	$(MAKE) -C check clean
 	$(MAKE) -C libxutil clean
 	$(MAKE) -C libxc clean
 	$(MAKE) -C misc clean

tools/Rules.mk

@@ -4,6 +4,9 @@ XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
 
+COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
+TARGET_ARCH     ?= $(COMPILE_ARCH)
+
 ifeq ($(TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386
@@ -13,3 +16,9 @@ ifeq ($(TARGET_ARCH),x86_64)
 CFLAGS  += -m64
 LDFLAGS += -m elf_x86_64
 endif
+
+%.opic: %.c
+	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
+
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

tools/libxc/Makefile

@@ -1,12 +1,4 @@
 
-ifndef BUILD_PIC_LIBS
-ifeq ($(wildcard /etc/debian_version),)
-BUILD_PIC_LIBS=n
-else
-BUILD_PIC_LIBS=y
-endif
-endif
-
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DATA	= $(INSTALL) -m0644
@@ -101,9 +93,6 @@ rpm: all
 	mv staging/i386/*.rpm .
 	rm -rf staging
 
-$(PIC_OBJS): %.opic: %.c
-	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
-
 libxc.a: $(OBJS)
 	$(AR) rc $@ $^
 
@@ -112,12 +101,7 @@ libxc.so: libxc.so.$(MAJOR)
 libxc.so.$(MAJOR): libxc.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
-ifeq ($(BUILD_PIC_LIBS),y)
 libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
 	$(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
-else
-libxc.so.$(MAJOR).$(MINOR): $(LIB_OBJS)
-	$(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
-endif
 
 -include $(DEPS)

tools/libxutil/Makefile

@@ -1,12 +1,4 @@
 
-ifndef BUILD_PIC_LIBS
-ifeq ($(wildcard /etc/debian_version),)
-BUILD_PIC_LIBS=n
-else
-BUILD_PIC_LIBS=y
-endif
-endif
-
 XEN_ROOT = ../..
 INSTALL		= install
 INSTALL_DATA	= $(INSTALL) -m0644
@@ -51,22 +43,14 @@ LIB      += libxutil.a
 all: check-for-zlib
 	$(MAKE) $(LIB)
 
-$(PIC_OBJS): %.opic: %.c
-	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
-
 libxutil.so: libxutil.so.$(MAJOR)
 	ln -sf $^ $@
 
 libxutil.so.$(MAJOR): libxutil.so.$(MAJOR).$(MINOR)
 	ln -sf $^ $@
 
-ifeq ($(BUILD_PIC_LIBS),y)
 libxutil.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
 	$(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
-else
-libxutil.so.$(MAJOR).$(MINOR): $(LIB_OBJS)
-	$(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
-endif
 
 libxutil.a: $(LIB_OBJS)
 	$(AR) rc $@ $^

tools/misc/miniterm/Makefile

@@ -14,3 +14,6 @@ install: all
 
 clean:
 	$(RM) *.o $(TARGET) *~
+
+$(TARGET): $(TARGET).c
+	$(CC) $(CFLAGS) -o $@ $<

tools/xcs/Makefile

@@ -31,7 +31,7 @@ BIN      = xcs
 all: $(BIN) xcsdump
 
 clean:
-	$(RM) *.a *.so *.o *.rpm $(BIN) ctrl_dump
+	$(RM) *.a *.so *.o *.rpm $(BIN) xcsdump
 
 xcsdump: xcsdump.c
 	$(CC) $(CFLAGS) -o xcsdump xcsdump.c -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) \

xen/Makefile

@@ -37,12 +37,12 @@ install: $(TARGET).gz
 	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
 	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
 
-clean:
+clean: delete-unfresh-files
 	$(MAKE) -C tools clean
 	$(MAKE) -C common clean
 	$(MAKE) -C drivers clean
 	$(MAKE) -C arch/$(TARGET_ARCH) clean
-	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
+	rm -f include/asm *.o $(TARGET)* *~ core
 	rm -f include/asm-*/asm-offsets.h
 	rm -f tools/figlet/*.o tools/figlet/figlet