[Xen-changelog] [xen-unstable] tools: LDFLAGS in link lines

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200583042 0
# Node ID 2773cdbecda5cc6233f046b59898017307f8a922
# Parent  68673ad57302abd57702652877457e84e2284416
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@xxxxxxxxxxxxx>
---
 tools/blktap/drivers/Makefile |    6 +++---
 tools/blktap/lib/Makefile     |    2 +-
 tools/console/Makefile        |    4 ++--
 tools/misc/Makefile           |    2 +-
 tools/xcutils/Makefile        |    2 +-
 tools/xentrace/Makefile       |    4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff -r 68673ad57302 -r 2773cdbecda5 tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile     Thu Jan 17 15:14:17 2008 +0000
+++ b/tools/blktap/drivers/Makefile     Thu Jan 17 15:17:22 2008 +0000
@@ -40,17 +40,17 @@ all: $(IBIN) qcow-util
 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 -r 68673ad57302 -r 2773cdbecda5 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Thu Jan 17 15:14:17 2008 +0000
+++ b/tools/blktap/lib/Makefile Thu Jan 17 15:17:22 2008 +0000
@@ -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 -r 68673ad57302 -r 2773cdbecda5 tools/console/Makefile
--- a/tools/console/Makefile    Thu Jan 17 15:14:17 2008 +0000
+++ b/tools/console/Makefile    Thu Jan 17 15:17:22 2008 +0000
@@ -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 -r 68673ad57302 -r 2773cdbecda5 tools/misc/Makefile
--- a/tools/misc/Makefile       Thu Jan 17 15:14:17 2008 +0000
+++ b/tools/misc/Makefile       Thu Jan 17 15:17:22 2008 +0000
@@ -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 -r 68673ad57302 -r 2773cdbecda5 tools/xcutils/Makefile
--- a/tools/xcutils/Makefile    Thu Jan 17 15:14:17 2008 +0000
+++ b/tools/xcutils/Makefile    Thu Jan 17 15:17:22 2008 +0000
@@ -33,7 +33,7 @@ build: $(PROGRAMS)
 build: $(PROGRAMS)
 
 $(PROGRAMS): %: %.o
-       $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 .PHONY: install
 install: build
diff -r 68673ad57302 -r 2773cdbecda5 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile   Thu Jan 17 15:14:17 2008 +0000
+++ b/tools/xentrace/Makefile   Thu Jan 17 15:17:22 2008 +0000
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog