diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 01:00:44 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 01:00:44 +0000 |
| commit | 21969815a0c032a44762a59886766a6c932885f9 (patch) | |
| tree | d9e7bf943c45a0e0aeba13bc434511804f43df90 /main/Makefile | |
| parent | 4ff493aff51bc02da8e49edd7200f57e59e83b98 (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: http://svn.digium.com/svn/asterisk/trunk@95697 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
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 |