From 9519f6c5f4e8e0fb400d85b977d9f88b26f725b5 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 30 Aug 2005 02:54:02 +0000 Subject: clean up, use make functions instead of subshells, remove unused stuff git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6449 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- formats/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'formats/Makefile') 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 -- cgit v1.2.3