--- Makefile 2006-02-19 02:10:00.000000000 +0100 +++ Makefile.oden 2006-02-19 02:12:47.000000000 +0100 @@ -17,13 +17,8 @@ # app_conference defines which can be passed on the command-line # -INSTALL_PREFIX := /opt/horizon -INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules - -ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include - # turn app_conference debugging on or off ( 0 == OFF, 1 == ON ) -APP_CONFERENCE_DEBUG := 1 +APP_CONFERENCE_DEBUG := 0 # 0 = OFF 1 = astdsp 2 = speex SILDET := 2 @@ -43,24 +38,10 @@ INSTALL = install CC = gcc -INCLUDE = -I$(ASTERISK_INCLUDE_DIR) LIBS = -ldl -lpthread -lm DEBUG := -g -CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -#CFLAGS += -O2 -#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math -# PERF: below is 10% faster than -O2 or -O3 alone. -#CFLAGS += -O3 -ffast-math -funroll-loops -# below is another 5% faster or so. -CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant - -# this is fun for PPC -#CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic - -# this is fun for x86 -CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 - +CFLAGS+ = -D_REENTRANT -D_GNU_SOURCE -fPIC # adding -msse -mfpmath=sse has little effect. #CFLAGS += -O3 -msse -mfpmath=sse @@ -102,10 +83,10 @@ rm -f *.so *.o $(OBJS) app_conference.so : $(OBJS) - $(CC) -pg -shared -Xlinker -x -o $@ $(OBJS) + $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $(OBJS) vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o - $(CC) $(PROFILE) -o $@ $^ -lm + $(CC) $(CFLAGS) $(PROFILE) -o $@ $^ -lm install: all for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(INSTALL_MODULES_DIR) ; done