Diff for /qemu/Makefile between versions 1.1.1.13 and 1.1.1.14

version 1.1.1.13, 2018/04/24 19:16:39 version 1.1.1.14, 2018/04/24 19:33:36
Line 3 Line 3
 # Always point to the root of the build tree (needs GNU make).  # Always point to the root of the build tree (needs GNU make).
 BUILD_DIR=$(CURDIR)  BUILD_DIR=$(CURDIR)
   
 GENERATED_HEADERS = config-host.h trace.h qemu-options.def  # All following code might depend on configuration variables
 ifeq ($(TRACE_BACKEND),dtrace)  
 GENERATED_HEADERS += trace-dtrace.h  
 endif  
 GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h  
 GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c  
   
 ifneq ($(wildcard config-host.mak),)  ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.  # Put the all: rule here so that config-host.mak can contain dependencies.
 all: build-all  all: build-all
Line 24  config-host.mak: Line 18  config-host.mak:
         @exit 1          @exit 1
 endif  endif
   
   GENERATED_HEADERS = config-host.h trace.h qemu-options.def
   ifeq ($(TRACE_BACKEND),dtrace)
   GENERATED_HEADERS += trace-dtrace.h
   endif
   GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
   GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c trace.c
   
 # Don't try to regenerate Makefile or configure  # Don't try to regenerate Makefile or configure
 # We don't generate any of them  # We don't generate any of them
 Makefile: ;  Makefile: ;
Line 36  $(call set-vpath, $(SRC_PATH):$(SRC_PATH Line 37  $(call set-vpath, $(SRC_PATH):$(SRC_PATH
   
 LIBS+=-lz $(LIBS_TOOLS)  LIBS+=-lz $(LIBS_TOOLS)
   
   HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
   
 ifdef BUILD_DOCS  ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt  DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
   ifdef CONFIG_VIRTFS
   DOCS+=fsdev/virtfs-proxy-helper.1
   endif
 else  else
 DOCS=  DOCS=
 endif  endif
Line 76  defconfig: Line 82  defconfig:
   
 -include config-all-devices.mak  -include config-all-devices.mak
   
 build-all: $(DOCS) $(TOOLS) $(CHECKS) recurse-all  build-all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
   
 config-host.h: config-host.h-timestamp  config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak  config-host.h-timestamp: config-host.mak
Line 92  ifneq ($(wildcard config-host.mak),) Line 98  ifneq ($(wildcard config-host.mak),)
 include $(SRC_PATH)/Makefile.objs  include $(SRC_PATH)/Makefile.objs
 endif  endif
   
 $(common-obj-y): $(GENERATED_HEADERS)  $(universal-obj-y) $(common-obj-y): $(GENERATED_HEADERS)
 subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o  subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
   
 $(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis  $(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) subdir-libdis
   
 $(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) subdir-libdis-user subdir-libuser  $(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
   
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))  ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 romsubdir-%:  romsubdir-%:
Line 111  audio/audio.o audio/fmodaudio.o: QEMU_CF Line 117  audio/audio.o audio/fmodaudio.o: QEMU_CF
   
 QEMU_CFLAGS+=$(CURL_CFLAGS)  QEMU_CFLAGS+=$(CURL_CFLAGS)
   
 QEMU_CFLAGS+=$(GLIB_CFLAGS)  QEMU_CFLAGS += -I$(SRC_PATH)/include
   
 ui/cocoa.o: ui/cocoa.m  ui/cocoa.o: ui/cocoa.m
   
Line 147  endif Line 153  endif
 qemu-img.o: qemu-img-cmds.h  qemu-img.o: qemu-img-cmds.h
 qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o qemu-ga.o: $(GENERATED_HEADERS)  qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o qemu-ga.o: $(GENERATED_HEADERS)
   
 tools-obj-y = qemu-tool.o $(oslib-obj-y) $(trace-obj-y) \  tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
         qemu-timer-common.o cutils.o          qemu-timer-common.o main-loop.o notify.o iohandler.o cutils.o async.o
   tools-obj-$(CONFIG_POSIX) += compatfd.o
   
 qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)  qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
 qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)  qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)
 qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)  qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
   
 qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx  qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")  qemu-bridge-helper.o: $(GENERATED_HEADERS)
   
 check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)  fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
   fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
   
 check-qint: check-qint.o qint.o $(tools-obj-y)  qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
 check-qstring: check-qstring.o qstring.o $(tools-obj-y)          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
 check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(tools-obj-y)  
 check-qlist: check-qlist.o qlist.o qint.o $(tools-obj-y)  
 check-qfloat: check-qfloat.o qfloat.o $(tools-obj-y)  
 check-qjson: check-qjson.o $(qobject-obj-y) $(tools-obj-y)  
 test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y) $(tools-obj-y)  
   
 $(qapi-obj-y): $(GENERATED_HEADERS)  $(qapi-obj-y): $(GENERATED_HEADERS)
 qapi-dir := $(BUILD_DIR)/qapi-generated  qapi-dir := $(BUILD_DIR)/qapi-generated
 test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)  
 qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)  qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
   qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
   
   gen-out-type = $(subst .,-,$(suffix $@))
   
 $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\  ifneq ($(wildcard config-host.mak),)
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py  include $(SRC_PATH)/tests/Makefile
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")  endif
 $(qapi-dir)/test-qapi-visit.c $(qapi-dir)/test-qapi-visit.h :\  
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py  
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")  
 $(qapi-dir)/test-qmp-commands.h $(qapi-dir)/test-qmp-marshal.c :\  
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py  
             $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")  
   
 $(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\  $(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\
 $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py  $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")          $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
 $(qapi-dir)/qga-qapi-visit.c $(qapi-dir)/qga-qapi-visit.h :\  $(qapi-dir)/qga-qapi-visit.c $(qapi-dir)/qga-qapi-visit.h :\
 $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py  $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")          $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
 $(qapi-dir)/qga-qmp-commands.h $(qapi-dir)/qga-qmp-marshal.c :\  $(qapi-dir)/qga-qmp-commands.h $(qapi-dir)/qga-qmp-marshal.c :\
 $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py  $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")          $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, "  GEN   $@")
   
 qapi-types.c qapi-types.h :\  qapi-types.c qapi-types.h :\
 $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py  $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "." < $<, "  GEN   $@")          $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." < $<, "  GEN   $@")
 qapi-visit.c qapi-visit.h :\  qapi-visit.c qapi-visit.h :\
 $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py  $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "."  < $<, "  GEN   $@")          $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "."  < $<, "  GEN   $@")
 qmp-commands.h qmp-marshal.c :\  qmp-commands.h qmp-marshal.c :\
 $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py  $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py
         $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -m -o "." < $<, "  GEN   $@")          $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, "  GEN   $@")
   
 test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)  
 test-visitor: test-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o  
   
 test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y)  
 test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o  
   
 QGALIB_OBJ=$(addprefix $(qapi-dir)/, qga-qapi-types.o qga-qapi-visit.o qga-qmp-marshal.o)  QGALIB_OBJ=$(addprefix $(qapi-dir)/, qga-qapi-types.o qga-qapi-visit.o qga-qmp-marshal.o)
 QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)  QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
 $(QGALIB_OBJ): $(QGALIB_GEN) $(GENERATED_HEADERS)  $(QGALIB_OBJ): $(QGALIB_GEN) $(GENERATED_HEADERS)
 $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) $(GENERATED_HEADERS)  $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) $(GENERATED_HEADERS)
   
 qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qobject-obj-y) $(version-obj-y) $(QGALIB_OBJ)  qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) $(QGALIB_OBJ)
   
 QEMULIBS=libhw32 libhw64 libuser libdis libdis-user  QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
   
Line 221  clean: Line 214  clean:
 # avoid old build problems by removing potentially incorrect old files  # 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 config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
         rm -f qemu-options.def          rm -f qemu-options.def
         rm -f *.o *.d *.a *.lo $(TOOLS) $(CHECKS) qemu-ga TAGS cscope.* *.pod *~ */*~          rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
         rm -Rf .libs          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 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 qemu-img-cmds.h
         rm -f trace/*.o trace/*.d          rm -f trace/*.o trace/*.d
         rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp  
         rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp          rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
           @# May not be present in GENERATED_HEADERS
         rm -f trace-dtrace.h trace-dtrace.h-timestamp          rm -f trace-dtrace.h trace-dtrace.h-timestamp
         rm -f $(GENERATED_SOURCES)          rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp)
           rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
         rm -rf $(qapi-dir)          rm -rf $(qapi-dir)
         $(MAKE) -C tests clean          $(MAKE) -C tests/tcg clean
         for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \          for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
         if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \          if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
         rm -f $$d/qemu-options.def; \          rm -f $$d/qemu-options.def; \
Line 246  distclean: clean Line 241  distclean: clean
         rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp          rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp
         rm -f qemu-doc.vr          rm -f qemu-doc.vr
         rm -f config.log          rm -f config.log
           rm -f linux-headers/asm
         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          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) $(QEMULIBS); do \          for d in $(TARGET_DIRS) $(QEMULIBS); do \
         rm -rf $$d || exit 1 ; \          rm -rf $$d || exit 1 ; \
Line 261  vgabios-stdvga.bin vgabios-vmware.bin vg Line 257  vgabios-stdvga.bin vgabios-vmware.bin vg
 ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \  ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
 pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \  pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
 pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \  pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
   qemu-icon.bmp \
 bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \  bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
 mpc8544ds.dtb \  mpc8544ds.dtb \
 multiboot.bin linuxboot.bin \  multiboot.bin linuxboot.bin kvmvapic.bin \
 s390-zipl.rom \  s390-zipl.rom \
 spapr-rtas.bin slof.bin \  spapr-rtas.bin slof.bin \
 palcode-clipper  palcode-clipper
Line 272  BLOBS= Line 269  BLOBS=
 endif  endif
   
 install-doc: $(DOCS)  install-doc: $(DOCS)
         $(INSTALL_DIR) "$(DESTDIR)$(docdir)"          $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
         $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"          $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(qemu_docdir)"
           $(INSTALL_DATA) QMP/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"
 ifdef CONFIG_POSIX  ifdef CONFIG_POSIX
         $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"          $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
         $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"          $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
         $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"          $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
         $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"          $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
 endif  endif
   ifdef CONFIG_VIRTFS
           $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
           $(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
   endif
   
 install-sysconfig:  install-datadir:
         $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu"          $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
         $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu"  
   
 install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig  install-confdir:
           $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
   
   install-sysconfig: install-datadir install-confdir
           $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
           $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/cpus-x86_64.conf "$(DESTDIR)$(qemu_datadir)"
   
   install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig install-datadir
         $(INSTALL_DIR) "$(DESTDIR)$(bindir)"          $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
 ifneq ($(TOOLS),)  ifneq ($(TOOLS),)
         $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"          $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
 endif  endif
   ifneq ($(HELPERS-y),)
           $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
           $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
   endif
 ifneq ($(BLOBS),)  ifneq ($(BLOBS),)
         $(INSTALL_DIR) "$(DESTDIR)$(datadir)"  
         set -e; for x in $(BLOBS); do \          set -e; for x in $(BLOBS); do \
                 $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \                  $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
         done          done
 endif  endif
         $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"          $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
         set -e; for x in $(KEYMAPS); do \          set -e; for x in $(KEYMAPS); do \
                 $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \                  $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
         done          done
         for d in $(TARGET_DIRS); do \          for d in $(TARGET_DIRS); do \
         $(MAKE) -C $$d $@ || exit 1 ; \          $(MAKE) -C $$d $@ || exit 1 ; \
Line 306  endif Line 317  endif
   
 # various test targets  # various test targets
 test speed: all  test speed: all
         $(MAKE) -C tests $@          $(MAKE) -C tests/tcg $@
   
 .PHONY: check  
 check: $(patsubst %,run-check-%,$(CHECKS))  
   
 run-check-%: %  
         ./$<  
   
 .PHONY: TAGS  .PHONY: TAGS
 TAGS:  TAGS:
Line 331  TEXIFLAG=$(if $(V),,--quiet) Line 336  TEXIFLAG=$(if $(V),,--quiet)
         $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<,"  GEN   $@")          $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<,"  GEN   $@")
   
 %.html: %.texi  %.html: %.texi
         $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \          $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \
         "  GEN   $@")          "  GEN   $@")
   
 %.info: %.texi  %.info: %.texi
Line 355  qemu-img-cmds.texi: $(SRC_PATH)/qemu-img Line 360  qemu-img-cmds.texi: $(SRC_PATH)/qemu-img
 qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi  qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi
         $(call quiet-command, \          $(call quiet-command, \
           perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \            perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \
           pod2man --section=1 --center=" " --release=" " qemu.pod > $@, \            $(POD2MAN) --section=1 --center=" " --release=" " qemu.pod > $@, \
           "  GEN   $@")            "  GEN   $@")
   
 qemu-img.1: qemu-img.texi qemu-img-cmds.texi  qemu-img.1: qemu-img.texi qemu-img-cmds.texi
         $(call quiet-command, \          $(call quiet-command, \
           perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-img.pod && \            perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-img.pod && \
           pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@, \            $(POD2MAN) --section=1 --center=" " --release=" " qemu-img.pod > $@, \
             "  GEN   $@")
   
   fsdev/virtfs-proxy-helper.1: fsdev/virtfs-proxy-helper.texi
           $(call quiet-command, \
             perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< fsdev/virtfs-proxy-helper.pod && \
             $(POD2MAN) --section=1 --center=" " --release=" " fsdev/virtfs-proxy-helper.pod > $@, \
           "  GEN   $@")            "  GEN   $@")
   
 qemu-nbd.8: qemu-nbd.texi  qemu-nbd.8: qemu-nbd.texi
         $(call quiet-command, \          $(call quiet-command, \
           perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-nbd.pod && \            perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-nbd.pod && \
           pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \            $(POD2MAN) --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \
           "  GEN   $@")            "  GEN   $@")
   
 dvi: qemu-doc.dvi qemu-tech.dvi  dvi: qemu-doc.dvi qemu-tech.dvi

Removed from v.1.1.1.13  
changed lines
  Added in v.1.1.1.14


unix.superglobalmegacorp.com