From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92D-0007ah-Pj for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX927-0005yV-48 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX926-0005yO-UX for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:35 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D5C3481 for ; Tue, 9 Aug 2016 15:33:34 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:19 +0100 Message-Id: <1470756748-18933-52-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 51/60] trace: switch audio/ directory to modular trace.h file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" 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 --- 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 b81db74..bcd830e 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-i386/trace-events trace-events-y += target-sparc/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.7.4