# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201438695 0
# Node ID a59e0510780b2fd7448a78340d3b87a25cb24a23
# Parent 4bac220563b106123a0a756c69d4b9516b6d82aa
Define CFLAGS and LDFLAGS for libxenstore.
Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
tools/Rules.mk | 3 +++
tools/blktap/lib/Makefile | 4 ++--
tools/console/Makefile | 11 ++++++-----
tools/fs-back/Makefile | 5 +++--
tools/xcutils/Makefile | 4 ++--
5 files changed, 16 insertions(+), 11 deletions(-)
diff -r 4bac220563b1 -r a59e0510780b tools/Rules.mk
--- a/tools/Rules.mk Sun Jan 27 12:58:02 2008 +0000
+++ b/tools/Rules.mk Sun Jan 27 12:58:15 2008 +0000
@@ -18,6 +18,9 @@ LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxe
CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest
+
+CFLAGS_libxenstore = -I$(XEN_XENSTORE)
+LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
diff -r 4bac220563b1 -r a59e0510780b tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Sun Jan 27 12:58:02 2008 +0000
+++ b/tools/blktap/lib/Makefile Sun Jan 27 12:58:15 2008 +0000
@@ -5,9 +5,9 @@ MINOR = 0
MINOR = 0
SONAME = libblktap.so.$(MAJOR)
-INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
+INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I$(XEN_INCLUDE) $(CFLAGS_libxenstore)
-LIBS := -lxenstore
+LDFLAGS += $(LDFLAGS_libxenstore)
SRCS :=
SRCS += xenbus.c blkif.c xs_api.c
diff -r 4bac220563b1 -r a59e0510780b tools/console/Makefile
--- a/tools/console/Makefile Sun Jan 27 12:58:02 2008 +0000
+++ b/tools/console/Makefile Sun Jan 27 12:58:15 2008 +0000
@@ -5,8 +5,9 @@ CFLAGS += -Werror
CFLAGS += -Werror
CFLAGS += $(CFLAGS_libxenctrl)
-CFLAGS += -I $(XEN_XENSTORE)
+CFLAGS += $(CFLAGS_libxenstore)
LDFLAGS += $(LDFLAGS_libxenctrl)
+LDFLAGS += $(LDFLAGS_libxenstore)
BIN = xenconsoled xenconsole
@@ -19,12 +20,12 @@ clean:
$(RM) client/*.o daemon/*.o
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \
- $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) \
+ $(UTIL_LIBS) $(SOCKET_LIBS)
xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_XENSTORE) \
- $(UTIL_LIBS) $(SOCKET_LIBS) -lxenstore
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) \
+ $(UTIL_LIBS) $(SOCKET_LIBS)
.PHONY: install
install: $(BIN)
diff -r 4bac220563b1 -r a59e0510780b tools/fs-back/Makefile
--- a/tools/fs-back/Makefile Sun Jan 27 12:58:02 2008 +0000
+++ b/tools/fs-back/Makefile Sun Jan 27 12:58:15 2008 +0000
@@ -9,7 +9,8 @@ CFLAGS += -Wno-unused
CFLAGS += -Wno-unused
CFLAGS += -fno-strict-aliasing
CFLAGS += $(CFLAGS_libxenctrl)
-CFLAGS += $(INCLUDES) -I. -I../xenstore
+CFLAGS += $(CFLAGS_libxenstore)
+CFLAGS += $(INCLUDES) -I.
CFLAGS += -D_GNU_SOURCE
# Get gcc to generate the dependencies for us.
@@ -18,8 +19,8 @@ DEPS = .*.d
LIBS := -L. -L.. -L../lib
LIBS += $(LDFLAGS_libxenctrl)
+LIBS += $(LDFLAGS_libxenstore)
LIBS += -lpthread -lrt
-LIBS += -L$(XEN_XENSTORE) -lxenstore
OBJS := fs-xenbus.o fs-ops.o
diff -r 4bac220563b1 -r a59e0510780b tools/xcutils/Makefile
--- a/tools/xcutils/Makefile Sun Jan 27 12:58:02 2008 +0000
+++ b/tools/xcutils/Makefile Sun Jan 27 12:58:15 2008 +0000
@@ -12,7 +12,7 @@ include $(XEN_ROOT)/tools/Rules.mk
include $(XEN_ROOT)/tools/Rules.mk
CFLAGS += -Werror
-CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_XENSTORE)
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
# Make gcc generate dependencies.
CFLAGS += -Wp,-MD,.$(@F).d
@@ -20,7 +20,7 @@ PROG_DEP = .*.d
PROGRAMS = xc_restore xc_save readnotes
-LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) -L$(XEN_XENSTORE)
-lxenstore
+LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
.PHONY: all
all: build
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home