aboutsummaryrefslogtreecommitdiffstats
path: root/tools/Rules.mk
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-03-21 18:04:59 +0000
committerIan Campbell <ian.campbell@citrix.com>2011-03-21 18:04:59 +0000
commit3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c (patch)
treebc2f895a4a9fdcbe4e73297521bcbd7db606a439 /tools/Rules.mk
parentb936e4c61784d09cccb50ac003f968ab87ebf58e (diff)
downloadxen-3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c.tar.gz
xen-3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c.tar.bz2
xen-3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c.zip
tools: consistently use $(CFLAGS_xeninclude) instead of open coding.
Renamed from the slightly ambiguous CFLAGS_include. 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>
Diffstat (limited to 'tools/Rules.mk')
-rw-r--r--tools/Rules.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk
index be9a847d4c..bd8a94327e 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -15,17 +15,17 @@ XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
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 @@ LIBXL_BLKTAP = n
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 @@ LDLIBS_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)