tools: Drop use of $(INCLUDES)

Several places include it in CFLAGS even though it is never defined. A
few others use it as nothing more than a gathering point for
CFLAGS. Get rid of it.

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 2d0256529059a2be031bd06524e7cb5a623dc852..8a3cb6b635775b76437bd8a5aea0ab173075364e 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 += $(INCLUDES) -I. -I../../../include 
+CFLAGS += -I. -I../../../include 
 
 
 .PHONY: all

diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index e1f5703762076337e6df12277dd8f80f48922b60..32cb588d3f0ec1a703c5a37543ff0eb3ebc15e40 100644 (file)
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -11,7 +11,7 @@ SRCS       += flask_op.c
 
 CFLAGS   += -Werror
 CFLAGS   += -fno-strict-aliasing
-CFLAGS   += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
+CFLAGS   += -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
 
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 07156118adf55a296f8977fc7c43cf6ec36d8f36..37cc93596f35a95425d79d717c8a5aa248ba864d 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -68,7 +68,7 @@ OSDEP_SRCS-y                 += xenctrl_osdep_ENOSYS.c
 -include $(XEN_TARGET_ARCH)/Makefile
 
 CFLAGS   += -Werror -Wmissing-prototypes
-CFLAGS   += $(INCLUDES) -I. -I../include
+CFLAGS   += -I. -I../include
 
 # Needed for posix_fadvise64() in xc_linux.c
 CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 549ee7d3d55ccada46d9adbd2a10a6d12541b67c..c9ccae22b036b0ff27948664cd93693dc83a0130 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -1,12 +1,11 @@
 XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Werror
+CFLAGS += -Werror
 
-INCLUDES += -I $(XEN_XC)
-INCLUDES += -I $(XEN_LIBXC)
-INCLUDES += -I $(XEN_INCLUDE)
-CFLAGS   += $(INCLUDES)
+CFLAGS += -I $(XEN_XC)
+CFLAGS += -I $(XEN_LIBXC)
+CFLAGS += -I $(XEN_INCLUDE)
 
 HDRS     = $(wildcard *.h)
 

diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile
index 43e39ad1f40104bd6133afc4886c602f0083b142..dc84343e4b3c7e070eb6648d66fbab36d0fd075e 100644 (file)
--- a/tools/tests/mce-test/tools/Makefile
+++ b/tools/tests/mce-test/tools/Makefile
@@ -1,12 +1,11 @@
 XEN_ROOT=$(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Werror
+CFLAGS += -Werror
 
-INCLUDES += -I $(XEN_XC)
-INCLUDES += -I $(XEN_LIBXC)
-INCLUDES += -I $(XEN_INCLUDE)
-CFLAGS   += $(INCLUDES)
+CFLAGS += -I $(XEN_XC)
+CFLAGS += -I $(XEN_LIBXC)
+CFLAGS += -I $(XEN_INCLUDE)
 
 HDRS     = $(wildcard *.h)
 

diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile
index aed89122852b5361599dda0c9e012aff64fb138c..37a36b1c8bdbf1571373db390deb1ec9a15d5311 100644 (file)
--- a/tools/tests/xen-access/Makefile
+++ b/tools/tests/xen-access/Makefile
@@ -1,12 +1,11 @@
 XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Werror
+CFLAGS += -Werror
 
-INCLUDES += -I $(XEN_XC)
-INCLUDES += -I $(XEN_LIBXC)
-INCLUDES += -I $(XEN_INCLUDE)
-CFLAGS   += $(INCLUDES)
+CFLAGS += -I $(XEN_XC)
+CFLAGS += -I $(XEN_LIBXC)
+CFLAGS += -I $(XEN_INCLUDE)
 
 TARGETS-y := 
 TARGETS-$(CONFIG_X86) += xen-access