diff options
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/Makefile | 72 | ||||
-rw-r--r-- | codecs/codec_gsm.c | 10 | ||||
-rw-r--r-- | codecs/codec_speex.c | 7 | ||||
-rw-r--r-- | codecs/gsm/Makefile | 3 | ||||
-rw-r--r-- | codecs/ilbc/Makefile | 2 | ||||
-rw-r--r-- | codecs/lpc10/Makefile | 2 |
6 files changed, 40 insertions, 56 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 498788342..6be3e9bbb 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,14 +11,7 @@ # the GNU General Public License # -MODS:=$(patsubst %.c,%.so,$(wildcard codec_*.c)) - -ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols - CYGSOLIB=-L.. -L. -lasterisk.dll -else - CFLAGS+=-fPIC -endif +MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%.so,$(wildcard codec_*.c))) ifeq ($(wildcard g723.1/coder.c),) MODS:=$(filter-out codec_g723_1.so,$(MODS)) @@ -31,33 +24,12 @@ ifneq ($(wildcard g723.1b/coder2.c),) LIBG723B=g723.1b/libg723b.a endif -SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex -SPEEX_SYSTEM_HEADERS:=$(firstword $(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h))) -ifeq (${SPEEX_SYSTEM_HEADERS},) - MODS:=$(filter-out codec_speex.so,$(MODS)) -else - CFLAGS+=-I$(subst /speex.h,,${SPEEX_SYSTEM_HEADERS}) - LIBSPEEX=-lspeex -lm -endif - ifeq ($(wildcard ilbc/iLBC_decode.h),) MODS:=$(filter-out codec_ilbc.so,$(MODS)) else LIBILBC=ilbc/libilbc.a endif -LIBGSM_PATH:=/usr/local/include /usr/include -LIBGSM_SYSTEM_HEADERS:=$(firstword $(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h))) -ifneq ($(LIBGSM_SYSTEM_HEADERS),) - LIBGSM=-lgsm - LIBGSMT= - CFLAGS+=-DUSE_EXTERNAL_GSM_LIB -else - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=$(LIBGSM) - CFLAGS+=-I. -endif - LIBLPC10=lpc10/liblpc10.a all: depend $(MODS) @@ -74,43 +46,57 @@ clean: clean-depend $(MAKE) -C ilbc clean $(LIBG723): - $(MAKE) -C g723.1 all + CFLAGS="$(ASTCFLAGS)" $(MAKE) -C g723.1 all -$(LIBGSM): - $(MAKE) -C gsm lib/libgsm.a +gsm/lib/libgsm.a: + CFLAGS="$(ASTCFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a $(LIBG723B): - $(MAKE) -C g723.1b all + CFLAGS="$(ASTCFLAGS)" $(MAKE) -C g723.1b all $(LIBLPC10): - $(MAKE) -C lpc10 all + CFLAGS="$(ASTCFLAGS)" $(MAKE) -C lpc10 all $(LIBILBC): - $(MAKE) -C ilbc all + CFLAGS="$(ASTCFLAGS)" $(MAKE) -C ilbc all codec_ilbc.so: codec_ilbc.o $(LIBILBC) - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBILBC) + $(CC) $(SOLINK) -o $@ $< $(LIBILBC) codec_g723_1.so : codec_g723_1.o $(LIBG723) - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBG723) + $(CC) $(SOLINK) -o $@ $< $(LIBG723) codec_g723_1b.o : codec_g723_1.c $(CC) -c -o $@ $(CFLAGS) -DANNEX_B -Dsingle $< codec_g723_1b.so : codec_g723_1b.o $(LIBG723B) - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBG723B) -lm + $(CC) $(SOLINK) -o $@ $< $(LIBG723B) -lm + +ifeq ($(GSM_LIB),internal) +codec_gsm.o: codec_gsm.c + $(CC) -c -o $@ $(CFLAGS) -Igsm/inc $< + +codec_gsm.so: codec_gsm.o gsm/lib/libgsm.a + $(CC) $(SOLINK) -o $@ $< gsm/lib/libgsm.a +else +codec_gsm.o: codec_gsm.c + $(CC) -c -o $@ $(CFLAGS) $(GSM_INCLUDE) $< + +codec_gsm.so: codec_gsm.o + $(CC) $(SOLINK) -o $@ $< $(GSM_LIB) +endif -codec_gsm.so: codec_gsm.o $(LIBGSMT) - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBGSM) +codec_speex.o: codec_speex.c + $(CC) -c -o $@ $(CFLAGS) $(SPEEX_INCLUDE) $< codec_speex.so: codec_speex.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBSPEEX) + $(CC) $(SOLINK) -o $@ $< $(SPEEX_LIB) codec_lpc10.so: codec_lpc10.o $(LIBLPC10) - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBLPC10) -lm + $(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm %.so : %.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} + $(CC) $(SOLINK) -o $@ $< ifneq ($(wildcard .depend),) include .depend diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index e9a85bc38..fc13debbc 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -26,6 +26,10 @@ * \ingroup codecs */ +/*** MODULEINFO + <depend>libgsm</depend> + ***/ + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> @@ -46,11 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/utils.h" -#ifdef USE_EXTERNAL_GSM_LIB -#include <gsm/gsm.h> -#else -#include "gsm/inc/gsm.h" -#endif +#include "gsm.h" #include "../formats/msgsm.h" diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index 2f31fb4d5..5f871b460 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -27,13 +27,17 @@ * \ingroup codecs */ +/*** MODULEINFO + <depend>libspeex</depend> + ***/ + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> #include <netinet/in.h> #include <string.h> #include <stdio.h> -#include <speex.h> +#include <speex/speex.h> /* We require a post 1.1.8 version of Speex to enable preprocessing and better type handling */ @@ -519,3 +523,4 @@ static const char *key(void) } STD_MOD(MOD_1, reload, NULL, NULL); + diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index dc92cf2f6..6b1b1815c 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -73,10 +73,7 @@ PG = CC ?= gcc CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops $(OPTIMIZE) -ifneq ($(findstring CYGWIN,${OSARCH}),CYGWIN) CCFLAGS += -fPIC -endif - LD = $(CC) diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile index 1540c140f..c916ff3dd 100644 --- a/codecs/ilbc/Makefile +++ b/codecs/ilbc/Makefile @@ -1,8 +1,6 @@ ARCH=$(PROC) CFLAGS+=-Wall -O3 -funroll-loops -ifneq (${OSARCH},CYGWIN) CFLAGS += -fPIC -endif LIB=libilbc.a OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index b56a59ba4..e52ca19b6 100644 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -23,9 +23,7 @@ LIB_TARGET_DIR = . WARNINGS = -Wall -Wno-comment -Wno-error CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -ifneq (${OSARCH},CYGWIN) CFLAGS += -fPIC -endif #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) #fix for PPC processors and ALPHA, And UltraSparc too |