1.1 --- a/tools/firmware/hvmloader/Makefile	Mon Jan 28 11:28:55 2008 +0000
     1.2 +++ b/tools/firmware/hvmloader/Makefile	Mon Jan 28 12:03:02 2008 +0000
     1.3 @@ -20,7 +20,7 @@
     1.4  
     1.5  override XEN_TARGET_ARCH = x86_32
     1.6  XEN_ROOT = ../../..
     1.7 -CFLAGS := -I$(XEN_ROOT)/tools/libxc -I.
     1.8 +CFLAGS :=
     1.9  include $(XEN_ROOT)/tools/Rules.mk
    1.10  
    1.11  # The HVM loader is started in 32-bit mode at the address below:
    1.12 @@ -32,6 +32,7 @@ CFLAGS  += $(call cc-option,$(CC),-fno-s
    1.13  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
    1.14  
    1.15  CFLAGS  += -fno-builtin -O2 -msoft-float
    1.16 +CFLAGS  += $(CFLAGS_include) -I.
    1.17  
    1.18  SRCS = hvmloader.c mp_tables.c util.c smbios.c 32bitbios_support.c
    1.19  OBJS = $(patsubst %.c,%.o,$(SRCS))

     2.1 --- a/tools/firmware/hvmloader/acpi/Makefile	Mon Jan 28 11:28:55 2008 +0000
     2.2 +++ b/tools/firmware/hvmloader/acpi/Makefile	Mon Jan 28 12:03:02 2008 +0000
     2.3 @@ -17,7 +17,7 @@
     2.4  
     2.5  override XEN_TARGET_ARCH = x86_32
     2.6  XEN_ROOT = ../../../..
     2.7 -CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/libxc
     2.8 +CFLAGS :=
     2.9  include $(XEN_ROOT)/tools/Rules.mk
    2.10  
    2.11  C_SRC = build.c dsdt.c static_tables.c
    2.12 @@ -33,6 +33,7 @@ CFLAGS  += $(call cc-option,$(CC),-fno-s
    2.13  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
    2.14  
    2.15  CFLAGS  += -fno-builtin -O2 -msoft-float
    2.16 +CFLAGS  += -I. -I.. $(CFLAGS_include)
    2.17  
    2.18  vpath iasl $(PATH)
    2.19  all: acpi.a

     3.1 --- a/tools/firmware/hvmloader/util.c	Mon Jan 28 11:28:55 2008 +0000
     3.2 +++ b/tools/firmware/hvmloader/util.c	Mon Jan 28 12:03:02 2008 +0000
     3.3 @@ -22,7 +22,6 @@
     3.4  #include "config.h"
     3.5  #include "e820.h"
     3.6  #include <stdint.h>
     3.7 -#include <xenctrl.h>
     3.8  #include <xen/hvm/hvm_info_table.h>
     3.9  
    3.10  void outb(uint16_t addr, uint8_t val)

     4.1 --- a/tools/firmware/vmxassist/Makefile	Mon Jan 28 11:28:55 2008 +0000
     4.2 +++ b/tools/firmware/vmxassist/Makefile	Mon Jan 28 12:03:02 2008 +0000
     4.3 @@ -23,13 +23,13 @@ CFLAGS :=
     4.4  
     4.5  override XEN_TARGET_ARCH = x86_32
     4.6  XEN_ROOT = ../../..
     4.7 -include $(XEN_ROOT)/Config.mk
     4.8 +include $(XEN_ROOT)/tools/Rules.mk
     4.9  
    4.10  # The emulator code lives in ROM space
    4.11  TEXTADDR=0x000D0000
    4.12  
    4.13  DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
    4.14 -XENINC=-I$(XEN_ROOT)/tools/libxc
    4.15 +XENINC=$(CFLAGS_include)
    4.16  
    4.17  # Disable PIE/SSP if GCC supports them. They can break us.
    4.18  CFLAGS  += $(call cc-option,$(CC),-nopie,)