diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2017-01-25 16:14:15 +0000 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-01-31 17:11:18 +0000 |
commit | 0ab8ed18a6fe98bfc82705b0f041fbf2a8ca5b60 (patch) | |
tree | 1b4150d07362a5f3782c81a6b4c972bae62f0641 /Makefile.target | |
parent | 2098c56a9bc5901e145fa5d4759f075808811685 (diff) | |
download | qemu-0ab8ed18a6fe98bfc82705b0f041fbf2a8ca5b60.zip qemu-0ab8ed18a6fe98bfc82705b0f041fbf2a8ca5b60.tar.gz qemu-0ab8ed18a6fe98bfc82705b0f041fbf2a8ca5b60.tar.bz2 |
trace: switch to modular code generation for sub-directories
Introduce rules in the top level Makefile that are able to generate
trace.[ch] files in every subdirectory which has a trace-events file.
The top level directory is handled specially, so instead of creating
trace.h, it creates trace-root.h. This allows sub-directories to
include the top level trace-root.h file, without ambiguity wrt to
the trace.g file in the current sub-dir.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170125161417.31949-7-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target index fa6ae0c..9f2af5b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -186,7 +186,8 @@ dummy := $(call unnest-vars,.., \ qom-obj-y \ io-obj-y \ common-obj-y \ - common-obj-m) + common-obj-m \ + trace-obj-y) target-obj-y := $(target-obj-y-save) all-obj-y += $(common-obj-y) all-obj-y += $(target-obj-y) @@ -198,8 +199,10 @@ all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) $(QEMU_PROG_BUILD): config-devices.mak +COMMON_LDADDS = $(trace-obj-y) ../libqemuutil.a ../libqemustub.a + # build either PROG or PROGW -$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a +$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) $(call LINK, $(filter-out %.mak, $^)) ifdef CONFIG_DARWIN $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ","$(TARGET_DIR)$@") |