diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-30 02:54:02 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-30 02:54:02 +0000 |
commit | 475a3fdb24b2b6f0ec51f3948ec1d83a7f09febf (patch) | |
tree | 896e31d97c0252ad5828e553dcdebef76842f107 /formats | |
parent | cd0067f95a3d30b8c59cf745e051810295fc96db (diff) |
clean up, use make functions instead of subshells, remove unused stuff
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6449 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rwxr-xr-x | formats/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/formats/Makefile b/formats/Makefile index ea0efee80..823515c24 100755 --- a/formats/Makefile +++ b/formats/Makefile @@ -16,15 +16,22 @@ FORMAT_LIBS=format_gsm.so format_wav.so \ format_pcm_alaw.so format_h263.so format_g726.so format_ilbc.so \ format_sln.so format_au.so FORMAT_LIBS+=format_jpeg.so + # -# G723 simple frame is depricated +# G723 simple frame is deprecated # FORMAT_LIBS+=format_g723.so # # OGG/Vorbis format # -FORMAT_LIBS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h ]; then echo "format_ogg_vorbis.so" ; fi) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) + FORMAT_LIBS+=format_ogg_vorbis.so +endif + +ifeq ($(findstring BSD,${OSARCH}),BSD) + CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib +endif GSMLIB=../codecs/gsm/lib/libgsm.a @@ -39,7 +46,7 @@ clean: $(CC) $(SOLINK) -o $@ $< ifneq ($(wildcard .depend),) -include .depend + include .depend endif format_mp3.so : format_mp3.o |