[PATCH] Fix non-installed compilation

[PATCH] Fix non-installed compilation

[Samuel Thibault]

Some headers got moved from tools/libxc/ to tools/include/
This is needed to compile on machines which don't have Xen installed
yet.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff -r a763b70405fa tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile	Mon Jan 28 13:26:30 2008 +0000
+++ b/tools/firmware/hvmloader/Makefile	Mon Jan 28 18:23:09 2008 +0000
@@ -20,7 +20,7 @@
 
 override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
-CFLAGS := -I$(XEN_ROOT)/tools/libxc -I.
+CFLAGS := -I$(XEN_ROOT)/tools/include -I$(XEN_ROOT)/tools/libxc -I.
 include $(XEN_ROOT)/tools/Rules.mk
 
 # The HVM loader is started in 32-bit mode at the address below:
diff -r a763b70405fa tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile	Mon Jan 28 13:26:30 2008 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile	Mon Jan 28 18:23:09 2008 +0000
@@ -17,7 +17,7 @@
 
 override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../../..
-CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/libxc
+CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/include
 include $(XEN_ROOT)/tools/Rules.mk
 
 C_SRC = build.c dsdt.c static_tables.c
diff -r a763b70405fa tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile	Mon Jan 28 13:26:30 2008 +0000
+++ b/tools/firmware/vmxassist/Makefile	Mon Jan 28 18:23:09 2008 +0000
@@ -29,7 +29,7 @@ TEXTADDR=0x000D0000
 TEXTADDR=0x000D0000
 
 DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
-XENINC=-I$(XEN_ROOT)/tools/libxc
+XENINC=-I$(XEN_ROOT)/tools/include
 
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call cc-option,$(CC),-nopie,)

Re: [PATCH] Fix non-installed compilation

[Keir Fraser]

Should be fixed by c/s 16923.

 -- Keir


On 28/1/08 18:26, "Samuel Thibault" <samuel.thibault@eu.citrix.com> wrote:

> Some headers got moved from tools/libxc/ to tools/include/
> This is needed to compile on machines which don't have Xen installed
> yet.
> 
> Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
> 
> diff -r a763b70405fa tools/firmware/hvmloader/Makefile
> --- a/tools/firmware/hvmloader/Makefile Mon Jan 28 13:26:30 2008 +0000
> +++ b/tools/firmware/hvmloader/Makefile Mon Jan 28 18:23:09 2008 +0000
> @@ -20,7 +20,7 @@
>  
>  override XEN_TARGET_ARCH = x86_32
>  XEN_ROOT = ../../..
> -CFLAGS := -I$(XEN_ROOT)/tools/libxc -I.
> +CFLAGS := -I$(XEN_ROOT)/tools/include -I$(XEN_ROOT)/tools/libxc -I.
>  include $(XEN_ROOT)/tools/Rules.mk
>  
>  # The HVM loader is started in 32-bit mode at the address below:
> diff -r a763b70405fa tools/firmware/hvmloader/acpi/Makefile
> --- a/tools/firmware/hvmloader/acpi/Makefile Mon Jan 28 13:26:30 2008 +0000
> +++ b/tools/firmware/hvmloader/acpi/Makefile Mon Jan 28 18:23:09 2008 +0000
> @@ -17,7 +17,7 @@
>  
>  override XEN_TARGET_ARCH = x86_32
>  XEN_ROOT = ../../../..
> -CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/libxc
> +CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/include
>  include $(XEN_ROOT)/tools/Rules.mk
>  
>  C_SRC = build.c dsdt.c static_tables.c
> diff -r a763b70405fa tools/firmware/vmxassist/Makefile
> --- a/tools/firmware/vmxassist/Makefile Mon Jan 28 13:26:30 2008 +0000
> +++ b/tools/firmware/vmxassist/Makefile Mon Jan 28 18:23:09 2008 +0000
> @@ -29,7 +29,7 @@ TEXTADDR=0x000D0000
>  TEXTADDR=0x000D0000
>  
>  DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
> -XENINC=-I$(XEN_ROOT)/tools/libxc
> +XENINC=-I$(XEN_ROOT)/tools/include
>  
>  # Disable PIE/SSP if GCC supports them. They can break us.
>  CFLAGS  += $(call cc-option,$(CC),-nopie,)
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel