diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:05:49 +0000 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:05:49 +0000 |
commit | ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4 (patch) | |
tree | 0ab1f5bd7b6d51a2ff3b6ad80b3ccf15b8e74181 /tools | |
parent | 3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c (diff) | |
download | xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.gz xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.bz2 xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.zip |
tools: consistently use $({CFLAGS,LDLIBS}_libxenctrl) instead of open coding.
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')
-rw-r--r-- | tools/blktap2/control/Makefile | 2 | ||||
-rw-r--r-- | tools/blktap2/drivers/Makefile | 2 | ||||
-rw-r--r-- | tools/flask/libflask/Makefile | 6 | ||||
-rw-r--r-- | tools/flask/utils/Makefile | 6 | ||||
-rw-r--r-- | tools/libxc/Makefile | 4 | ||||
-rw-r--r-- | tools/libxl/Makefile | 2 | ||||
-rw-r--r-- | tools/misc/Makefile | 2 | ||||
-rw-r--r-- | tools/ocaml/common.make | 2 | ||||
-rw-r--r-- | tools/ocaml/libs/xc/Makefile | 6 | ||||
-rw-r--r-- | tools/tests/mce-test/tools/Makefile | 2 | ||||
-rw-r--r-- | tools/tests/xen-access/Makefile | 2 | ||||
-rw-r--r-- | tools/xenstat/libxenstat/Makefile | 6 |
12 files changed, 19 insertions, 23 deletions
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index e2d76a524f..53384ac567 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -12,7 +12,7 @@ CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -I../include -I../drivers CFLAGS += $(CFLAGS_xeninclude) -CFLAGS += -I$(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -D_GNU_SOURCE CFLAGS += -DTAPCTL diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 54b2a64328..472dd62d9d 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -42,7 +42,7 @@ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a -tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR) -I$(XEN_LIBXC) +tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR) ifeq ($(VHD_STATIC),y) td-util: CFLAGS += -static diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile index 92e836a537..dcb5592807 100644 --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -4,14 +4,12 @@ MINOR = 0 XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -XEN_LIBXC = $(XEN_ROOT)/tools/libxc - SRCS := SRCS += flask_op.c CFLAGS += -Werror CFLAGS += -fno-strict-aliasing -CFLAGS += -I./include -I$(XEN_LIBXC) $(CFLAGS_xeninclude) +CFLAGS += -I./include $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d @@ -58,6 +56,6 @@ libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR) ln -sf $< $@ libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxenctrl) -include $(DEPS) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 86c04294f0..ff3799a00e 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,8 +1,6 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -XEN_LIBXC = $(XEN_ROOT)/tools/libxc -LIBXC_ROOT = $(XEN_ROOT)/tools/libxc LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask PROFILE=#-pg @@ -12,7 +10,7 @@ BASECFLAGS+= $(CFLAGS_libxenctrl) BASECFLAGS+= -I$(LIBFLASK_ROOT)/include CFLAGS += $(BASECFLAGS) -LDLIBS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT) +LDLIBS += $(PROFILE) TESTDIR = testsuite/tmp TESTFLAGS= -DTESTING TESTENV = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR) @@ -25,7 +23,7 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) all: $(CLIENTS) $(CLIENTS): flask-%: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -lflask $(LDLIBS_libxenctrl) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L$(LIBFLASK_ROOT) -lflask $(LDLIBS_libxenctrl) -o $@ .PHONY: clean clean: diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 6f07c9d846..232d9a3760 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -193,10 +193,10 @@ xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l) libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -L. -lxenctrl $(PTHREAD_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so - $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -L. -lxenctrl + $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) -include $(DEPS) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index edacfd4101..ffcbf6c4ed 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -87,7 +87,7 @@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) - $(CC) $(CFLAGS) -Wl,-rpath-link -Wl,$(XEN_ROOT)/tools/libxc $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ diff --git a/tools/misc/Makefile b/tools/misc/Makefile index c4412c50cd..cbd74cd03e 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -CFLAGS += -I $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_xeninclude) HDRS = $(wildcard *.h) diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index 4f5130cc4e..1dd059188e 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -9,7 +9,7 @@ OCAMLLEX ?= ocamllex OCAMLYACC ?= ocamlyacc CFLAGS += -fPIC -Werror -CFLAGS += $(CFLAGS_xeninclude) -I$(TOPLEVEL)/../libxc -I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl +CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) -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 --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile index 6298e46f55..387826aa56 100644 --- a/tools/ocaml/libs/xc/Makefile +++ b/tools/ocaml/libs/xc/Makefile @@ -2,14 +2,14 @@ TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make -CFLAGS += -I../mmap -I$(XEN_ROOT)/tools/libxc -OCAMLINCLUDE += -I ../mmap -I ../uuid -I $(XEN_ROOT)/tools/libxc +CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +OCAMLINCLUDE += -I ../mmap -I ../uuid OBJS = xc INTF = xc.cmi LIBS = xc.cma xc.cmxa -LIBS_xc = -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest +LIBS_xc = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) xc_OBJS = $(OBJS) xc_C_OBJS = xc_stubs diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index d613730922..e8a98e0cd2 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -CFLAGS += -I $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_xeninclude) HDRS = $(wildcard *.h) diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile index 4c9f87a1c4..63548ccb6a 100644 --- a/tools/tests/xen-access/Makefile +++ b/tools/tests/xen-access/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -CFLAGS += -I $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_xeninclude) TARGETS-y := diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 45466cd713..76908e421a 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -36,9 +36,9 @@ SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) WARN_FLAGS=-Wall -Werror -CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) -LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ -LDLIBS-y = -lxenstore -lxenctrl +CFLAGS+=-Isrc $(CFLAGS_libxenctrl) -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) +LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ +LDLIBS-y = -lxenstore $(LDLIBS_libxenctrl) LDLIBS-$(CONFIG_SunOS) += -lkstat ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so |