mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
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>
This commit is contained in:
Ian Campbell committed
1 parent
b936e4c617
commit
3531dea6fd
16 files changed
+22
-22
No files matched your search
+6
-6
@@ -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)
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ IBIN = tap-ctl
|
||||
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
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ include ../Rules.mk
|
||||
XG_HDRS := xg_public.h
|
||||
XG_OBJS := xg_main.o
|
||||
|
||||
CFLAGS += -I../../../include
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
|
||||
|
||||
.PHONY: all
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -21,7 +21,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk
|
||||
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
|
||||
|
||||
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk
|
||||
|
||||
TARGET = 32bitbios_flat.h
|
||||
|
||||
CFLAGS += $(CFLAGS_include) -I..
|
||||
CFLAGS += $(CFLAGS_xeninclude) -I..
|
||||
|
||||
SUBDIRS = tcgbios
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk
|
||||
|
||||
TARGET = tcgbiosext.o
|
||||
|
||||
CFLAGS += $(CFLAGS_include) -I.. -I../..
|
||||
CFLAGS += $(CFLAGS_xeninclude) -I.. -I../..
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -8,7 +8,6 @@ LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
|
||||
PROFILE=#-pg
|
||||
BASECFLAGS=-Wall -g -Werror
|
||||
BASECFLAGS+= $(PROFILE)
|
||||
#BASECFLAGS+= -I$(XEN_ROOT)/tools
|
||||
BASECFLAGS+= $(CFLAGS_libxenctrl)
|
||||
BASECFLAGS+= -I$(LIBFLASK_ROOT)/include
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ OSDEP_SRCS-y += xenctrl_osdep_ENOSYS.c
|
||||
-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
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
|
||||
CFLAGS += -Werror
|
||||
|
||||
CFLAGS += -I $(XEN_LIBXC)
|
||||
CFLAGS += -I $(XEN_INCLUDE)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
|
||||
HDRS = $(wildcard *.h)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ OCAMLLEX ?= ocamllex
|
||||
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
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
|
||||
CFLAGS += -Werror
|
||||
|
||||
CFLAGS += -I $(XEN_LIBXC)
|
||||
CFLAGS += -I $(XEN_INCLUDE)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
|
||||
HDRS = $(wildcard *.h)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
|
||||
CFLAGS += -Werror
|
||||
|
||||
CFLAGS += -I $(XEN_LIBXC)
|
||||
CFLAGS += -I $(XEN_INCLUDE)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
|
||||
TARGETS-y :=
|
||||
TARGETS-$(CONFIG_X86) += xen-access
|
||||
|
||||
@@ -36,7 +36,7 @@ SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
|
||||
|
||||
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
|
||||
|
||||