diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-22 17:42:14 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-22 17:42:14 +0000 |
| commit | ae5c80e1deeae11fa0f3478a6efa03e38971897f (patch) | |
| tree | a3a0875ae4e73c9d9a1fc67f56ffa1ce73fe5457 /codecs/gsm | |
| parent | 8f813d432c685f0b0c25e98261379b083263cf32 (diff) | |
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
Diffstat (limited to 'codecs/gsm')
| -rwxr-xr-x | codecs/gsm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
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) |