diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2019-04-01 16:12:21 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-17 15:19:39 +0200 |
| commit | 8d5d515a0fbfa7b6370656a9bee2f8eece1a890f (patch) | |
| tree | 0e68eafdb7527343c24028feed0c3f9aef94f287 | |
| parent | a51259059503a197dd8fbc152786cbacf3127bbb (diff) | |
build: chardev is only needed for softmmu targets
Move the dependency from SUBDIR_RULES to SOFTMMU_SUBDIR_RULES
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20190401141222.30034-5-lvivier@redhat.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.objs | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -444,6 +444,7 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(authz-obj-y) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) +$(SOFTMMU_SUBDIR_RULES): $(chardev-obj-y) $(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y) $(SOFTMMU_SUBDIR_RULES): $(io-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak @@ -480,7 +481,7 @@ subdir-capstone: .git-submodule-status subdir-slirp: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)") -$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \ +$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) diff --git a/Makefile.objs b/Makefile.objs index dda5bbc910..43c9e45032 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -129,9 +129,9 @@ trace-events-subdirs += accel/kvm trace-events-subdirs += accel/tcg trace-events-subdirs += authz trace-events-subdirs += block -trace-events-subdirs += chardev trace-events-subdirs += crypto ifeq ($(CONFIG_SOFTMMU),y) +trace-events-subdirs += chardev trace-events-subdirs += audio trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/acpi |