WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-unstable] tools: consistently use $(CFLAGS_xeninclu

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools: consistently use $(CFLAGS_xeninclude) instead of open coding.
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Tue, 22 Mar 2011 17:00:12 +0000
Delivery-date: Tue, 22 Mar 2011 10:03:08 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300730699 0
# Node ID c89629e41231a26620ba9966db8f01da6e52d65b
# Parent  1a07028a3aa68d7a397f912570828e5567ba32e2
tools: consistently use $(CFLAGS_xeninclude) instead of open coding.

Renamed from the slightly ambiguous CFLAGS_include.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 1a07028a3aa6 -r c89629e41231 tools/Rules.mk
--- a/tools/Rules.mk    Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/Rules.mk    Mon Mar 21 18:04:59 2011 +0000
@@ -15,17 +15,17 @@
 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
 
 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  =
 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 1a07028a3aa6 -r c89629e41231 tools/blktap2/control/Makefile
--- a/tools/blktap2/control/Makefile    Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/blktap2/control/Makefile    Mon Mar 21 18:04:59 2011 +0000
@@ -11,7 +11,8 @@
 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 1a07028a3aa6 -r c89629e41231 tools/debugger/gdbsx/xg/Makefile
--- a/tools/debugger/gdbsx/xg/Makefile  Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/debugger/gdbsx/xg/Makefile  Mon Mar 21 18:04:59 2011 +0000
@@ -4,7 +4,7 @@
 XG_HDRS := xg_public.h 
 XG_OBJS := xg_main.o 
 
-CFLAGS += -I../../../include 
+CFLAGS += $(CFLAGS_xeninclude)
 
 
 .PHONY: all
diff -r 1a07028a3aa6 -r c89629e41231 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/firmware/hvmloader/Makefile Mon Mar 21 18:04:59 2011 +0000
@@ -26,7 +26,7 @@
 # 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 1a07028a3aa6 -r c89629e41231 tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile    Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile    Mon Mar 21 18:04:59 2011 +0000
@@ -21,7 +21,7 @@
 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 @@
 
 # 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 1a07028a3aa6 -r c89629e41231 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile     Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/firmware/rombios/32bit/Makefile     Mon Mar 21 18:04:59 2011 +0000
@@ -3,7 +3,7 @@
 
 TARGET = 32bitbios_flat.h
 
-CFLAGS += $(CFLAGS_include) -I..
+CFLAGS += $(CFLAGS_xeninclude) -I..
 
 SUBDIRS = tcgbios
 
diff -r 1a07028a3aa6 -r c89629e41231 
tools/firmware/rombios/32bit/tcgbios/Makefile
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile     Mon Mar 21 18:00:17 
2011 +0000
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile     Mon Mar 21 18:04:59 
2011 +0000
@@ -3,7 +3,7 @@
 
 TARGET  = tcgbiosext.o
 
-CFLAGS += $(CFLAGS_include) -I.. -I../..
+CFLAGS += $(CFLAGS_xeninclude) -I.. -I../..
 
 .PHONY: all
 all: $(TARGET)
diff -r 1a07028a3aa6 -r c89629e41231 tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile     Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/flask/libflask/Makefile     Mon Mar 21 18:04:59 2011 +0000
@@ -11,7 +11,7 @@
 
 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 1a07028a3aa6 -r c89629e41231 tools/flask/utils/Makefile
--- a/tools/flask/utils/Makefile        Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/flask/utils/Makefile        Mon Mar 21 18:04:59 2011 +0000
@@ -8,7 +8,6 @@
 PROFILE=#-pg
 BASECFLAGS=-Wall -g -Werror
 BASECFLAGS+= $(PROFILE)
-#BASECFLAGS+= -I$(XEN_ROOT)/tools
 BASECFLAGS+= $(CFLAGS_libxenctrl)
 BASECFLAGS+= -I$(LIBFLASK_ROOT)/include
 
diff -r 1a07028a3aa6 -r c89629e41231 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/libxc/Makefile      Mon Mar 21 18:04:59 2011 +0000
@@ -68,7 +68,7 @@
 -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 1a07028a3aa6 -r c89629e41231 tools/memshr/Makefile
--- a/tools/memshr/Makefile     Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/memshr/Makefile     Mon Mar 21 18:04:59 2011 +0000
@@ -5,7 +5,7 @@
 
 CFLAGS          += -Werror
 CFLAGS          += -Wno-unused
-CFLAGS          += -I../include
+CFLAGS          += $(CFLAGS_xeninclude)
 CFLAGS          += $(CFLAGS_libxenctrl)
 CFLAGS          += -D_GNU_SOURCE
 CFLAGS          += -fPIC
diff -r 1a07028a3aa6 -r c89629e41231 tools/misc/Makefile
--- a/tools/misc/Makefile       Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/misc/Makefile       Mon Mar 21 18:04:59 2011 +0000
@@ -4,7 +4,7 @@
 CFLAGS += -Werror
 
 CFLAGS += -I $(XEN_LIBXC)
-CFLAGS += -I $(XEN_INCLUDE)
+CFLAGS += $(CFLAGS_xeninclude)
 
 HDRS     = $(wildcard *.h)
 
diff -r 1a07028a3aa6 -r c89629e41231 tools/ocaml/common.make
--- a/tools/ocaml/common.make   Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/ocaml/common.make   Mon Mar 21 18:04:59 2011 +0000
@@ -9,7 +9,7 @@
 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 1a07028a3aa6 -r c89629e41231 tools/tests/mce-test/tools/Makefile
--- a/tools/tests/mce-test/tools/Makefile       Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/tests/mce-test/tools/Makefile       Mon Mar 21 18:04:59 2011 +0000
@@ -4,7 +4,7 @@
 CFLAGS += -Werror
 
 CFLAGS += -I $(XEN_LIBXC)
-CFLAGS += -I $(XEN_INCLUDE)
+CFLAGS += $(CFLAGS_xeninclude) 
 
 HDRS     = $(wildcard *.h)
 
diff -r 1a07028a3aa6 -r c89629e41231 tools/tests/xen-access/Makefile
--- a/tools/tests/xen-access/Makefile   Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/tests/xen-access/Makefile   Mon Mar 21 18:04:59 2011 +0000
@@ -4,7 +4,7 @@
 CFLAGS += -Werror
 
 CFLAGS += -I $(XEN_LIBXC)
-CFLAGS += -I $(XEN_INCLUDE)
+CFLAGS += $(CFLAGS_xeninclude)
 
 TARGETS-y := 
 TARGETS-$(CONFIG_X86) += xen-access
diff -r 1a07028a3aa6 -r c89629e41231 tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Mon Mar 21 18:00:17 2011 +0000
+++ b/tools/xenstat/libxenstat/Makefile Mon Mar 21 18:04:59 2011 +0000
@@ -36,7 +36,7 @@
 
 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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools: consistently use $(CFLAGS_xeninclude) instead of open coding., Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenstore) instead of open coding., Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenctrl) instead of open coding., Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenstore) instead of open coding., Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenctrl) instead of open coding., Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy