add support for omap3 usbhost power domain control

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index e7b7777..9b9ba5f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ recurse-all: $(SUBDIR_RULES)
 BLOCK_OBJS=cutils.o qemu-malloc.o
 BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
 BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
-BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
+BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o block-vmstate.o
 BLOCK_OBJS+=nbd.o block.o aio.o
 
 ifdef CONFIG_WIN32
@@ -206,7 +206,9 @@ qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 
 qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 
-qemu-img$(EXESUF) qemu-nbd$(EXESUF): LIBS += -lz
+qemu-io$(EXESUF):  qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS)
+
+qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
 
 clean:
 # avoid old build problems by removing potentially incorrect old files
@@ -219,7 +221,7 @@ clean:
         done
 
 distclean: clean
-       rm -f config-host.mak config-host.h $(DOCS)
+       rm -f config-host.mak config-host.h $(DOCS) qemu-options.texi
        rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr}
        for d in $(TARGET_DIRS); do \
        rm -rf $$d || exit 1 ; \
@@ -251,7 +253,7 @@ endif
 install: all $(if $(BUILD_DOCS),install-doc)
        mkdir -p "$(DESTDIR)$(bindir)"
 ifneq ($(TOOLS),)
-       $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+       $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
 ifneq ($(BLOBS),)
        mkdir -p "$(DESTDIR)$(datadir)"
@@ -285,25 +287,34 @@ cscope:
 
 # documentation
 %.html: %.texi
-       texi2html -monolithic -number $<
+       $(call quiet-command,texi2html -I=. -monolithic -number $<,"  GEN   $@")
 
 %.info: %.texi
-       makeinfo $< -o $@
+       $(call quiet-command,makeinfo -I . $< -o $@,"  GEN   $@")
 
 %.dvi: %.texi
-       texi2dvi $<
+       $(call quiet-command,texi2dvi -I . $<,"  GEN   $@")
+
+qemu-options.texi: $(SRC_PATH)/qemu-options.hx
+       $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")
 
 qemu.1: qemu-doc.texi
-       perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod
-       pod2man --section=1 --center=" " --release=" " qemu.pod > $@
+       $(call quiet-command, \
+         perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod && \
+         pod2man --section=1 --center=" " --release=" " qemu.pod > $@, \
+         "  GEN   $@")
 
 qemu-img.1: qemu-img.texi
-       perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
-       pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
+       $(call quiet-command, \
+         perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod && \
+         pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@, \
+         "  GEN   $@")
 
 qemu-nbd.8: qemu-nbd.texi
-       perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
-       pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@
+       $(call quiet-command, \
+         perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod && \
+         pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \
+         "  GEN   $@")
 
 info: qemu-doc.info qemu-tech.info
 
@@ -311,7 +322,7 @@ dvi: qemu-doc.dvi qemu-tech.dvi
 
 html: qemu-doc.html qemu-tech.html
 
-qemu-doc.dvi qemu-doc.html qemu-doc.info: qemu-img.texi qemu-nbd.texi
+qemu-doc.dvi qemu-doc.html qemu-doc.info: qemu-img.texi qemu-nbd.texi qemu-options.texi
 
 VERSION ?= $(shell cat VERSION)
 FILE = qemu-$(VERSION)