tools: remove unnecessary uses of -I.

It's not needed unless you are including headers in the current
directory _and_ you can't use "" instead of <> because the headers are
to be installed.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile
index 8a3cb6b635775b76437bd8a5aea0ab173075364e..be0c2ccc41bbe785b849231cd0d2d734bb1108c0 100644 (file)
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -4,7 +4,7 @@ include ../Rules.mk
 XG_HDRS := xg_public.h 
 XG_OBJS := xg_main.o 
 
-CFLAGS += -I. -I../../../include 
+CFLAGS += -I../../../include 
 
 
 .PHONY: all

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index a18a8c5c0f50029048155378604a7bcd6f6f1eda..a2bb394d6b877020528e6d8ebc0339f90a636911 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -26,7 +26,7 @@ SUBDIRS := acpi
 # The HVM loader is started in 32-bit mode at the address below:
 LOADADDR = 0x100000
 
-CFLAGS += $(CFLAGS_include) -I.
+CFLAGS += $(CFLAGS_include)
 
 SRCS  = hvmloader.c mp_tables.c util.c smbios.c 
 SRCS += 32bitbios_support.c smp.c cacheattr.c xenbus.c

diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index 96117248dfcfc2aca687c9e1e71f859a1d964cec..9aaf1bb8980c87364694a156d065feb0e1f177e6 100644 (file)
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -21,7 +21,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk
 C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c
 OBJS  = $(patsubst %.c,%.o,$(C_SRC))
 
-CFLAGS += -I. -I.. $(CFLAGS_include)
+CFLAGS += $(CFLAGS_include)
 
 vpath iasl $(PATH)
 all: acpi.a

diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index 31c0ddbaee6c88d2d0e07ae1d7bac77019954430..c8cfa78bd21e26ea2e073ab06e754e9155bbc0b3 100644 (file)
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -11,7 +11,6 @@ BASECFLAGS+= $(PROFILE)
 #BASECFLAGS+= -I$(XEN_ROOT)/tools
 BASECFLAGS+= $(CFLAGS_libxenctrl)
 BASECFLAGS+= -I$(LIBFLASK_ROOT)/include
-BASECFLAGS+= -I.
 
 CFLAGS  += $(BASECFLAGS)
 LDLIBS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT)

diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
index b53ab74b2f4a6d08e55fd5d7770800eb49ceff25..6298e46f55ce4650fee952997be218efa586b69d 100644 (file)
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -2,7 +2,7 @@ TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
-CFLAGS += -I../mmap -I./ -I$(XEN_ROOT)/tools/libxc
+CFLAGS += -I../mmap -I$(XEN_ROOT)/tools/libxc
 OCAMLINCLUDE += -I ../mmap -I ../uuid -I $(XEN_ROOT)/tools/libxc
 
 OBJS = xc

diff --git a/tools/security/Makefile b/tools/security/Makefile
index 605bc8864a4bd6e885c2248d297901f471f86664..f550ce2e565ac619f3cd8b62fecb7c2a4dacc544 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
 CFLAGS   += -fno-strict-aliasing
-CFLAGS   += -I. $(CFLAGS_libxenctrl)
+CFLAGS   += $(CFLAGS_libxenctrl)
 
 CPPFLAGS += -MMD -MF .$*.d
 PROG_DEPS = .*.d

diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk
index 0dc225f64bac316b8140dc1e8a5a650c27f16e8c..548cff02a9f0c78c3fc30dcbc31df5d9c0518e06 100644 (file)
--- a/tools/vtpm/Rules.mk
+++ b/tools/vtpm/Rules.mk
@@ -6,7 +6,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 #
 
 # General compiler flags
-CFLAGS   = -Werror -g3 -I.
+CFLAGS   = -Werror -g3
 
 # Generic project files
 HDRS   = $(wildcard *.h)

diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk
index 383056925672628605676d73324781edbb7ef253..651772ba6185547f7bd30701d6ff1fd9a5c6dbfb 100644 (file)
--- a/tools/vtpm_manager/Rules.mk
+++ b/tools/vtpm_manager/Rules.mk
@@ -6,7 +6,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 #
 
 # General compiler flags
-CFLAGS = -Werror -g3 -I.
+CFLAGS = -Werror -g3
 
 # Generic project files
 HDRS   = $(wildcard *.h)

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index ab886f53a70aeb3d938d557e2652e347435201dc..73d7184fa66896f171a72c69811f69e28640ffe4 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -2,7 +2,6 @@ XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -I $(XEN_XC)
-CFLAGS   += -I ./
 CFLAGS   += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore)
 LDLIBS  += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)