From: Alon Levy <alevy@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jes.Sorensen@redhat.com
Subject: [Qemu-devel] [PATCH v21 01/11] trace: move trace objects from Makefile to Makefile.objs
Date: Thu, 17 Mar 2011 16:49:26 +0200 [thread overview]
Message-ID: <1300373376-13890-2-git-send-email-alevy@redhat.com> (raw)
In-Reply-To: <1300373376-13890-1-git-send-email-alevy@redhat.com>
---
Makefile | 32 --------------------------------
Makefile.objs | 32 ++++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
index eca4c76..5b35b9f 100644
--- a/Makefile
+++ b/Makefile
@@ -112,38 +112,6 @@ ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_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)$@")
diff --git a/Makefile.objs b/Makefile.objs
index a52f42f..be4c4d9 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -309,6 +309,38 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o
# trace
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)
+
+ifeq ($(TRACE_BACKEND),dtrace)
trace-obj-y = trace-dtrace.o
else
trace-obj-y = trace.o
--
1.7.4.1
next prev parent reply other threads:[~2011-03-17 14:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 14:49 [Qemu-devel] [PATCH v21 00/11] usb-ccid Alon Levy
2011-03-17 14:49 ` Alon Levy [this message]
2011-03-17 15:00 ` [Qemu-devel] [PATCH v21 01/11] trace: move trace objects from Makefile to Makefile.objs Alon Levy
2011-03-17 16:45 ` Stefan Hajnoczi
2011-03-17 17:23 ` Alon Levy
2011-03-21 12:28 ` Stefan Hajnoczi
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 02/11] qemu-thread.h: include inttypes.h Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 03/11] usb-ccid: add CCID bus Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 04/11] introduce libcacard/vscard_common.h Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 05/11] ccid: add passthru card device Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 06/11] libcacard: initial commit Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 07/11] libcacard: add vscclient Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 08/11] libcacard: add passthru Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 09/11] libcacard: add docs Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 10/11] ccid: add ccid-card-emulated device Alon Levy
2011-03-17 14:49 ` [Qemu-devel] [PATCH v21 11/11] ccid: add docs Alon Levy
2011-03-21 11:33 ` [Qemu-devel] [PATCH v21 00/11] usb-ccid Stefan Hajnoczi
2011-03-21 12:06 ` Alon Levy
2011-03-21 12:24 ` Alon Levy
2011-03-21 13:24 ` Stefan Hajnoczi
2011-03-21 13:31 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300373376-13890-2-git-send-email-alevy@redhat.com \
--to=alevy@redhat.com \
--cc=Jes.Sorensen@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).