[asterisk-commits] kpfleming: trunk r95894 - in /trunk: codecs/ include/asterisk/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Jan  2 12:21:04 2008
New Revision: 95894

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95894
Log:
and now just to keep the libresample party going... if the functions from libresample are going to be in the main Asterisk binary, it makes sense for the header that defines them to be available without any special CFLAGS and to out-of-tree modules building against /usr/include/asterisk

Added:
    trunk/include/asterisk/libresample.h   (with props)
Modified:
    trunk/codecs/Makefile
    trunk/codecs/codec_resample.c

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?view=diff&rev=95894&r1=95893&r2=95894
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Wed Jan  2 12:21:04 2008
@@ -54,5 +54,3 @@
 	@$(MAKE) -C g722 all
 
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
-
-codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include

Modified: trunk/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_resample.c?view=diff&rev=95894&r1=95893&r2=95894
==============================================================================
--- trunk/codecs/codec_resample.c (original)
+++ trunk/codecs/codec_resample.c Wed Jan  2 12:21:04 2008
@@ -39,8 +39,7 @@
 
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-
-#include "libresample.h"
+#include "asterisk/libresample.h"
 
 #include "slin_resample_ex.h"
 

Added: trunk/include/asterisk/libresample.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/libresample.h?view=auto&rev=95894
==============================================================================
--- trunk/include/asterisk/libresample.h (added)
+++ trunk/include/asterisk/libresample.h Wed Jan  2 12:21:04 2008
@@ -1,0 +1,1 @@
+link ../../main/libresample/include/libresample.h

Propchange: trunk/include/asterisk/libresample.h
------------------------------------------------------------------------------
    svn:special = *