ia64/xen-unstable

changeset 16741:2773cdbecda5

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>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jan 17 15:17:22 2008 +0000 (2008-01-17)
parents 68673ad57302
children acb35c1088fd
files tools/blktap/drivers/Makefile tools/blktap/lib/Makefile tools/console/Makefile tools/misc/Makefile tools/xcutils/Makefile tools/xentrace/Makefile
line diff
     1.1 --- a/tools/blktap/drivers/Makefile	Thu Jan 17 15:14:17 2008 +0000
     1.2 +++ b/tools/blktap/drivers/Makefile	Thu Jan 17 15:17:22 2008 +0000
     1.3 @@ -40,17 +40,17 @@ BLK-OBJS-$(CONFIG_Linux) += blk_linux.c
     1.4  all: $(IBIN) qcow-util
     1.5  
     1.6  blktapctrl: blktapctrl.c
     1.7 -	$(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
     1.8 +	$(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c
     1.9  
    1.10  tapdisk: $(BLK-OBJS-y) tapdisk.c
    1.11  	$(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS-y) tapdisk.c \
    1.12 -		$(AIOLIBS) $(LIBS)
    1.13 +		$(AIOLIBS) $(LDFLAGS) $(LIBS)
    1.14  
    1.15  .PHONY: qcow-util
    1.16  qcow-util: img2qcow qcow2raw qcow-create
    1.17  
    1.18  img2qcow qcow2raw qcow-create: %: $(BLK-OBJS-y)
    1.19 -	$(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(AIOLIBS) $(LIBS)
    1.20 +	$(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
    1.21  
    1.22  install: all
    1.23  	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
     2.1 --- a/tools/blktap/lib/Makefile	Thu Jan 17 15:14:17 2008 +0000
     2.2 +++ b/tools/blktap/lib/Makefile	Thu Jan 17 15:17:22 2008 +0000
     2.3 @@ -52,7 +52,7 @@ clean:
     2.4  
     2.5  libblktap.a: $(OBJS) 
     2.6  	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
     2.7 -	      -L$(XEN_XENSTORE) -l xenstore                                \
     2.8 +	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
     2.9  	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
    2.10  	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
    2.11  	ln -sf libblktap.so.$(MAJOR) libblktap.so
     3.1 --- a/tools/console/Makefile	Thu Jan 17 15:14:17 2008 +0000
     3.2 +++ b/tools/console/Makefile	Thu Jan 17 15:17:22 2008 +0000
     3.3 @@ -21,11 +21,11 @@ clean:
     3.4  	$(RM) client/*.o daemon/*.o
     3.5  
     3.6  xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
     3.7 -	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
     3.8 +	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
     3.9                $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
    3.10  
    3.11  xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
    3.12 -	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
    3.13 +	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
    3.14  	      $(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
    3.15  
    3.16  .PHONY: install
     4.1 --- a/tools/misc/Makefile	Thu Jan 17 15:14:17 2008 +0000
     4.2 +++ b/tools/misc/Makefile	Thu Jan 17 15:17:22 2008 +0000
     4.3 @@ -44,4 +44,4 @@ clean:
     4.4  	$(CC) -c $(CFLAGS) -o $@ $<
     4.5  
     4.6  xenperf: %: %.o Makefile
     4.7 -	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
     4.8 +	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
     5.1 --- a/tools/xcutils/Makefile	Thu Jan 17 15:14:17 2008 +0000
     5.2 +++ b/tools/xcutils/Makefile	Thu Jan 17 15:17:22 2008 +0000
     5.3 @@ -33,7 +33,7 @@ all: build
     5.4  build: $(PROGRAMS)
     5.5  
     5.6  $(PROGRAMS): %: %.o
     5.7 -	$(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
     5.8 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
     5.9  
    5.10  .PHONY: install
    5.11  install: build
     6.1 --- a/tools/xentrace/Makefile	Thu Jan 17 15:14:17 2008 +0000
     6.2 +++ b/tools/xentrace/Makefile	Thu Jan 17 15:17:22 2008 +0000
     6.3 @@ -52,6 +52,6 @@ clean:
     6.4  	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
     6.5  
     6.6  %: %.c $(HDRS) Makefile
     6.7 -	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
     6.8 +	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
     6.9  xentrace_%: %.c $(HDRS) Makefile
    6.10 -	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
    6.11 +	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl