aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-02 18:21:04 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-02 18:21:04 +0000
commit3f0b6d8d866fcdf0ce0826e8702942cd3ff7768c (patch)
tree2ff66e3bb734b5ca436a8b4505357cc1df83bff5 /codecs
parenta7c4d3677cefcad8eddc25d427125f4ae6c9e560 (diff)
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
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95894 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/Makefile2
-rw-r--r--codecs/codec_resample.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/codecs/Makefile b/codecs/Makefile
index a09f67149..d96e7cf57 100644
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -54,5 +54,3 @@ $(LIBG722):
@$(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
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index 66d60169d..76641ce50 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -39,8 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/translate.h"
-
-#include "libresample.h"
+#include "asterisk/libresample.h"
#include "slin_resample_ex.h"