diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-05 19:35:57 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-05 19:35:57 -0300 |
| commit | 80c34c3633915a32d3f197d14a3a2e8f9dc02009 (patch) | |
| tree | 641208b7d9319f61c93bd2ca12dec614071bda82 /Makefile | |
| parent | 656855e881e4fb644002a5f37416b0c1ed5d1d74 (diff) | |
| parent | aaf12c25312c49620777a232e8f770357450a603 (diff) | |
Merge commit 'aaf12c25312c49620777a232e8f770357450a603' into upstream-merge
* commit 'aaf12c25312c49620777a232e8f770357450a603':
Revert 'Fix build'
Revert "Introduce a default qmp session"
Revert "qmp: don't make -qmp disable the default monitor"
Revert "tap: invoke downscript when we exit abnormally"
Revert "Convert atexit users to exit_notifier"
Revert "Add exit notifiers"
Fix a typo
Compile disassemblers only once
tcg/arm: don't save/restore r7 in prologue/epilogue
tcg/arm: fix load/store definitions for 32-bit targets
tcg: protect div2 in tcg/tcg-opc.h
Fix a typo which broke Xen build
Fix mingw32 build
Conflicts:
vl.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -92,9 +92,9 @@ include $(SRC_PATH)/Makefile.objs endif $(common-obj-y): $(GENERATED_HEADERS) -$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) +$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis -$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libuser +$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libdis-user subdir-libuser ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: @@ -164,7 +164,7 @@ clean: rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d rm -f qemu-img-cmds.h $(MAKE) -C tests clean - for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser; do \ + for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ done @@ -173,7 +173,7 @@ distclean: clean rm -f config-all-devices.mak rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pdf,pg,toc,tp,vr} - for d in $(TARGET_DIRS) libhw32 libhw64 libuser; do \ + for d in $(TARGET_DIRS) libhw32 libhw64 libuser libdis libdis-user; do \ rm -rf $$d || exit 1 ; \ done |