diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 17:45:50 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 17:45:50 +0000 |
| commit | 31353077608ff9fed9e0ab184f95deddce2231a3 (patch) | |
| tree | f465f410f24ebfcc3db8ba1b3b2b708d17ef67b3 | |
| parent | c08957dc4e8397fc0b8f15c79e88e431eb8fabe7 (diff) | |
| download | xen-31353077608ff9fed9e0ab184f95deddce2231a3.tar.gz xen-31353077608ff9fed9e0ab184f95deddce2231a3.tar.bz2 xen-31353077608ff9fed9e0ab184f95deddce2231a3.zip | |
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>
| -rw-r--r-- | tools/debugger/gdbsx/xg/Makefile | 2 | ||||
| -rw-r--r-- | tools/flask/libflask/Makefile | 2 | ||||
| -rw-r--r-- | tools/libxc/Makefile | 2 | ||||
| -rw-r--r-- | tools/misc/Makefile | 9 | ||||
| -rw-r--r-- | tools/tests/mce-test/tools/Makefile | 9 | ||||
| -rw-r--r-- | tools/tests/xen-access/Makefile | 9 |
6 files changed, 15 insertions, 18 deletions
diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile index 2d02565290..8a3cb6b635 100644 --- 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 e1f5703762..32cb588d3f 100644 --- 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 07156118ad..37cc93596f 100644 --- 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 549ee7d3d5..c9ccae22b0 100644 --- 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 43e39ad1f4..dc84343e4b 100644 --- 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 aed8912285..37a36b1c8b 100644 --- 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 |