summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-13 22:21:47 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-13 22:21:47 +0100
commit88ca2a5988d8712caf04406f08cfbf09f09101ab (patch)
tree45d2381e2aa40f463e4585e5c292362f8a1fe4e2 /Makefile
parent55616505876d6683130076b810a27c7889321560 (diff)
downloadqemu-88ca2a5988d8712caf04406f08cfbf09f09101ab.tar.gz
Add tool_osdep.c
osdep.c is built in both as a toplevel target independant object, and as a per-target object because of kqemu dependencies. Under some circumstances make picks up the wrong one. Build the former as tool-osdep to avoid this conflict. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 86499382de..e996a997d2 100644
--- a/Makefile
+++ b/Makefile
@@ -222,11 +222,11 @@ libqemu_user.a: $(USER_OBJS)
######################################################################
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
+qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
-qemu-io$(EXESUF): qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS)
+qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS)
qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz