summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2010-07-13 20:52:05 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2010-07-13 20:52:05 -0300
commit36befcaaa27b7072d3457f99706a7e460913a54c (patch)
treec8a94b96ace669e50b8c8871877495859a485fd5 /Makefile
parentf67f69139672068bf7f311ae1423d3a3fa97d007 (diff)
parentb7fdb3ab0e22a9a8debcb928497b248f06778845 (diff)
Merge commit 'b7fdb3ab0e22a9a8debcb928497b248f06778845' into upstream-merge
* commit 'b7fdb3ab0e22a9a8debcb928497b248f06778845': (23 commits) qemu-options: add documentation for stdio signal=on|off Update OpenBIOS images target-ppc: add vexptefp instruction softfloat: add float32_exp2() Update SeaBIOS pci/multi function bit: fix vt82c686.c. target-sh4: Add support for ldc & stc with sgr target-sh4: Split the LDST macro into 2 sub-macros pci: fix bridge update virtio-net: correct packet length math pci hotplug: make pci hotplug return value to caller vmware_vga: fix reset value for command register rtl8139: address TODOs pci hotplug: make pci_device_hot_remove() static pcnet: address TODOs pci: fix pci_device_reset AppleSMC device emulation Documentation: Fix spelling bugs Makefile: Not every shell support {} Makefile: add fsdev/*.{o,d} to clean ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f16371911..104dfc799 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ clean:
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
- rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
+ rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d
rm -f qemu-img-cmds.h
$(MAKE) -C tests clean
for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \
@@ -171,7 +171,8 @@ distclean: clean
rm -f qemu-options.def
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}
+ rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.dvi qemu-doc.fn qemu-doc.info qemu-doc.ky qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp qemu-doc.vr
+ rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr
for d in $(TARGET_DIRS) libhw32 libhw64 libuser libdis libdis-user; do \
rm -rf $$d || exit 1 ; \
done