From ae5c80e1deeae11fa0f3478a6efa03e38971897f Mon Sep 17 00:00:00 2001
From: markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 22 Jun 2004 17:42:14 +0000
Subject: Merge major BSD mutex and symbol conflict patches (bug #1816) (link
 patch still pending)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3273 f38db490-d61c-443f-a65b-d21fe96a405b
---
 codecs/gsm/Makefile   | 6 +++---
 codecs/lpc10/Makefile | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'codecs')

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 1cfa939e1..9105ef4f3 100755
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -64,8 +64,8 @@ PG =
 # CC		= /usr/lang/acc
 # CCFLAGS 	= -c -O
 
-CC		= gcc $(OPTIMIZE) -fomit-frame-pointer 
-CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
+CC		?= gcc
+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
 
 LD 		= $(CC)
 
@@ -150,7 +150,7 @@ INC	= $(ROOT)/inc
 DEBUG	= -DNDEBUG
 ######### Remove -DNDEBUG to enable assertions.
 
-CFLAGS	= $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
+CFLAGS += $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
 	$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
 ######### It's $(CC) $(CFLAGS)
 
diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile
index af8d907f6..cd1e973ef 100755
--- a/codecs/lpc10/Makefile
+++ b/codecs/lpc10/Makefile
@@ -3,7 +3,7 @@
 # 
 
 # default C compiler
-CC= gcc
+CC?= gcc
 
 # 
 # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
@@ -22,11 +22,12 @@ LIB_TARGET_DIR = .
 # 
 
 WARNINGS = -Wall -Wno-comment -Wno-error
-CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
 #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
 
 #fix for PPC processors and ALPHA too
 ifneq ($(OSARCH),Darwin)
+ifneq ($(findstring BSD,${OSARCH}),BSD)
 ifneq ($(PROC),ppc)
 ifneq ($(PROC),x86_64)
 ifneq ($(PROC),alpha)
@@ -35,6 +36,7 @@ endif
 endif
 endif
 endif
+endif
 
 LIB = $(LIB_TARGET_DIR)/liblpc10.a
 
-- 
cgit v1.2.3