Switch files in the audio/ directory to include the audio/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- audio/Makefile.objs | 2 ++ audio/alsaaudio.c | 2 +- audio/ossaudio.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 355cb78..dc3a51e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -153,7 +153,7 @@ trace-events-subdirs += hw/acpi trace-events-subdirs += hw/arm trace-events-subdirs += hw/alpha trace-events-subdirs += ui -trace-events-y += audio/trace-events +trace-events-subdirs += audio trace-events-y += net/trace-events trace-events-y += target/arm/trace-events trace-events-y += target/i386/trace-events diff --git a/audio/Makefile.objs b/audio/Makefile.objs index 481d1aa..4eef4b4 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -9,5 +9,7 @@ common-obj-$(CONFIG_PA) += paaudio.o common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o common-obj-y += wavcapture.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o sdlaudio.o-cflags := $(SDL_CFLAGS) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 3652a7b..1111b71 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -26,7 +26,7 @@ #include "qemu-common.h" #include "qemu/main-loop.h" #include "audio.h" -#include "trace.h" +#include "audio/trace.h" #if QEMU_GNUC_PREREQ(4, 3) #pragma GCC diagnostic ignored "-Waddress" diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 0edd7ea..c04da5e 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -28,7 +28,7 @@ #include "qemu/main-loop.h" #include "qemu/host-utils.h" #include "audio.h" -#include "trace.h" +#include "audio/trace.h" #define AUDIO_CAP "oss" #include "audio_int.h" -- 2.9.3
