Revert "Make sure to use SDL_CFLAGS everywhere we include SDL headers"

This reverts commit accceed914ff6cd0ba9258ff76659141ea24bb62.

This has proven to cause all sorts of odd build breakages.  I don't think it's
quite ready for stable.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile b/Makefile
index 28944966081ce3eb2519f808d22ce979f8561f41..4f7a55ae01c613ccfbe7f2e1c4dee252f7b98ce3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ cocoa.o: cocoa.m
 
 sdl.o: sdl.c keymaps.c sdl_keysym.h
 
-sdl.o audio/sdlaudio.o baum.o: CFLAGS += $(SDL_CFLAGS)
+sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS)
 
 vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h
 

diff --git a/Makefile.target b/Makefile.target
index ba315d6cc9284ca9c310e4f966fa466ba6e76a5c..f33f7621f7ec23dace5ff36f15bbddf7d8632cad 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -724,8 +724,6 @@ LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
 
-vl.o: CFLAGS+=$(SDL_CFLAGS)
-
 $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
 
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a