[Asterisk-cvs] asterisk/codecs/lpc10 Makefile,1.10,1.11

[markster at lists.digium.com]

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

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/lpc10/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	15 Mar 2004 16:51:58 -0000	1.10
+++ Makefile	22 Jun 2004 17:42:14 -0000	1.11
@@ -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 @@
 # 
 
 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
 
 LIB = $(LIB_TARGET_DIR)/liblpc10.a