mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
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>
This commit is contained in:
Keir Fraser committed
1 parent
db13a968f5
commit
d2477385df
6 files changed
+10
-10
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
@@ -33,7 +33,7 @@ all: build
|
||||
build: $(PROGRAMS)
|
||||
|
||||
$(PROGRAMS): %: %.o
|
||||
$(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
.PHONY: install
|
||||
install: build
|
||||
|
||||
@@ -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
|
||||