[Qemu-devel] [PATCH 05/20] add $fmod_inc to CPPFLAGS

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile  |    5 -----
 configure |    2 +-
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index be5452c..3c2ab01 100644
--- a/Makefile
+++ b/Makefile
@@ -90,11 +90,6 @@ obj-$(CONFIG_BRLAPI) += baum.o
 obj-$(CONFIG_WIN32) += tap-win32.o
 obj-$(CONFIG_NOWIN32) += migration-exec.o

-ifdef CONFIG_FMOD
-audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(FMOD_CFLAGS) $(CPPFLAGS)
-endif
-
-
 audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
 audio-obj-$(CONFIG_SDL) += sdlaudio.o
 audio-obj-$(CONFIG_OSS) += ossaudio.o
diff --git a/configure b/configure
index cadaeaf..9b1234c 100755
--- a/configure
+++ b/configure
@@ -1620,7 +1620,7 @@ for drv in $audio_drv_list; do
     echo "$def=y" >> $config_host_mak
     if test "$drv" = "fmod"; then
         LIBS="$LIBS $fmod_lib"
-        echo "FMOD_CFLAGS=$fmod_inc" >> $config_host_mak
+        CPPFLAGS="$CPPFLAGS -I$fmod_inc"
     elif test "$drv" = "oss"; then
         LIBS="$LIBS $oss_lib"
     elif test "$drv" = "alsa"; then
-- 
1.6.2.5