Don't leak VLANClientState on PCI hot remove

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index ac15ca5b696767978222364e18f5ee846c3901fa..28944966081ce3eb2519f808d22ce979f8561f41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ all: $(TOOLS) $(DOCS) recurse-all
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
 
 subdir-%:
-       $(MAKE) -C $(subst subdir-,,$@) V="$(V)" all
+       $(call quiet-command,$(MAKE) -C $* V="$(V)" TARGET_DIR="$*/" all,)
 
 $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
 $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
@@ -163,7 +163,7 @@ cocoa.o: cocoa.m
 
 sdl.o: sdl.c keymaps.c sdl_keysym.h
 
-sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
+sdl.o audio/sdlaudio.o baum.o: CFLAGS += $(SDL_CFLAGS)
 
 vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h
 
@@ -174,16 +174,12 @@ curses.o: curses.c keymaps.c curses_keys.h
 bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
 
 libqemu_common.a: $(OBJS)
-       rm -f $@ 
-       $(AR) rcs $@ $(OBJS)
 
 #######################################################################
 # USER_OBJS is code used by qemu userspace emulation
 USER_OBJS=cutils.o  cache-utils.o
 
 libqemu_user.a: $(USER_OBJS)
-       rm -f $@ 
-       $(AR) rcs $@ $(USER_OBJS)
 
 ######################################################################
 
@@ -228,9 +224,9 @@ install-doc: $(DOCS)
        $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(mandir)/man1"
-       $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
        mkdir -p "$(DESTDIR)$(mandir)/man8"
-       $(INSTALL) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
+       $(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc)