diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:05:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:05:30 +0000 |
| commit | 933ddf410aee42eac51dfd9f3d5e5c4a98efaf22 (patch) | |
| tree | b7166e1e0969a7109403e9f88178ff8e12022b68 /main/Makefile | |
| parent | 5bdb7dc6b72e49a4e20c00ad0345baed6169cf99 (diff) | |
go back to including libresample in the main Asterisk binary, but this time including a small hack to ensure that it does get linked in (and also modify the strip_nonapi script to leave the resample_<foo> symbols alone)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95816 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index ffbd4bf7f..304d48614 100644 --- a/main/Makefile +++ b/main/Makefile @@ -111,6 +111,9 @@ 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 @@ -127,6 +130,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) +translate.o: ASTCFLAGS+=-Ilibresample/include + AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS)) AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep))) AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep))) @@ -152,7 +157,7 @@ else MAIN_TGT:=asterisk endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) +$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) libresample/libresample.a @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) @@ -169,3 +174,4 @@ clean:: @$(MAKE) -C db1-ast clean @$(MAKE) -C stdtime clean @$(MAKE) -C minimime clean + @$(MAKE) -f Makefile.asterisk -C libresample clean |