[Xen-changelog] [xen-unstable] [SOLARIS] A couple of small fixes to the Makefiles for the kernel tool headers.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID f4b7b8aefc0585c7e4e08f080f971b4cb3d69cf3
# Parent  be8039f8bc147f419820839f71c68011704a0d1f
[SOLARIS] A couple of small fixes to the Makefiles for the kernel tool headers.

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/Rules.mk               |    6 +++---
 tools/guest-headers/Makefile |   12 +++++++++---
 tools/xenstore/Makefile      |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff -r be8039f8bc14 -r f4b7b8aefc05 tools/Rules.mk
--- a/tools/Rules.mk    Tue Oct 17 16:48:05 2006 +0100
+++ b/tools/Rules.mk    Tue Oct 17 16:51:09 2006 +0100
@@ -25,9 +25,9 @@ CFLAGS += -D__XEN_TOOLS__
 %.o: %.cc
        $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-OS = $(shell uname -s)
+.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS)
 
-.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(OS)
+mk-symlinks-SunOS:
 
 mk-symlinks-Linux: LINUX_ROOT=$(XEN_ROOT)/linux-2.6-xen-sparse
 mk-symlinks-Linux:
@@ -44,4 +44,4 @@ mk-symlinks-xen:
        mkdir -p xen/io
        ( cd xen/io && ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . )
 
-mk-symlinks: mk-symlinks-xen mk-symlinks-$(OS)
+mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS)
diff -r be8039f8bc14 -r f4b7b8aefc05 tools/guest-headers/Makefile
--- a/tools/guest-headers/Makefile      Tue Oct 17 16:48:05 2006 +0100
+++ b/tools/guest-headers/Makefile      Tue Oct 17 16:51:09 2006 +0100
@@ -1,5 +1,6 @@
+XEN_ROOT=../..
+include $(XEN_ROOT)/tools/Rules.mk
 
-XEN_ROOT=../..
 linuxsparsetree = $(XEN_ROOT)/linux-2.6-xen-sparse
 
 .PHONY: all
@@ -8,10 +9,15 @@ all:
 .PHONY: check
 check:
 
-.PHONY: install
-install:
+.PHONY: install install-Linux install-SunOS
+
+install-Linux:
        mkdir -p $(DESTDIR)/usr/include/xen/linux
        install -m0644 $(linuxsparsetree)/include/xen/public/*.h 
$(DESTDIR)/usr/include/xen/linux
 
+install-SunOS:
+
+install: install-$(XEN_OS)
+
 .PHONY: clean
 clean:
diff -r be8039f8bc14 -r f4b7b8aefc05 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Tue Oct 17 16:48:05 2006 +0100
+++ b/tools/xenstore/Makefile   Tue Oct 17 16:51:09 2006 +0100
@@ -29,7 +29,7 @@ XENSTORED_OBJS = xenstored_core.o xensto
 
 XENSTORED_Linux = xenstored_linux.o
 
-XENSTORED_OBJS += $(XENSTORED_$(OS))
+XENSTORED_OBJS += $(XENSTORED_$(XEN_OS))
 
 .PHONY: all
 all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump 
xenstore-control xenstore-ls

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