diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-27 12:57:14 +0000 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-27 12:57:14 +0000 |
commit | ad44c013ec383964e20248f73eeece9f3730c3ff (patch) | |
tree | ba2c1d701bfa7e7eb81e4bd098351a784c09357c /tools | |
parent | 9f602ddea9e12233d43f2fe2021d33d40c87455a (diff) | |
download | xen-ad44c013ec383964e20248f73eeece9f3730c3ff.tar.gz xen-ad44c013ec383964e20248f73eeece9f3730c3ff.tar.bz2 xen-ad44c013ec383964e20248f73eeece9f3730c3ff.zip |
Define CFLAGS and LDFLAGS for libxenctrl.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Rules.mk | 5 | ||||
-rw-r--r-- | tools/blktap/drivers/Makefile | 5 | ||||
-rw-r--r-- | tools/console/Makefile | 12 | ||||
-rw-r--r-- | tools/debugger/xenitp/Makefile | 6 | ||||
-rw-r--r-- | tools/flask/loadpolicy/Makefile | 5 | ||||
-rw-r--r-- | tools/fs-back/Makefile | 6 | ||||
-rw-r--r-- | tools/misc/Makefile | 2 | ||||
-rw-r--r-- | tools/security/Makefile | 4 | ||||
-rw-r--r-- | tools/xcutils/Makefile | 4 | ||||
-rw-r--r-- | tools/xenmon/Makefile | 9 | ||||
-rw-r--r-- | tools/xenstore/Makefile | 7 | ||||
-rw-r--r-- | tools/xentrace/Makefile | 9 |
12 files changed, 37 insertions, 37 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk index 007a844af9..d5af8a9dc5 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -11,6 +11,11 @@ XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src +CFLAGS_include = -I$(XEN_INCLUDE) + +CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include) +LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl + X11_LDPATH = -L/usr/X11R6/$(LIBDIR) CFLAGS += -D__XEN_TOOLS__ diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 5376b6904b..6df71cc299 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -9,7 +9,7 @@ LIBAIO_DIR = ../../libaio/src CFLAGS += -Werror CFLAGS += -Wno-unused -CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR) +CFLAGS += $(CFLAGS_libxenctrl) -I $(LIBAIO_DIR) CFLAGS += $(INCLUDES) -I. -I../../xenstore CFLAGS += -D_GNU_SOURCE @@ -18,7 +18,6 @@ CFLAGS += -Wp,-MD,.$(@F).d DEPS = .*.d LIBS := -L. -L.. -L../lib -LIBS += -L$(XEN_LIBXC) LIBS += -Wl,-rpath-link,$(XEN_XENSTORE) LIBS_IMG := $(LIBAIO_DIR)/libaio.a -lcrypto -lpthread -lz @@ -35,7 +34,7 @@ BLK-OBJS-$(CONFIG_Linux) += blk_linux.c all: $(IBIN) qcow-util blktapctrl: blktapctrl.c - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lblktap -lxenctrl + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lblktap $(LDFLAGS_libxenctrl) tapdisk: tapdisk.c $(BLK-OBJS-y) tapdisk.c $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_IMG) diff --git a/tools/console/Makefile b/tools/console/Makefile index 1e60bd2ee0..8ed172487c 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -4,9 +4,9 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -CFLAGS += -I $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -I $(XEN_XENSTORE) -CFLAGS += -I $(XEN_INCLUDE) +LDFLAGS += $(LDFLAGS_libxenctrl) BIN = xenconsoled xenconsole @@ -19,12 +19,12 @@ clean: $(RM) client/*.o daemon/*.o xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ - $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \ + $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ - $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \ + $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore .PHONY: install install: $(BIN) diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile index 3b1e61b435..eca35a37e7 100644 --- a/tools/debugger/xenitp/Makefile +++ b/tools/debugger/xenitp/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk #CFLAGS += -Werror -g -O0 -CFLAGS += -I $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) @@ -40,8 +40,8 @@ clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) %: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS_libxenctrl) XENITP_OBJS=xenitp.o ia64-dis.o ia64-opc.o cpu-ia64-opc.o xenitp: $(XENITP_OBJS) - $(CC) $(CFLAGS) -o $@ $(XENITP_OBJS) -L$(XEN_LIBXC) -lxenctrl + $(CC) $(CFLAGS) -o $@ $(XENITP_OBJS) $(LDFLAGS_libxenctrl) diff --git a/tools/flask/loadpolicy/Makefile b/tools/flask/loadpolicy/Makefile index 9845222759..7c38525ba8 100644 --- a/tools/flask/loadpolicy/Makefile +++ b/tools/flask/loadpolicy/Makefile @@ -12,10 +12,9 @@ BASECFLAGS += -Wp,-MD,.$(@F).d PROG_DEP = .*.d BASECFLAGS+= $(PROFILE) #BASECFLAGS+= -I$(XEN_ROOT)/tools -BASECFLAGS+= -I$(LIBXC_ROOT) +BASECFLAGS+= $(CFLAGS_libxenctrl) BASECFLAGS+= -I$(LIBFLASK_ROOT)/include BASECFLAGS+= -I. -BASECFLAGS+= -I$(XEN_INCLUDE) CFLAGS += $(BASECFLAGS) LDFLAGS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT) @@ -31,7 +30,7 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) all: $(CLIENTS) $(CLIENTS): flask-%: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask -lxenctrl -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask $(LDFLAGS_libxenctrl) -o $@ $(CLIENTS_OBJS): $(CLIENTS_SRCS) $(COMPILE.c) -o $@ $< diff --git a/tools/fs-back/Makefile b/tools/fs-back/Makefile index 866defb721..ca0453ca99 100644 --- a/tools/fs-back/Makefile +++ b/tools/fs-back/Makefile @@ -8,7 +8,7 @@ IBIN = fs-backend CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing -CFLAGS += -I $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(INCLUDES) -I. -I../xenstore CFLAGS += -D_GNU_SOURCE @@ -17,8 +17,8 @@ CFLAGS += -Wp,-MD,.$(@F).d DEPS = .*.d LIBS := -L. -L.. -L../lib -LIBS += -L$(XEN_LIBXC) -LIBS += -lxenctrl -lpthread -lrt +LIBS += $(LDFLAGS_libxenctrl) +LIBS += -lpthread -lrt LIBS += -L$(XEN_XENSTORE) -lxenstore OBJS := fs-xenbus.o fs-ops.o diff --git a/tools/misc/Makefile b/tools/misc/Makefile index e0b38ee20e..42968d8f57 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -45,4 +45,4 @@ clean: $(CC) -c $(CFLAGS) -o $@ $< xenperf: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) diff --git a/tools/security/Makefile b/tools/security/Makefile index d33cf6fc55..81da019485 100644 --- a/tools/security/Makefile +++ b/tools/security/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += -fno-strict-aliasing -CFLAGS += -I. -I $(XEN_LIBXC) +CFLAGS += -I. $(CFLAGS_libxenctrl) CPPFLAGS += -MMD -MF .$*.d PROG_DEPS = .*.d @@ -82,7 +82,7 @@ build: $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS) chmod 700 $(ACM_SCRIPTS) xensec_tool: $(OBJS_TOOL) - $(CC) -g $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ -L$(XEN_LIBXC) -lxenctrl + $(CC) -g $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ $(LDFLAGS_libxenctrl) xensec_gen: xensec_gen.py cp -f $^ $@ diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index b7714c1f38..24fa8849f8 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,7 +11,7 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk -INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE) +INCLUDES += $(CFLAGS_libxenctrl) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE) CFLAGS += -Werror CFLAGS += $(INCLUDES) @@ -22,7 +22,7 @@ PROG_DEP = .*.d PROGRAMS = xc_restore xc_save readnotes -LDLIBS = -L$(XEN_LIBXC) -L$(XEN_XENSTORE) -lxenguest -lxenctrl -lxenstore +LDLIBS = $(LDFLAGS_libxenctrl) -L$(XEN_XENSTORE) -lxenguest -lxenstore .PHONY: all all: build diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 886d5b2d02..1a53d65d22 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -15,9 +15,8 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += -I $(XEN_XC) -CFLAGS += -I $(XEN_LIBXC) -CFLAGS += -I $(XEN_INCLUDE) -LDFLAGS += -L $(XEN_LIBXC) +CFLAGS += $(CFLAGS_libxenctrl) +LDFLAGS += $(LDFLAGS_libxenctrl) BIN = xentrace_setmask xenbaked SCRIPTS = xenmon.py @@ -41,6 +40,6 @@ clean: %: %.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $< + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< xentrace_%: %.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $< + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 3b31e9a4b1..3d6700c0b8 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -11,12 +11,11 @@ BASECFLAGS=-Werror BASECFLAGS += -Wp,-MD,.$(@F).d PROG_DEP = .*.d BASECFLAGS+= $(PROFILE) -BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc +BASECFLAGS+= $(CFLAGS_libxenctrl) BASECFLAGS+= -I. -BASECFLAGS+= -I$(XEN_INCLUDE) CFLAGS += $(BASECFLAGS) -LDFLAGS += $(PROFILE) -L$(XEN_LIBXC) +LDFLAGS += $(PROFILE) CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS += xenstore-write @@ -34,7 +33,7 @@ XENSTORED_OBJS += $(XENSTORED_OBJS_y) all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls xenstored: $(XENSTORED_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) $(LDFLAGS_libxenctrl) $(SOCKET_LIBS) -o $@ $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 1b345657ea..336ee007e7 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -3,9 +3,8 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -CFLAGS += -I $(XEN_XC) -CFLAGS += -I $(XEN_LIBXC) -CFLAGS += -I $(XEN_INCLUDE) +CFLAGS += $(CFLAGS_libxenctrl) +LDFLAGS += $(LDFLAGS_libxenctrl) HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) @@ -50,6 +49,6 @@ clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) %: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) xentrace_%: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) |