Diff for /qemu/Makefile between versions 1.1.1.10 and 1.1.1.11

version 1.1.1.10, 2018/04/24 18:23:12 version 1.1.1.11, 2018/04/24 18:33:19
Line 1 Line 1
 # Makefile for QEMU.  # Makefile for QEMU.
   
 GENERATED_HEADERS = config-host.h  GENERATED_HEADERS = config-host.h trace.h qemu-options.def
   ifeq ($(TRACE_BACKEND),dtrace)
   GENERATED_HEADERS += trace-dtrace.h
   endif
   
 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.
Line 36  endif Line 39  endif
   
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)  SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))  SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
   SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS))
   
 config-all-devices.mak: $(SUBDIR_DEVICES_MAK)  config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
         $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@,"  GEN   $@")          $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@,"  GEN   $@")
   
   -include $(SUBDIR_DEVICES_MAK_DEP)
   
 %/config-devices.mak: default-configs/%.mak  %/config-devices.mak: default-configs/%.mak
         $(call quiet-command,cat $< > $@.tmp, "  GEN   $@")          $(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@ $<, "  GEN   $@")
         @if test -f $@; then \          @if test -f $@; then \
           if cmp -s $@.old $@ || cmp -s $@ $@.tmp; then \            if cmp -s $@.old $@; then \
             mv $@.tmp $@; \              mv $@.tmp $@; \
             cp -p $@ $@.old; \              cp -p $@ $@.old; \
           else \            else \
Line 69  build-all: $(DOCS) $(TOOLS) recurse-all Line 75  build-all: $(DOCS) $(TOOLS) 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
   qemu-options.def: $(SRC_PATH)/qemu-options.hx
           $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
   
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))  SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
   
Line 80  include $(SRC_PATH)/Makefile.objs Line 88  include $(SRC_PATH)/Makefile.objs
 endif  endif
   
 $(common-obj-y): $(GENERATED_HEADERS)  $(common-obj-y): $(GENERATED_HEADERS)
 $(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis  $(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis
   
 $(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libdis-user subdir-libuser  $(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) subdir-libdis-user subdir-libuser
   
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))  ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 romsubdir-%:  romsubdir-%:
Line 104  ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAG Line 112  ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAG
   
 bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)  bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
   
   ifeq ($(TRACE_BACKEND),dtrace)
   trace.h: trace.h-timestamp trace-dtrace.h
   else
   trace.h: trace.h-timestamp
   endif
   trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak
           $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@,"  GEN   trace.h")
           @cmp -s $@ trace.h || cp $@ trace.h
   
   trace.c: trace.c-timestamp
   trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak
           $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@,"  GEN   trace.c")
           @cmp -s $@ trace.c || cp $@ trace.c
   
   trace.o: trace.c $(GENERATED_HEADERS)
   
   trace-dtrace.h: trace-dtrace.dtrace
           $(call quiet-command,dtrace -o $@ -h -s $<, "  GEN   trace-dtrace.h")
   
   # Normal practice is to name DTrace probe file with a '.d' extension
   # but that gets picked up by QEMU's Makefile as an external dependancy
   # rule file. So we use '.dtrace' instead
   trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
   trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak
           $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@,"  GEN   trace-dtrace.dtrace")
           @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
   
   trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
           $(call quiet-command,dtrace -o $@ -G -s $<, "  GEN trace-dtrace.o")
   
   simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
   
   version.o: $(SRC_PATH)/version.rc config-host.mak
           $(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
   
   version-obj-$(CONFIG_WIN32) += version.o
 ######################################################################  ######################################################################
   
 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: $(GENERATED_HEADERS)  qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o: $(GENERATED_HEADERS)
   
 qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)  qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
   
 qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)  qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
   
 qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)  qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
   
 qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx  qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
         $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
   
 check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)  check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)
   
 check-qint: check-qint.o qint.o qemu-malloc.o  CHECK_PROG_DEPS = qemu-malloc.o $(oslib-obj-y) $(trace-obj-y)
 check-qstring: check-qstring.o qstring.o qemu-malloc.o  
 check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o  check-qint: check-qint.o qint.o $(CHECK_PROG_DEPS)
 check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o  check-qstring: check-qstring.o qstring.o $(CHECK_PROG_DEPS)
 check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o  check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(CHECK_PROG_DEPS)
 check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o  check-qlist: check-qlist.o qlist.o qint.o $(CHECK_PROG_DEPS)
   check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS)
   check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o $(CHECK_PROG_DEPS)
   
 clean:  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 *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~          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 fsdev/*.o fsdev/*.d ui/*.o ui/*.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
         rm -f qemu-img-cmds.h          rm -f qemu-img-cmds.h
           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.h trace-dtrace.h-timestamp
         $(MAKE) -C tests clean          $(MAKE) -C tests clean
         for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \          for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; 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; \
         done          done
   
 distclean: clean  distclean: clean
         rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi          rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi
         rm -f qemu-options.def  
         rm -f config-all-devices.mak          rm -f config-all-devices.mak
         rm -f roms/seabios/config.mak roms/vgabios/config.mak          rm -f roms/seabios/config.mak roms/vgabios/config.mak
         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-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
Line 154  ar      de     en-us  fi  fr-be  hr      Line 204  ar      de     en-us  fi  fr-be  hr     
 common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
   
 ifdef INSTALL_BLOBS  ifdef INSTALL_BLOBS
 BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \  BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
 video.x openbios-sparc32 openbios-sparc64 openbios-ppc \  vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
   ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
 gpxe-eepro100-80861209.rom \  gpxe-eepro100-80861209.rom \
 gpxe-eepro100-80861229.rom \  
 pxe-e1000.bin \  pxe-e1000.bin \
 pxe-ne2k_pci.bin pxe-pcnet.bin \  pxe-ne2k_pci.bin pxe-pcnet.bin \
 pxe-rtl8139.bin pxe-virtio.bin \  pxe-rtl8139.bin pxe-virtio.bin \
Line 232  TEXIFLAG=$(if $(V),,--quiet) Line 282  TEXIFLAG=$(if $(V),,--quiet)
         $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")          $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")
   
 qemu-options.texi: $(SRC_PATH)/qemu-options.hx  qemu-options.texi: $(SRC_PATH)/qemu-options.hx
         $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
   
 qemu-monitor.texi: $(SRC_PATH)/qemu-monitor.hx  qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx
         $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
   
 QMP/qmp-commands.txt: $(SRC_PATH)/qemu-monitor.hx  QMP/qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx
         $(call quiet-command,sh $(SRC_PATH)/hxtool -q < $< > $@,"  GEN   $@")          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  GEN   $@")
   
 qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx  qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx
         $(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@,"  GEN   $@")          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
   
 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)/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)/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   $@")            "  GEN   $@")
   
 qemu-nbd.8: qemu-nbd.texi  qemu-nbd.8: qemu-nbd.texi
         $(call quiet-command, \          $(call quiet-command, \
           perl -Ww -- $(SRC_PATH)/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   $@")
   
Line 302  tarbin: Line 352  tarbin:
         $(datadir)/vgabios.bin \          $(datadir)/vgabios.bin \
         $(datadir)/vgabios-cirrus.bin \          $(datadir)/vgabios-cirrus.bin \
         $(datadir)/ppc_rom.bin \          $(datadir)/ppc_rom.bin \
         $(datadir)/video.x \  
         $(datadir)/openbios-sparc32 \          $(datadir)/openbios-sparc32 \
         $(datadir)/openbios-sparc64 \          $(datadir)/openbios-sparc64 \
         $(datadir)/openbios-ppc \          $(datadir)/openbios-ppc \

Removed from v.1.1.1.10  
changed lines
  Added in v.1.1.1.11


unix.superglobalmegacorp.com