aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-01-17 15:17:22 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-01-17 15:17:22 +0000
commitd2477385df5d7896d5df12fef4fd5fedef8b94e1 (patch)
treeee35932254b50fa56f12a323bdd2f7767760c5d3 /tools
parentdb13a968f5438711901cd404fae02c6e15dabc3c (diff)
downloadxen-d2477385df5d7896d5df12fef4fd5fedef8b94e1.tar.gz
xen-d2477385df5d7896d5df12fef4fd5fedef8b94e1.tar.bz2
xen-d2477385df5d7896d5df12fef4fd5fedef8b94e1.zip
tools: LDFLAGS in link lines
LDFLAGS is not honoured by a couple of link lines in tools/*, but should be. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/blktap/drivers/Makefile6
-rw-r--r--tools/blktap/lib/Makefile2
-rw-r--r--tools/console/Makefile4
-rw-r--r--tools/misc/Makefile2
-rw-r--r--tools/xcutils/Makefile2
-rw-r--r--tools/xentrace/Makefile4
6 files changed, 10 insertions, 10 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index b3c8fbaee9..8d2759fadc 100644
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -40,17 +40,17 @@ BLK-OBJS-$(CONFIG_Linux) += blk_linux.c
all: $(IBIN) qcow-util
blktapctrl: blktapctrl.c
- $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
+ $(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c
tapdisk: $(BLK-OBJS-y) tapdisk.c
$(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS-y) tapdisk.c \
- $(AIOLIBS) $(LIBS)
+ $(AIOLIBS) $(LDFLAGS) $(LIBS)
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
img2qcow qcow2raw qcow-create: %: $(BLK-OBJS-y)
- $(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(AIOLIBS) $(LIBS)
+ $(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
install: all
$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index f5621e1e23..2ed818311d 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -52,7 +52,7 @@ clean:
libblktap.a: $(OBJS)
$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
- -L$(XEN_XENSTORE) -l xenstore \
+ -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore \
-o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
ln -sf libblktap.so.$(MAJOR) libblktap.so
diff --git a/tools/console/Makefile b/tools/console/Makefile
index 445819ee8c..d612419732 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -21,11 +21,11 @@ clean:
$(RM) client/*.o daemon/*.o
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
$(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
$(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
.PHONY: install
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index ee81fe34b9..c3e4d914f0 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -44,4 +44,4 @@ clean:
$(CC) -c $(CFLAGS) -o $@ $<
xenperf: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index df7ee8613f..5fe69eef39 100644
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -33,7 +33,7 @@ all: build
build: $(PROGRAMS)
$(PROGRAMS): %: %.o
- $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
.PHONY: install
install: build
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index ce8e4904a8..d4917e561e 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -52,6 +52,6 @@ clean:
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
xentrace_%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl