summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-04-10 08:10:41 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-04-10 08:10:41 -0500
commit72fe3aaed94936739abfa158fa28f147b75ae9ff (patch)
treedc7f090fe72b645a5b489ade9088d2125eb8a934 /Makefile
parent2c097f6003f2a11416706ae3252c2860ed2257a9 (diff)
parent53fbf7b5391c76cc474d469bfed6a69a1243f4de (diff)
downloadhqemu-72fe3aaed94936739abfa158fa28f147b75ae9ff.zip
hqemu-72fe3aaed94936739abfa158fa28f147b75ae9ff.tar.gz
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: make: fix clean rule by removing build file in qom/ configure: Link qga against UST tracing related libraries configure: Link QEMU against 'liburcu-bp' main-loop: make qemu_event_handle static block/curl: Replace usleep by g_usleep qtest: Add missing GCC_FMT_ATTR w32: Undefine error constants before their redefinition configure: fix mingw32 libs_qga typo
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 35c7a2a..a78f53d 100644
--- a/Makefile
+++ b/Makefile
@@ -217,6 +217,7 @@ clean:
rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
rm -Rf .libs
rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
+ rm -f qom/*.o qom/*.d
rm -f qemu-img-cmds.h
rm -f trace/*.o trace/*.d
rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
OpenPOWER on IntegriCloud