John Levon
2006-Oct-17 12:58 UTC
[Xen-devel] [PATCH] A couple of small fixes to the Makefiles for the kernel tool headers.
# HG changeset patch # User john.levon@sun.com # Date 1161089722 25200 # Node ID a4cd2876f27755cb0d530e929a72bdd179566026 # Parent cd202b6c6866b52288d016cbef747ed1fbd9fbef A couple of small fixes to the Makefiles for the kernel tool headers. Signed-off-by: John Levon <john.levon@sun.com> diff --git a/tools/Rules.mk b/tools/Rules.mk --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -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 --git a/tools/guest-headers/Makefile b/tools/guest-headers/Makefile --- a/tools/guest-headers/Makefile +++ b/tools/guest-headers/Makefile @@ -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 --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel