Fix CFLAGS and LDFLAGS overrides to work for DEBUG and RELEASE modes.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1671 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile.inc

@@ -38,11 +38,9 @@ endif
 # COROSYNC_BUILD can be defined as RELEASE or DEBUG
 #
 ifndef COROSYNC_BUILD
-	COROSYNC_BUILD=DEBUG
+	COROSYNC_BUILD=RELEASE
 endif
 
-# COROSYNC_PROFILE
-
 # default CFLAGS, LDFLAGS
 #
 CFLAGS =
@@ -58,31 +56,22 @@ override CFLAGS += -DLCRSODIR='"$(LCRSODIR)"'
 # build CFLAGS, LDFLAGS
 #
 ifeq (${COROSYNC_BUILD}, RELEASE) 
-	CFLAGS += -O3 -Wall
-# -Wstrict-aliasing=2 TODO sameday fix all of these
-ifndef COROSYNC_PROFILE
-	CFLAGS += -fomit-frame-pointer
-endif
-	LDFLAGS += 
+	override CFLAGS += -O3 -Wall
+	override LDFLAGS += 
 endif
 ifeq (${COROSYNC_BUILD}, DEBUG) 
-	CFLAGS += -O0 -g -Wall -DDEBUG --time
-	LDFLAGS += -g
+	override CFLAGS += -O0 -g -Wall
+	override LDFLAGS += -g
 	ifeq (${COROSYNC_COMPAT}, SOLARIS)
 		CFLAGS += -Werror -DTS_CLASS
 	endif
 endif
 ifeq (${COROSYNC_BUILD}, COVERAGE)
-	CFLAGS += -O0 -g -ftest-coverage -fprofile-arcs
-	LDFLAGS += -g -ftest-coverage -fprofile-arcs
+	override CFLAGS += -O0 -g -ftest-coverage -fprofile-arcs
+	override LDFLAGS += -g -ftest-coverage -fprofile-arcs
 	BUILD_DYNAMIC=0
 endif
 
-ifdef COROSYNC_PROFILE
-	CFLAGS += -pg
-	LDFLAGS += -pg
-endif
-
 # platform specific CFLAGS, LDFLAGS
 #
 ifeq (${COROSYNC_COMPAT}, LINUX)