From ecd357cf627ab982ca6aade77204f01229b9ce97 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <rco@iptel.org>
Date: Wed, 26 Sep 2007 13:20:56 +0000
Subject: [PATCH] see last commit ;-)

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@459 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 Makefile.defs | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index cc640c37..5f20bb19 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -7,7 +7,7 @@ EXTRAVERSION =
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-LD_FLAGS = -lm
+LDFLAGS = -lm
 
 OS     = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
 
@@ -21,6 +21,7 @@ ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
 			-e s/armv4l/arm/ -e "s/Power Macintosh/ppc/" \
 			-e "s/cobalt/mips2/" \
 			-e s/amd64/x86_64/ )
+
 # fix sparc -> sparc64
 ifeq ($(ARCH),sparc)
 	ifeq ($(shell uname -m),sun4u)
@@ -29,52 +30,48 @@ ifeq ($(ARCH),sparc)
 endif
 
 # need OS specific for this ?
-GPP ?= g++
-GCC ?= gcc
+CXX = g++
+CC = gcc
+LD = $(CC)
 
-CXX_FLAGS ?= -Wall -Wno-reorder -fPIC -g \
-	  -O2 \
-	  -D_DEBUG \
-	  -D_THREAD_SAFE -D_REENTRANT \
-	  -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
-	  -DOS='"$(OS)"' 	\
-#         -DOpenSER \
-#	  -DSUPPORT_IPV6
 
-C_FLAGS ?= -Wall -fPIC -g \
-	  -O2 \
-	  -D_DEBUG \
+CXXFLAGS := -Wall -Wno-reorder -fPIC -g \
+	    -O2 $(EXTRA_CXXFLAGS)
+
+CPPFLAGS += -D_DEBUG \
 	  -D_THREAD_SAFE -D_REENTRANT \
 	  -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
 	  -DOS='"$(OS)"' 	\
 #         -DOpenSER \
 #	  -DSUPPORT_IPV6
 
+CFLAGS := -Wall -fPIC -g -O2 $(EXTRA_CFLAGS)
+
 ifeq ($(DEBUG_PLAYOUT), yes)
-CXX_FLAGS +=  -DDEBUG_PLAYOUTBUF
+CPPFLAGS +=  -DDEBUG_PLAYOUTBUF
 endif
 
 TARGET =
 ifeq ($(OS), linux)
-	LD_FLAGS +=  -ldl -rdynamic -lpthread
+	LDFLAGS +=  -ldl -rdynamic -lpthread
 else
 ifeq ($(OS), freebsd)
-	LD_FLAGS += -rdynamic -pthread
+	LDFLAGS += -rdynamic -pthread
 else
 ifeq ($(OS), openbsd)
-	LD_FLAGS += -rdynamic -pthread
+	LDFLAGS += -rdynamic -pthread
 else
 ifeq ($(OS), netbsd)
-	LD_FLAGS += -rdynamic -pthread
+	LDFLAGS += -rdynamic -pthread
 else
-	LD_FLAGS+=  -ldl -lsocket -lnsl -lpthread
+	LDFLAGS+= -ldl -lsocket -lnsl -lpthread
 	TARGET=solaris
 endif
 endif
 endif
 endif
 
-LIB_LD_FLAGS = $(LD_FLAGS) -shared
+LIB_LDFLAGS = $(LDFLAGS) -shared
 
 # install path is $(basedir) $(prefix) 
 # example: