[Xen-devel] [PATCH 04 of 30] tools: Drop use of $(INCLUDES)

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300718506 0
# Node ID fca900cf6e12e1347dc27552140591df20ff5af5
# Parent  28f04a6595064dca0062b972aa7ef69db8065c90
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@xxxxxxxxxx>

diff -r 28f04a659506 -r fca900cf6e12 tools/debugger/gdbsx/xg/Makefile
--- a/tools/debugger/gdbsx/xg/Makefile  Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/debugger/gdbsx/xg/Makefile  Mon Mar 21 14:41:46 2011 +0000
@@ -4,7 +4,7 @@ XG_HDRS := xg_public.h
 XG_HDRS := xg_public.h 
 XG_OBJS := xg_main.o 
 
-CFLAGS += $(INCLUDES) -I. -I../../../include 
+CFLAGS += -I. -I../../../include 
 
 
 .PHONY: all
diff -r 28f04a659506 -r fca900cf6e12 tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile     Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/flask/libflask/Makefile     Mon Mar 21 14:41:46 2011 +0000
@@ -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 -r 28f04a659506 -r fca900cf6e12 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/libxc/Makefile      Mon Mar 21 14:41:46 2011 +0000
@@ -68,7 +68,7 @@ OSDEP_SRCS-y                 += xenctrl_
 -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 -r 28f04a659506 -r fca900cf6e12 tools/misc/Makefile
--- a/tools/misc/Makefile       Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/misc/Makefile       Mon Mar 21 14:41:46 2011 +0000
@@ -1,12 +1,11 @@ XEN_ROOT=$(CURDIR)/../..
 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 -r 28f04a659506 -r fca900cf6e12 tools/tests/mce-test/tools/Makefile
--- a/tools/tests/mce-test/tools/Makefile       Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/tests/mce-test/tools/Makefile       Mon Mar 21 14:41:46 2011 +0000
@@ -1,12 +1,11 @@ XEN_ROOT=$(CURDIR)/../../../..
 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 -r 28f04a659506 -r fca900cf6e12 tools/tests/xen-access/Makefile
--- a/tools/tests/xen-access/Makefile   Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/tests/xen-access/Makefile   Mon Mar 21 14:41:46 2011 +0000
@@ -1,12 +1,11 @@ XEN_ROOT=$(CURDIR)/../../..
 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

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel