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: https://origsvn.digium.com/svn/asterisk/trunk@95894 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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

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"
 

include/asterisk/libresample.h

@@ -0,0 +1 @@
+../../main/libresample/include/libresample.h