# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300718506 0
# Node ID e97432a5c7e8be2bbfbb535e2278aa48456e9459
# Parent 30a1f7d0aa1097fd2b3f39b03742865bcfc38731
tools: consistently use $(CFLAGS_xeninclude) instead of open coding.
Renamed from the slightly ambiguous CFLAGS_include.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/Rules.mk
--- a/tools/Rules.mk Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/Rules.mk Mon Mar 21 14:41:46 2011 +0000
@@ -15,17 +15,17 @@ XEN_LIBXENSTAT = $(XEN_ROOT)/tools/x
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
XEN_BLKTAP2 = $(XEN_ROOT)/tools/blktap2
-CFLAGS_include = -I$(XEN_INCLUDE)
+CFLAGS_xeninclude = -I$(XEN_INCLUDE)
-CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
+CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
LDLIBS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC)
-CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
+CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
LDLIBS_libxenguest = -L$(XEN_LIBXC) -lxenguest
SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC)
-CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
+CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
LDLIBS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE)
@@ -36,7 +36,7 @@ endif
endif
ifeq ($(LIBXL_BLKTAP),y)
-CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include
$(CFLAGS_include)
+CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include
$(CFLAGS_xeninclude)
LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
SHLIB_libblktapctl = -Wl,-rpath-link=$(XEN_BLKTAP2)/control
else
@@ -45,7 +45,7 @@ SHLIB_libblktapctl =
SHLIB_libblktapctl =
endif
-CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_include)
+CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_xeninclude)
LDLIBS_libxenlight = -L$(XEN_XENLIGHT) $(SHLIB_libxenctrl)
$(SHLIB_libxenstore) $(SHLIB_libblktapctl) -lxenlight
SHLIB_libxenlight = -Wl,-rpath-link=$(XEN_XENLIGHT)
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/blktap2/control/Makefile
--- a/tools/blktap2/control/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/blktap2/control/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -11,7 +11,8 @@ CFLAGS += -Werror
CFLAGS += -Werror
CFLAGS += -Wno-unused
CFLAGS += -I../include -I../drivers
-CFLAGS += -I$(XEN_INCLUDE) -I$(XEN_LIBXC)
+CFLAGS += $(CFLAGS_xeninclude)
+CFLAGS += -I$(XEN_LIBXC)
CFLAGS += -D_GNU_SOURCE
CFLAGS += -DTAPCTL
diff -r 30a1f7d0aa10 -r e97432a5c7e8 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 += -I../../../include
+CFLAGS += $(CFLAGS_xeninclude)
.PHONY: all
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/firmware/hvmloader/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -26,7 +26,7 @@ SUBDIRS := acpi
# The HVM loader is started in 32-bit mode at the address below:
LOADADDR = 0x100000
-CFLAGS += $(CFLAGS_include)
+CFLAGS += $(CFLAGS_xeninclude)
SRCS = hvmloader.c mp_tables.c util.c smbios.c
SRCS += 32bitbios_support.c smp.c cacheattr.c xenbus.c
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -21,7 +21,7 @@ C_SRC = build.c dsdt_anycpu.c dsdt_15cpu
C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c
OBJS = $(patsubst %.c,%.o,$(C_SRC))
-CFLAGS += $(CFLAGS_include)
+CFLAGS += $(CFLAGS_xeninclude)
vpath iasl $(PATH)
all: acpi.a
@@ -33,7 +33,7 @@ ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
# NB. awk invocation is a portable alternative to 'head -n -1'
dsdt_15cpu.c dsdt_anycpu.c: %.c: dsdt.asl mk_dsdt.c iasl
- $(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_include) -o mk_$* mk_dsdt.c
+ $(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o mk_$* mk_dsdt.c
awk 'NR > 1 {print s} {s=$$0}' $< >$*.asl
./mk_$* >>$*.asl
iasl -vs -p $* -tc $*.asl
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/firmware/rombios/32bit/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/firmware/Rules
TARGET = 32bitbios_flat.h
-CFLAGS += $(CFLAGS_include) -I..
+CFLAGS += $(CFLAGS_xeninclude) -I..
SUBDIRS = tcgbios
diff -r 30a1f7d0aa10 -r e97432a5c7e8
tools/firmware/rombios/32bit/tcgbios/Makefile
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile Mon Mar 21 14:41:46
2011 +0000
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile Mon Mar 21 14:41:46
2011 +0000
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/firmware/Rules
TARGET = tcgbiosext.o
-CFLAGS += $(CFLAGS_include) -I.. -I../..
+CFLAGS += $(CFLAGS_xeninclude) -I.. -I../..
.PHONY: all
all: $(TARGET)
diff -r 30a1f7d0aa10 -r e97432a5c7e8 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 += -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
+CFLAGS += -I./include -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/flask/utils/Makefile
--- a/tools/flask/utils/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/flask/utils/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -8,7 +8,6 @@ PROFILE=#-pg
PROFILE=#-pg
BASECFLAGS=-Wall -g -Werror
BASECFLAGS+= $(PROFILE)
-#BASECFLAGS+= -I$(XEN_ROOT)/tools
BASECFLAGS+= $(CFLAGS_libxenctrl)
BASECFLAGS+= -I$(LIBFLASK_ROOT)/include
diff -r 30a1f7d0aa10 -r e97432a5c7e8 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 += -I. -I../include
+CFLAGS += -I. $(CFLAGS_xeninclude)
# Needed for posix_fadvise64() in xc_linux.c
CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/memshr/Makefile
--- a/tools/memshr/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/memshr/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -5,7 +5,7 @@ LIBMEMSHR-BUILD := libmemshr.a
CFLAGS += -Werror
CFLAGS += -Wno-unused
-CFLAGS += -I../include
+CFLAGS += $(CFLAGS_xeninclude)
CFLAGS += $(CFLAGS_libxenctrl)
CFLAGS += -D_GNU_SOURCE
CFLAGS += -fPIC
diff -r 30a1f7d0aa10 -r e97432a5c7e8 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
@@ -4,7 +4,7 @@ CFLAGS += -Werror
CFLAGS += -Werror
CFLAGS += -I $(XEN_LIBXC)
-CFLAGS += -I $(XEN_INCLUDE)
+CFLAGS += $(CFLAGS_xeninclude)
HDRS = $(wildcard *.h)
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/ocaml/common.make
--- a/tools/ocaml/common.make Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/common.make Mon Mar 21 14:41:46 2011 +0000
@@ -9,7 +9,7 @@ OCAMLYACC ?= ocamlyacc
OCAMLYACC ?= ocamlyacc
CFLAGS += -fPIC -Werror
-CFLAGS += -I$(TOPLEVEL)/../include -I$(TOPLEVEL)/../libxc
-I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl
+CFLAGS += $(CFLAGS_xeninclude) -I$(TOPLEVEL)/../libxc
-I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl
CFLAGS-$(CONFIG_Linux) += -I/usr/lib64/ocaml -I/usr/lib/ocaml
CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
diff -r 30a1f7d0aa10 -r e97432a5c7e8 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
@@ -4,7 +4,7 @@ CFLAGS += -Werror
CFLAGS += -Werror
CFLAGS += -I $(XEN_LIBXC)
-CFLAGS += -I $(XEN_INCLUDE)
+CFLAGS += $(CFLAGS_xeninclude)
HDRS = $(wildcard *.h)
diff -r 30a1f7d0aa10 -r e97432a5c7e8 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
@@ -4,7 +4,7 @@ CFLAGS += -Werror
CFLAGS += -Werror
CFLAGS += -I $(XEN_LIBXC)
-CFLAGS += -I $(XEN_INCLUDE)
+CFLAGS += $(CFLAGS_xeninclude)
TARGETS-y :=
TARGETS-$(CONFIG_X86) += xen-access
diff -r 30a1f7d0aa10 -r e97432a5c7e8 tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/xenstat/libxenstat/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -36,7 +36,7 @@ SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,li
WARN_FLAGS=-Wall -Werror
-CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
+CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
LDLIBS-y = -lxenstore -lxenctrl
LDLIBS-$(CONFIG_SunOS) += -lkstat
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home