direct-io.hg

changeset 11768:f4b7b8aefc05

[SOLARIS] A couple of small fixes to the Makefiles for the kernel tool headers.

Signed-off-by: John Levon <john.levon@sun.com>
author kfraser@localhost.localdomain
date Tue Oct 17 16:51:09 2006 +0100 (2006-10-17)
parents be8039f8bc14
children 4154ba04725a
files tools/Rules.mk tools/guest-headers/Makefile tools/xenstore/Makefile
line diff
     1.1 --- a/tools/Rules.mk	Tue Oct 17 16:48:05 2006 +0100
     1.2 +++ b/tools/Rules.mk	Tue Oct 17 16:51:09 2006 +0100
     1.3 @@ -25,9 +25,9 @@ CFLAGS += -D__XEN_TOOLS__
     1.4  %.o: %.cc
     1.5  	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
     1.6  
     1.7 -OS = $(shell uname -s)
     1.8 +.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS)
     1.9  
    1.10 -.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(OS)
    1.11 +mk-symlinks-SunOS:
    1.12  
    1.13  mk-symlinks-Linux: LINUX_ROOT=$(XEN_ROOT)/linux-2.6-xen-sparse
    1.14  mk-symlinks-Linux:
    1.15 @@ -44,4 +44,4 @@ mk-symlinks-xen:
    1.16  	mkdir -p xen/io
    1.17  	( cd xen/io && ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . )
    1.18  
    1.19 -mk-symlinks: mk-symlinks-xen mk-symlinks-$(OS)
    1.20 +mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS)
     2.1 --- a/tools/guest-headers/Makefile	Tue Oct 17 16:48:05 2006 +0100
     2.2 +++ b/tools/guest-headers/Makefile	Tue Oct 17 16:51:09 2006 +0100
     2.3 @@ -1,5 +1,6 @@
     2.4 +XEN_ROOT=../..
     2.5 +include $(XEN_ROOT)/tools/Rules.mk
     2.6  
     2.7 -XEN_ROOT=../..
     2.8  linuxsparsetree = $(XEN_ROOT)/linux-2.6-xen-sparse
     2.9  
    2.10  .PHONY: all
    2.11 @@ -8,10 +9,15 @@ all:
    2.12  .PHONY: check
    2.13  check:
    2.14  
    2.15 -.PHONY: install
    2.16 -install:
    2.17 +.PHONY: install install-Linux install-SunOS
    2.18 +
    2.19 +install-Linux:
    2.20  	mkdir -p $(DESTDIR)/usr/include/xen/linux
    2.21  	install -m0644 $(linuxsparsetree)/include/xen/public/*.h $(DESTDIR)/usr/include/xen/linux
    2.22  
    2.23 +install-SunOS:
    2.24 +
    2.25 +install: install-$(XEN_OS)
    2.26 +
    2.27  .PHONY: clean
    2.28  clean:
     3.1 --- a/tools/xenstore/Makefile	Tue Oct 17 16:48:05 2006 +0100
     3.2 +++ b/tools/xenstore/Makefile	Tue Oct 17 16:51:09 2006 +0100
     3.3 @@ -29,7 +29,7 @@ XENSTORED_OBJS = xenstored_core.o xensto
     3.4  
     3.5  XENSTORED_Linux = xenstored_linux.o
     3.6  
     3.7 -XENSTORED_OBJS += $(XENSTORED_$(OS))
     3.8 +XENSTORED_OBJS += $(XENSTORED_$(XEN_OS))
     3.9  
    3.10  .PHONY: all
    3.11  all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls