[Asterisk-cvs] asterisk/formats Makefile,1.22,1.23

[kpfleming]

Update of /usr/cvsroot/asterisk/formats
In directory mongoose.digium.com:/tmp/cvs-serv15792/formats

Modified Files:
	Makefile 
Log Message:
clean up, use make functions instead of subshells, remove unused stuff


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	20 Jul 2005 00:25:54 -0000	1.22
+++ Makefile	30 Aug 2005 02:54:02 -0000	1.23
@@ -16,15 +16,22 @@
 	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 @@
 	$(CC) $(SOLINK) -o $@ $<
 
 ifneq ($(wildcard .depend),)
-include .depend
+  include .depend
 endif
 
 format_mp3.so : format_mp3.o