aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-03-31 19:32:18 +0100
committerIan Campbell <ian.campbell@citrix.com>2011-03-31 19:32:18 +0100
commit61d0fe74c6d60cd184afdf4f4566f421c90816ce (patch)
tree3ae90a25680d4a4e591dd3448abc69419ccb3e05 /tools/blktap
parent75c300588b4bc675d9fb2f64e9ec956d808e4992 (diff)
downloadxen-61d0fe74c6d60cd184afdf4f4566f421c90816ce.tar.gz
xen-61d0fe74c6d60cd184afdf4f4566f421c90816ce.tar.bz2
xen-61d0fe74c6d60cd184afdf4f4566f421c90816ce.zip
tools: Remove $(CFLAGS) from links lines.
The relevant variable in these circumstances is called $(LDFLAGS). 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/blktap')
-rw-r--r--tools/blktap/drivers/Makefile6
-rw-r--r--tools/blktap/lib/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index 7265c76bd4..2b91a2c71b 100644
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -48,16 +48,16 @@ BLKTAB-OBJS-$(CONFIG_Linux) += blktapctrl_linux.o
all: $(IBIN) qcow-util
blktapctrl: $(BLKTAB-OBJS-y)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_blktapctrl)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_blktapctrl)
tapdisk: tapdisk.o $(BLK-OBJS-y)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_img)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_img)
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
img2qcow qcow2raw qcow-create: %: %.o $(BLK-OBJS-y)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $* $^ $(LDLIBS_img)
+ $(CC) $(LDFLAGS) -o $* $^ $(LDLIBS_img)
install: all
$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 95eccac400..1944b1ec8d 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -42,7 +42,7 @@ clean:
rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC)
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \
+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \
-o $@ $^ $(LDLIBS)
ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
ln -sf libblktap.so.$(MAJOR) libblktap.so