[Asterisk-cvs] asterisk/codecs/gsm Makefile,1.14,1.15

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/codecs/gsm
In directory mongoose.digium.com:/tmp/cvs-serv21170/codecs/gsm

Modified Files:
	Makefile 
Log Message:
Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/gsm/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	13 Jun 2004 21:25:10 -0000	1.14
+++ Makefile	22 Jun 2004 17:42:13 -0000	1.15
@@ -64,8 +64,8 @@
 # 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 @@
 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)