[Xen-changelog] Manual merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 88a7a299d92757808bada031ed546bf3862ca496
# Parent  cb3da7250118c405d3d9bc549e355f81a051ff39

# Parent  43e2d33fc5d99e630e3cd255b18b1eb83542df3b
Manual merge.

diff -r cb3da7250118 -r 88a7a299d927 xen/drivers/char/Makefile
--- a/xen/drivers/char/Makefile Fri Jul  1 14:31:22 2005
+++ b/xen/drivers/char/Makefile Fri Jul  1 14:32:22 2005
@@ -7,3 +7,5 @@
 
 clean:
        rm -f *.o *~ core
+
+console.o: $(BASEDIR)/include/xen/compile.h
diff -r cb3da7250118 -r 88a7a299d927 xen/Makefile
--- a/xen/Makefile      Fri Jul  1 14:31:22 2005
+++ b/xen/Makefile      Fri Jul  1 14:32:22 2005
@@ -67,9 +67,12 @@
        $(MAKE) -C arch/$(TARGET_ARCH)
 
 # drivers/char/console.o contains static banner/compile info. Blow it away.
+# Don't refresh these files during e.g., 'sudo make install'
 delete-unfresh-files:
-       rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
-       $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
+       @if [ ! -r include/xen/compile.h -o -O include/xen/compile.h ]; then \
+               rm -f include/xen/{banner,compile}.h; \
+               $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files; \
+       fi
 
 # acm_policy.h contains security policy for Xen
 include/xen/acm_policy.h:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog