Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv16420
Modified Files:
Makefile
Log Message:
fix minor build problem on *BSD (issue #5290)
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- Makefile 25 Sep 2005 20:50:40 -0000 1.208
+++ Makefile 26 Sep 2005 02:08:06 -0000 1.209
@@ -201,11 +201,6 @@
MPG123TARG=linux
endif
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- PROC=$(shell uname -m)
- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
-L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
PWD=$(shell pwd)
GREP=grep
@@ -218,6 +213,11 @@
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
#-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE)
+ifeq ($(findstring BSD,${OSARCH}),BSD)
+ PROC=$(shell uname -m)
+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+endif
+
ifneq ($(PROC),ultrasparc)
ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null
>/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
endif
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs