Fix Makefile weirdness.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2285 c046a42c-6fe2-441c-8c8c-71466251a162

2 files changed, 2 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index f0a8199f9..52ec957a2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,14 @@ include config-host.mak
 .PHONY: all clean distclean dvi info install install-doc tar tarbin \
 	speed test test2 html dvi info
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
+CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
 ifeq ($(ARCH),sparc)
 CFLAGS+=-mcpu=ultrasparc
 endif
-LDFLAGS=-g
+LDFLAGS+=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 TOOLS=qemu-img$(EXESUF)
diff --git a/configure b/configure
index cc4bd3fa9..70d557a5d 100755
--- a/configure
+++ b/configure
@@ -243,11 +243,6 @@ for opt do
   esac
 done
 
-# Checking for CFLAGS
-if test -z "$CFLAGS"; then
-    CFLAGS="-O2"
-fi
-
 if test x"$show_help" = x"yes" ; then
 cat << EOF