Merge remote-tracking branch 'remotes/bonzini/configure' into staging

* remotes/bonzini/configure:
  libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
  build: simplify and fix fix-obj-vars
  build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax
  build: add support for per-object -cflags and -libs to all rules
  Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG)
  Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL)
  Makefile: strip tools and modules too
  build: simplify Makefile.target around unnest-vars invocations
  build: simplify Makefile.target a bit, use just one rule for softmmu
  build: Fix per-object variables for Makefile.target

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined Makefile
index a120aabac6854c448bd26541e2a93175e6509ed2,52442bfeca40b1055fa4a631bd7f51023df19b5f..d83048368582ccd706e77a6ede1eb1e0138468f0
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -148,10 -148,6 +148,6 @@@ endi
  
  all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
  
- vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
- 
- vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
- 
  config-host.h: config-host.h-timestamp
  config-host.h-timestamp: config-host.mak
  qemu-options.def: $(SRC_PATH)/qemu-options.hx
@@@ -195,8 -191,6 +191,6 @@@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %
  
  recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
  
- bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
- 
  $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo
        $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"  RC    version.o")
  $(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h
@@@ -238,35 -232,23 +232,35 @@@ qapi-py = $(SRC_PATH)/scripts/qapi.py $
  
  qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
  $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
 -      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")
 +      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
 +              $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \
 +              "  GEN   $@")
  qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\
  $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
 -      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")
 +      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
 +              $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \
 +              "  GEN   $@")
  qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\
  $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
 -      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")
 +      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
 +              $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \
 +              "  GEN   $@")
  
  qapi-types.c qapi-types.h :\
  $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
 -      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." -b < $<, "  GEN   $@")
 +      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
 +              $(gen-out-type) -o "." -b -i $<, \
 +              "  GEN   $@")
  qapi-visit.c qapi-visit.h :\
  $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
 -      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." -b < $<, "  GEN   $@")
 +      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
 +              $(gen-out-type) -o "." -b -i $<, \
 +              "  GEN   $@")
  qmp-commands.h qmp-marshal.c :\
  $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
 -      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, "  GEN   $@")
 +      $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
 +              $(gen-out-type) -o "." -m -i $<, \
 +              "  GEN   $@")
  
  QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
  $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
@@@ -384,17 -366,25 +378,25 @@@ install: all $(if $(BUILD_DOCS),install
  install-datadir install-localstatedir
        $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
  ifneq ($(TOOLS),)
-       $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
+       $(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
+ ifneq ($(STRIP),)
+       $(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%")
+ endif
  endif
  ifneq ($(CONFIG_MODULES),)
        $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"
-       for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \
-               $(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
+       for s in $(modules-m:.mo=$(DSOSUF)); do \
+               t="$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
+               $(INSTALL_LIB) $$s "$$t"; \
+               test -z "$(STRIP)" || $(STRIP) "$$t"; \
        done
  endif
  ifneq ($(HELPERS-y),)
        $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
-       $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
+       $(INSTALL_PROG) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
+ ifneq ($(STRIP),)
+       $(STRIP) $(HELPERS-y:%="$(DESTDIR)$(libexecdir)/%")
+ endif
  endif
  ifneq ($(BLOBS),)
        set -e; for x in $(BLOBS); do \

diff --combined configure
index 3c11dd00d219a4e65662d74ab8d4fcc9603e9357,25d59f92f91ff624b0561c821586a22b182d45c4..6adfa72909eaf1b43f9bd5fd762b6aa9d48c8c3f
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3470,10 -3470,10 +3470,10 @@@ if test "$smartcard_nss" != "no"; the
  #include <pk11pub.h>
  int main(void) { PK11_FreeSlot(0); return 0; }
  EOF
-     smartcard_includes="-I\$(SRC_PATH)/libcacard"
-     libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-     libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
-     test_cflags="$libcacard_cflags"
+     # FIXME: do not include $glib_* in here
+     nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
+     nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+     test_cflags="$nss_cflags"
      # The header files in nss < 3.13.3 have a bug which causes them to
      # emit a warning. If we're going to compile QEMU with -Werror, then
      # test that the headers don't have this bug. Otherwise we would pass
@@@ -3483,11 -3483,8 +3483,8 @@@
      fi
      if test -n "$libtool" &&
         $pkg_config --atleast-version=3.12.8 nss && \
-       compile_prog "$test_cflags" "$libcacard_libs"; then
+       compile_prog "$test_cflags" "$nss_libs"; then
          smartcard_nss="yes"
-         QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
-         QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
-         libs_softmmu="$libcacard_libs $libs_softmmu"
      else
          if test "$smartcard_nss" = "yes"; then
              feature_not_found "nss"
@@@ -4153,9 -4150,7 +4150,9 @@@ echo "libcap-ng support $cap_ng
  echo "vhost-net support $vhost_net"
  echo "vhost-scsi support $vhost_scsi"
  echo "Trace backend     $trace_backend"
 +if test "$trace_backend" = "simple"; then
  echo "Trace output file $trace_file-<pid>"
 +fi
  if test "$spice" = "yes"; then
  echo "spice support     $spice ($spice_protocol_version/$spice_server_version)"
  else
@@@ -4501,8 -4496,8 +4498,8 @@@ f
  
  if test "$smartcard_nss" = "yes" ; then
    echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
-   echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
-   echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
+   echo "NSS_LIBS=$nss_libs" >> $config_host_mak
+   echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
  fi
  
  if test "$libusb" = "yes" ; then
@@@ -4771,12 -4766,6 +4768,12 @@@ if test "$gcov" = "yes" ; the
    echo "GCOV=$gcov_tool" >> $config_host_mak
  fi
  
 +iotests_common_env="tests/qemu-iotests/common.env"
 +
 +echo "# Automatically generated by configure - do not modify" > $iotests_common_env
 +echo >> $iotests_common_env
 +echo "PYTHON='$python'" >> $iotests_common_env
 +
  # use included Linux headers
  if test "$linux" = "yes" ; then
    mkdir -p linux-headers