diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 19:32:18 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 19:32:18 +0100 |
| commit | 61d0fe74c6d60cd184afdf4f4566f421c90816ce (patch) | |
| tree | 3ae90a25680d4a4e591dd3448abc69419ccb3e05 /tools/blktap2 | |
| parent | 75c300588b4bc675d9fb2f64e9ec956d808e4992 (diff) | |
| download | xen-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/blktap2')
| -rw-r--r-- | tools/blktap2/control/Makefile | 4 | ||||
| -rw-r--r-- | tools/blktap2/lvm/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/vhd/Makefile | 4 | ||||
| -rw-r--r-- | tools/blktap2/vhd/lib/Makefile | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 703bb8d8c5..86a433c3d7 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -52,13 +52,13 @@ $(LIBSONAME): $(LIB_SHARED) ln -sf $< $@ tap-ctl: tap-ctl.o $(LIBNAME).so - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(LIB_STATIC): $(CTL_OBJS) $(AR) r $@ $^ $(LIB_SHARED): $(CTL_PICS) - $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ + $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR) diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile index 56253277a0..75637918c6 100644 --- a/tools/blktap2/lvm/Makefile +++ b/tools/blktap2/lvm/Makefile @@ -24,7 +24,7 @@ build: $(TEST) $(LVM-OBJS) install: all lvm-util: lvm-util.o - $(CC) $(CFLAGS) -DLVM_UTIL $(LDFLAGS) -o lvm-util lvm-util.c + $(CC) -DLVM_UTIL $(LDFLAGS) -o lvm-util lvm-util.c clean: rm -rf *.o *~ $(DEPS) $(IBIN) diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 7c8bed7879..c5019de9a6 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -31,10 +31,10 @@ LIBS_DEPENDS := lib/libvhd.so lib/vhd.a $(LIBS_DEPENDS):subdirs-all vhd-util: vhd-util.o $(LIBS_DEPENDS) - $(CC) $(CFLAGS) $(LDFLAGS) -o vhd-util vhd-util.o $(LIBS) + $(CC) $(LDFLAGS) -o vhd-util vhd-util.o $(LIBS) vhd-update: vhd-update.o $(LIBS_DEPENDS) - $(CC) $(CFLAGS) $(LDFLAGS) -o vhd-update vhd-update.o $(LIBS) + $(CC) $(LDFLAGS) -o vhd-update vhd-update.o $(LIBS) install: all $(MAKE) subdirs-install diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 5d7724b3fa..97379c117e 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -52,7 +52,7 @@ all: build build: $(LIBVHD-BUILD) libvhd.a: $(LIB-OBJS) - $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ + $(CC) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS) ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR) ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so |