From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erL65-0005JD-DD for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erL5z-00051s-Fe for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:05:57 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43276 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erL5z-00051P-Bn for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:05:51 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFAC0404084B for ; Thu, 1 Mar 2018 10:05:50 +0000 (UTC) From: Gerd Hoffmann Date: Thu, 1 Mar 2018 11:05:46 +0100 Message-Id: <20180301100547.18962-13-kraxel@redhat.com> In-Reply-To: <20180301100547.18962-1-kraxel@redhat.com> References: <20180301100547.18962-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Gerd Hoffmann This avoids a name clash for CONFIG_SDL, which is used by both sdl video support and sdl audio support. It also more clear that this is a audio driver configuration. Signed-off-by: Gerd Hoffmann --- configure | 2 +- audio/audio_int.h | 2 +- audio/Makefile.objs | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 5ecd538617..105f79ef3d 100755 --- a/configure +++ b/configure @@ -5969,7 +5969,7 @@ if test "$cap_ng" = "yes" ; then fi echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do - def=CONFIG_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]') + def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]') echo "$def=y" >> $config_host_mak done echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak diff --git a/audio/audio_int.h b/audio/audio_int.h index 5b25da0a37..700bd43143 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -25,7 +25,7 @@ #ifndef QEMU_AUDIO_INT_H #define QEMU_AUDIO_INT_H -#ifdef CONFIG_COREAUDIO +#ifdef CONFIG_AUDIO_COREAUDIO #define FLOAT_MIXENG /* #define RECIPROCAL */ #endif diff --git a/audio/Makefile.objs b/audio/Makefile.objs index 8a5ede6e2b..f6ce5c6744 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -1,11 +1,11 @@ common-obj-y = audio.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SDL) += sdlaudio.o -common-obj-$(CONFIG_OSS) += ossaudio.o +common-obj-$(CONFIG_AUDIO_SDL) += sdlaudio.o +common-obj-$(CONFIG_AUDIO_OSS) += ossaudio.o common-obj-$(CONFIG_SPICE) += spiceaudio.o -common-obj-$(CONFIG_COREAUDIO) += coreaudio.o -common-obj-$(CONFIG_ALSA) += alsaaudio.o -common-obj-$(CONFIG_DSOUND) += dsoundaudio.o -common-obj-$(CONFIG_PA) += paaudio.o +common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o +common-obj-$(CONFIG_AUDIO_ALSA) += alsaaudio.o +common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o +common-obj-$(CONFIG_AUDIO_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 -- 2.9.3