26 files changed, 53 insertions, 9 deletions
diff --git a/codecs/Makefile b/codecs/Makefile
index f7bde5c50..ef76962e5 100644
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -55,7 +55,4 @@ $(LIBG722):
 
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
 
-codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a
-endif
+codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/libresample/include
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index 66d60169d..718ab88ae 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -24,6 +24,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<depend>res_resample</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/Makefile b/main/Makefile
index fc5fbd747..ffbd4bf7f 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -111,9 +111,6 @@ editline/libedit.a: CHECK_SUBDIR
 db1-ast/libdb1.a: CHECK_SUBDIR
 	CFLAGS="$(ASTCFLAGS)" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
 
-libresample/libresample.a: CHECK_SUBDIR
-	$(MAKE) -f Makefile.asterisk -C libresample libresample.a
-
 ast_expr2.c ast_expr2.h:
 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
 
@@ -155,7 +152,7 @@ else
 MAIN_TGT:=asterisk
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) libresample/libresample.a
+$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
@@ -172,4 +169,3 @@ clean::
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean
 	@$(MAKE) -C minimime clean
-	@$(MAKE) -f Makefile.asterisk -C libresample clean
diff --git a/res/Makefile b/res/Makefile
index cfac3183a..496264f0b 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -47,6 +47,9 @@ ael/ael.tab.c ael/ael.tab.h:
 
 ael/pval.o: ael/pval.c
 
+res_resample.so: libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o
+
 clean::
 	rm -f snmp/*.o
 	rm -f ael/*.o
+	rm -f libresample/src/*.o
diff --git a/main/libresample/LICENSE.txt b/res/libresample/LICENSE.txt
index 4ccd6ccfd..4ccd6ccfd 100644
--- a/main/libresample/LICENSE.txt
+++ b/res/libresample/LICENSE.txt
diff --git a/main/libresample/Makefile.asterisk b/res/libresample/Makefile.asterisk
index 815671a2f..815671a2f 100644
--- a/main/libresample/Makefile.asterisk
+++ b/res/libresample/Makefile.asterisk
diff --git a/main/libresample/Makefile.in b/res/libresample/Makefile.in
index 8d17d19b4..8d17d19b4 100644
--- a/main/libresample/Makefile.in
+++ b/res/libresample/Makefile.in
diff --git a/main/libresample/README.txt b/res/libresample/README.txt
index 14be45b83..14be45b83 100644
--- a/main/libresample/README.txt
+++ b/res/libresample/README.txt
diff --git a/main/libresample/config.guess b/res/libresample/config.guess
index e8c6fc0c3..e8c6fc0c3 100755
--- a/main/libresample/config.guess
+++ b/res/libresample/config.guess
diff --git a/main/libresample/config.sub b/res/libresample/config.sub
index 463186dbf..463186dbf 100755
--- a/main/libresample/config.sub
+++ b/res/libresample/config.sub
diff --git a/main/libresample/configure b/res/libresample/configure
index 638280399..638280399 100755
--- a/main/libresample/configure
+++ b/res/libresample/configure
diff --git a/main/libresample/configure.in b/res/libresample/configure.in
index e676b69f2..e676b69f2 100644
--- a/main/libresample/configure.in
+++ b/res/libresample/configure.in
diff --git a/main/libresample/include/libresample.h b/res/libresample/include/libresample.h
index ca08e044f..ca08e044f 100644
--- a/main/libresample/include/libresample.h
+++ b/res/libresample/include/libresample.h
diff --git a/main/libresample/install-sh b/res/libresample/install-sh
index e9de23842..e9de23842 100755
--- a/main/libresample/install-sh
+++ b/res/libresample/install-sh
diff --git a/main/libresample/src/configtemplate.h b/res/libresample/src/configtemplate.h
index 94ae1cea9..94ae1cea9 100644
--- a/main/libresample/src/configtemplate.h
+++ b/res/libresample/src/configtemplate.h
diff --git a/main/libresample/src/filterkit.c b/res/libresample/src/filterkit.c
index bc92285f2..bc92285f2 100644
--- a/main/libresample/src/filterkit.c
+++ b/res/libresample/src/filterkit.c
diff --git a/main/libresample/src/filterkit.h b/res/libresample/src/filterkit.h
index 9df0ae869..9df0ae869 100644
--- a/main/libresample/src/filterkit.h
+++ b/res/libresample/src/filterkit.h
diff --git a/main/libresample/src/resample.c b/res/libresample/src/resample.c
index 405bdd9d8..405bdd9d8 100644
--- a/main/libresample/src/resample.c
+++ b/res/libresample/src/resample.c
diff --git a/main/libresample/src/resample_defs.h b/res/libresample/src/resample_defs.h
index f1b10d432..f1b10d432 100644
--- a/main/libresample/src/resample_defs.h
+++ b/res/libresample/src/resample_defs.h
diff --git a/main/libresample/src/resamplesubs.c b/res/libresample/src/resamplesubs.c
index c3c095dc0..c3c095dc0 100644
--- a/main/libresample/src/resamplesubs.c
+++ b/res/libresample/src/resamplesubs.c
diff --git a/main/libresample/tests/compareresample.c b/res/libresample/tests/compareresample.c
index 8773c9d4e..8773c9d4e 100644
--- a/main/libresample/tests/compareresample.c
+++ b/res/libresample/tests/compareresample.c
diff --git a/main/libresample/tests/resample-sndfile.c b/res/libresample/tests/resample-sndfile.c
index e780228c1..e780228c1 100644
--- a/main/libresample/tests/resample-sndfile.c
+++ b/res/libresample/tests/resample-sndfile.c
diff --git a/main/libresample/tests/testresample.c b/res/libresample/tests/testresample.c
index a59aa8bfd..a59aa8bfd 100644
--- a/main/libresample/tests/testresample.c
+++ b/res/libresample/tests/testresample.c
diff --git a/main/libresample/win/libresample.dsp b/res/libresample/win/libresample.dsp
index 4ebb51e46..4ebb51e46 100644
--- a/main/libresample/win/libresample.dsp
+++ b/res/libresample/win/libresample.dsp
diff --git a/main/libresample/win/libresample.vcproj b/res/libresample/win/libresample.vcproj
index c23845f47..c23845f47 100644
--- a/main/libresample/win/libresample.vcproj
+++ b/res/libresample/win/libresample.vcproj
diff --git a/res/res_resample.c b/res/res_resample.c
new file mode 100644
index 000000000..ac85c3f43
--- /dev/null
+++ b/res/res_resample.c
@@ -0,0 +1,44 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Copyright (C) 2007, Digium, Inc.
+ *
+ * Russell Bryant <russell@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*!
+ * \file
+ *
+ * \author Russell Bryant <russell@digium.com>
+ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/module.h"
+
+static int load_module(void)
+{
+	return 0;
+}
+
+static int unload_module(void)
+{
+	return -1;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Resampling Support via libresample",
+		.load = load_module,
+		.unload = unload_module,
+	       );