From 0aca2c116cc8e7639edb3df385aa713c19b9b881 Mon Sep 17 00:00:00 2001 From: markster Date: Sun, 27 Apr 2003 18:13:11 +0000 Subject: More BSD enhancements git-svn-id: http://svn.digium.com/svn/asterisk/trunk@916 f38db490-d61c-443f-a65b-d21fe96a405b --- codecs/Makefile | 2 +- codecs/gsm/Makefile | 10 +++++++--- codecs/ilbc/Makefile | 1 + codecs/lpc10/Makefile | 2 +- codecs/mp3/Makefile | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) (limited to 'codecs') diff --git a/codecs/Makefile b/codecs/Makefile index 1ce2d333f..6341395d3 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -21,7 +21,7 @@ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -CFLAGS+= +CFLAGS+=-fPIC LIBG723=g723.1/libg723.a LIBG723B=g723.1b/libg723b.a diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 01ce9c921..2304169ca 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -55,7 +55,7 @@ PG = # CCFLAGS = -c -O CC = gcc -ansi -pedantic $(OPTIMIZE) -march=$(PROC) -fschedule-insns2 -fomit-frame-pointer -CCFLAGS += -c -DNeedFunctionPrototypes=1 -finline-functions -funroll-loops +CCFLAGS += -c -DNeedFunctionPrototypes=1 -finline-functions -funroll-loops -fPIC LD = $(CC) @@ -175,7 +175,6 @@ GSM_SOURCES = $(SRC)/add.c \ $(SRC)/code.c \ $(SRC)/debug.c \ $(SRC)/decode.c \ - $(SRC)/k6opt.s \ $(SRC)/long_term.c \ $(SRC)/lpc.c \ $(SRC)/preprocess.c \ @@ -190,6 +189,9 @@ GSM_SOURCES = $(SRC)/add.c \ $(SRC)/gsm_option.c \ $(SRC)/short_term.c \ $(SRC)/table.c +ifneq (${OSARCH},OpenBSD) +GSM_SOURCES+= $(SRC)/k6opt.s +endif TOAST_SOURCES = $(SRC)/toast.c \ $(SRC)/toast_lin.c \ @@ -220,7 +222,6 @@ GSM_OBJECTS = $(SRC)/add.o \ $(SRC)/code.o \ $(SRC)/debug.o \ $(SRC)/decode.o \ - $(SRC)/k6opt.o \ $(SRC)/long_term.o \ $(SRC)/lpc.o \ $(SRC)/preprocess.o \ @@ -235,6 +236,9 @@ GSM_OBJECTS = $(SRC)/add.o \ $(SRC)/gsm_option.o \ $(SRC)/short_term.o \ $(SRC)/table.o +ifneq (${OSARCH},OpenBSD) +GSM_OBJECTS+= $(SRC)/k6opt.o +endif TOAST_OBJECTS = $(SRC)/toast.o \ $(SRC)/toast_lin.o \ diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile index 58d357988..16379771e 100755 --- a/codecs/ilbc/Makefile +++ b/codecs/ilbc/Makefile @@ -1,3 +1,4 @@ +CFLAGS+= -fPIC -O3 LIB=libilbc.a OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index bf7f11b3f..83ffc225b 100755 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -22,7 +22,7 @@ LIB_TARGET_DIR = . # WARNINGS = -Wall -Wno-comment -Wno-error -CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) +CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) #fix for PPC processors diff --git a/codecs/mp3/Makefile b/codecs/mp3/Makefile index 44ebc39d1..e8a771fca 100755 --- a/codecs/mp3/Makefile +++ b/codecs/mp3/Makefile @@ -1,7 +1,7 @@ # # LMC section -CFLAGS+= -I../include -Iinclude -O6 -funroll-loops -finline-functions -Wall -Wno-missing-prototypes -Wno-missing-declarations -g +CFLAGS+= -I../include -Iinclude -O6 -funroll-loops -finline-functions -Wall -Wno-missing-prototypes -Wno-missing-declarations -g -fPIC RANLIB=ranlib # the XING decoder objs and dependencies: -- cgit v1.2.3