diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:06:27 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:06:27 +0000 |
| commit | 8e9a52f1fdee42bdad872835c6afc71e0c237ea7 (patch) | |
| tree | 5edead475cddd51bb489092091022bfc5c8a2da0 /tools | |
| parent | ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4 (diff) | |
| download | xen-8e9a52f1fdee42bdad872835c6afc71e0c237ea7.tar.gz xen-8e9a52f1fdee42bdad872835c6afc71e0c237ea7.tar.bz2 xen-8e9a52f1fdee42bdad872835c6afc71e0c237ea7.zip | |
tools: consistently use $({CFLAGS,LDLIBS}_libxenstore) 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/ocaml/common.make | 2 | ||||
| -rw-r--r-- | tools/xenstat/libxenstat/Makefile | 4 | ||||
| -rw-r--r-- | tools/xenstore/Makefile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index 1dd059188e..c12ef7d9f5 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) $(CFLAGS_libxenctrl) -I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl +CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) -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/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 76908e421a..8ef5b110a7 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 $(CFLAGS_libxenctrl) -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) +CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -LDLIBS-y = -lxenstore $(LDLIBS_libxenctrl) +LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) LDLIBS-$(CONFIG_SunOS) += -lkstat ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 788401d555..643b34acbf 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -53,10 +53,10 @@ $(CLIENTS): xenstore ln -f xenstore $@ xenstore: xenstore_client.o $(LIBXENSTORE) - $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ xenstore-control: xenstore_control.o $(LIBXENSTORE) - $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ |