summaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2017-10-24 09:20:43 -0300
committerStefan Berger <stefanb@linux.vnet.ibm.com>2017-10-25 01:05:04 -0400
commitc39f95dc2d8d2faf6e4bc24cc489efb5b20c058c (patch)
tree419b5098b2197ca53adb504ecf8fbcac30bef7e1 /Makefile.objs
parent6b287efecf474f66d69a8c2032ffb9bda7313944 (diff)
downloadqemu-c39f95dc2d8d2faf6e4bc24cc489efb5b20c058c.tar.gz
tpm: add stubs
Commit c37cacabf22 moved tpm_cleanup() in the main loop exit, however this function is not available when compiling with --disable-tpm. Provides necessary stubs to keep code clean of #ifdef'fery. Reported-by: BALATON Zoltan <balaton@eik.bme.hu> Message-Id: <20171023102903.256AF7456A0@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Richard W.M. Jones <rjones@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs
index d4f973a8fc..285c6f3c15 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -62,7 +62,7 @@ bt-host.o-cflags := $(BLUEZ_CFLAGS)
common-obj-y += dma-helpers.o
common-obj-y += vl.o
vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
-common-obj-y += tpm.o
+common-obj-$(CONFIG_TPM) += tpm.o
common-obj-$(CONFIG_SLIRP) += slirp/