Switch files in the linux-user/ directory to include the
linux-user/trace.h file instead of the global trace.h
file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
---
Makefile.objs | 2 +-
linux-user/Makefile.objs | 2 ++
linux-user/signal.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index cfef83b..abdc0a8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -161,7 +161,7 @@ trace-events-subdirs += target/sparc
trace-events-subdirs += target/s390x
trace-events-subdirs += target/ppc
trace-events-subdirs += qom
-trace-events-y += linux-user/trace-events
+trace-events-subdirs += linux-user
trace-events-y += qapi/trace-events
trace-events-files = $(trace-events-y) $(trace-events-subdirs:%=%/trace-events)
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
index 8c93058..7a05775 100644
--- a/linux-user/Makefile.objs
+++ b/linux-user/Makefile.objs
@@ -6,3 +6,5 @@ obj-$(TARGET_HAS_BFLT) += flatload.o
obj-$(TARGET_I386) += vm86.o
obj-$(TARGET_ARM) += arm/nwfpe/
obj-$(TARGET_M68K) += m68k-sim.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/linux-user/signal.c b/linux-user/signal.c
index c750053..8bc327c 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -24,7 +24,7 @@
#include "qemu.h"
#include "qemu-common.h"
#include "target_signal.h"
-#include "trace.h"
+#include "linux-user/trace.h"
static struct target_sigaltstack target_sigaltstack_used = {
.ss_sp = 0,
--
2.9.3
