diff options
| -rw-r--r-- | tools/blktap2/drivers/Makefile | 20 | ||||
| -rw-r--r-- | tools/console/Makefile | 10 | ||||
| -rw-r--r-- | tools/misc/Makefile | 10 | ||||
| -rw-r--r-- | tools/xcutils/Makefile | 19 | ||||
| -rw-r--r-- | tools/xcutils/lsevtchn.c | 2 |
5 files changed, 37 insertions, 24 deletions
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 33a33d3606..54b2a64328 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -23,11 +23,7 @@ ifeq ($(CONFIG_X86_64),y) CFLAGS += -fPIC endif -LIBS += -lrt -lz - -LBLIBS_img := $(LDLIBS_libxenctrl) $(CRYPT_LIB) -lpthread -lz -lm - -LIBS += -L$(LIBVHDDIR) -lvhd +VHDLIBS := -L$(LIBVHDDIR) -lvhd REMUS-OBJS := block-remus.o REMUS-OBJS += hashtable.o @@ -88,26 +84,26 @@ BLK-OBJS-y += $(REMUS-OBJS) all: $(IBIN) lock-util qcow-util -tapdisk2: $(TAP-OBJS-y) $(BLK-OBJS-y) $(MISC-OBJS-y) tapdisk2.c - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(AIOLIBS) $(MEMSHRLIBS) $(LBLIBS_img) +tapdisk2: $(TAP-OBJS-y) $(BLK-OBJS-y) $(MISC-OBJS-y) tapdisk2.o + $(CC) -o $@ $^ $(LDFLAGS) -lrt -lz $(VHDLIBS) $(AIOLIBS) $(MEMSHRLIBS) -lm tapdisk-client: tapdisk-client.o - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LBLIBS_img) + $(CC) -o $@ $^ $(LDFLAGS) -lrt tapdisk-stream tapdisk-diff: %: %.o $(TAP-OBJS-y) $(BLK-OBJS-y) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(AIOLIBS) $(MEMSHRLIBS) $(LBLIBS_img) + $(CC) -o $@ $^ $(LDFLAGS) -lrt -lz $(VHDLIBS) $(AIOLIBS) $(MEMSHRLIBS) -lm td-util: td.o tapdisk-utils.o tapdisk-log.o $(PORTABLE-OBJS-y) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LBLIBS_img) + $(CC) -o $@ $^ $(LDFLAGS) $(VHDLIBS) lock-util: lock.c - $(CC) $(CFLAGS) -DUTIL -o lock-util lock.c $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -DUTIL -o lock-util lock.c $(LDFLAGS) .PHONY: qcow-util qcow-util: img2qcow qcow2raw qcow-create img2qcow qcow2raw qcow-create: %: %.o $(TAP-OBJS-y) $(BLK-OBJS-y) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(AIOLIBS) $(MEMSHRLIBS) $(LBLIBS_img) + $(CC) -o $@ $^ $(LDFLAGS) -lrt -lz $(VHDLIBS) $(AIOLIBS) $(MEMSHRLIBS) -lm install: all $(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR) diff --git a/tools/console/Makefile b/tools/console/Makefile index 5a119b44cd..0203c4a417 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -1,4 +1,3 @@ - XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk @@ -8,9 +7,10 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) LDLIBS += $(LDLIBS_libxenctrl) LDLIBS += $(LDLIBS_libxenstore) -LDLIBS += $(UTIL_LIBS) LDLIBS += $(SOCKET_LIBS) -LDLIBS += -lrt + +LDLIBS_xenconsoled += $(UTIL_LIBS) +LDLIBS_xenconsoled += -lrt BIN = xenconsoled xenconsole @@ -23,10 +23,10 @@ clean: $(RM) client/*.o daemon/*.o xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) $(LDLIBS_xenconsoled) xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) $(LDLIBS_xenconsole) .PHONY: install install: $(BIN) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index e4e8bfe14c..549ee7d3d5 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -15,6 +15,14 @@ TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash TARGETS-$(CONFIG_MIGRATE) += xen-hptool TARGETS := $(TARGETS-y) +LDLIBS_xenperf := $(LDLIBS_libxenctrl) +LDLIBS_xenpm := $(LDLIBS_libxenctrl) +LDLIBS_xenlockprof := $(LDLIBS_libxenctrl) +LDLIBS_xenwatchdogd := $(LDLIBS_libxenctrl) +LDLIBS_xen-hvmctx := $(LDLIBS_libxenctrl) +LDLIBS_xen-hvmcrash := $(LDLIBS_libxenctrl) +LDLIBS_xen-hptool := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) + SUBDIRS-$(CONFIG_LOMOUNT) += lomount SUBDIRS-$(CONFIG_MINITERM) += miniterm SUBDIRS := $(SUBDIRS-y) @@ -52,7 +60,7 @@ clean: $(CC) -c $(CFLAGS) -o $@ $< xen-hvmctx xen-hvmcrash xenperf xenpm gtracestat xenlockprof xen-hptool xenwatchdogd: %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_$*) gtraceview: %: %.o Makefile $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CURSES_LIBS) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 5872d57d8c..e16c6a334f 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,12 +11,20 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) PROGRAMS = xc_restore xc_save readnotes lsevtchn -LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) +CFLAGS += -Werror + +CFLAGS_xc_restore := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +CFLAGS_xc_save := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) +CFLAGS_readnotes := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +CFLAGS_lsevtchn := $(CFLAGS_libxenctrl) + +LDLIBS_xc_restore := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) +LDLIBS_xc_save := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) +LDLIBS_readnotes := $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) +LDLIBS_lsevtchn := $(LDLIBS_libxenctrl) .PHONY: all all: build @@ -24,8 +32,11 @@ all: build .PHONY: build build: $(PROGRAMS) +%.o: %.c + $(CC) $(CFLAGS) $(CFLAGS_$*) -c $^ -o $@ + $(PROGRAMS): %: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_$*) -o $@ .PHONY: install install: build diff --git a/tools/xcutils/lsevtchn.c b/tools/xcutils/lsevtchn.c index e79fe0990a..d1710613dd 100644 --- a/tools/xcutils/lsevtchn.c +++ b/tools/xcutils/lsevtchn.c @@ -4,9 +4,7 @@ #include <string.h> #include <stdio.h> -#include <xs.h> #include <xenctrl.h> -#include <xenguest.h> int main(int argc, char **argv) { |