diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-01-02 01:00:44 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-01-02 01:00:44 +0000 |
| commit | 78f4b2855256c930adea77479e4577f4289a6cfa (patch) | |
| tree | d9e7bf943c45a0e0aeba13bc434511804f43df90 /codecs | |
| parent | e7f195e82ab286c925153ffcff1c9e6e66e2ede2 (diff) | |
Instead of linking libresample into the main Asterisk binary, build it as
res_resample, and mark codec_resample as dependent upon res_resample. This
prevents the linker from optimizing away libresample, and also makes it so the
libresample code isn't linked in to multiple places. (I have another module
in a branch that needs it, too.)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 5 | ||||
| -rw-r--r-- | codecs/codec_resample.c | 4 |
2 files changed, 5 insertions, 4 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$") |