diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-27 12:58:15 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-27 12:58:15 +0000 |
| commit | 3faece79e4bd120b06c01b933b6cdf93c39e1888 (patch) | |
| tree | d16fa3692a06c0e0f2ecaabf697408410bf4dd89 /tools | |
| parent | 7308e97492e0bea0a4d84b92e0c08784a061abef (diff) | |
| download | xen-3faece79e4bd120b06c01b933b6cdf93c39e1888.tar.gz xen-3faece79e4bd120b06c01b933b6cdf93c39e1888.tar.bz2 xen-3faece79e4bd120b06c01b933b6cdf93c39e1888.zip | |
Define CFLAGS and LDFLAGS for libxenstore.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Rules.mk | 3 | ||||
| -rw-r--r-- | tools/blktap/lib/Makefile | 4 | ||||
| -rw-r--r-- | tools/console/Makefile | 11 | ||||
| -rw-r--r-- | tools/fs-back/Makefile | 5 | ||||
| -rw-r--r-- | tools/xcutils/Makefile | 4 |
5 files changed, 16 insertions, 11 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk index 2ca8898bdd..d4b2f2fd3f 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -19,6 +19,9 @@ LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl 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) CFLAGS += -D__XEN_TOOLS__ diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile index ce6342c153..70a68f225f 100644 --- a/tools/blktap/lib/Makefile +++ b/tools/blktap/lib/Makefile @@ -5,9 +5,9 @@ MAJOR = 3.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 --git a/tools/console/Makefile b/tools/console/Makefile index 8ed172487c..3d7e0fe307 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -5,8 +5,9 @@ include $(XEN_ROOT)/tools/Rules.mk 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 --git a/tools/fs-back/Makefile b/tools/fs-back/Makefile index ca0453ca99..dc5fc446ce 100644 --- a/tools/fs-back/Makefile +++ b/tools/fs-back/Makefile @@ -9,7 +9,8 @@ CFLAGS += -Werror 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 --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index cc9e7a606a..d38e8ac07d 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -12,7 +12,7 @@ XEN_ROOT = ../.. 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 |