From: Mark Michelson Date: Wed, 13 Jun 2012 19:00:21 +0000 (+0000) Subject: Remove forced linking of res_adsi.o X-Git-Tag: 1.8.15.0-rc1~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6807464547c0db47d177ea91c1a2af9213b3ec4;p=thirdparty%2Fasterisk.git Remove forced linking of res_adsi.o In GCC 4.5+ the result is that Asterisk has a phantom module loaded at startup, claiming to be res_adsi. (closes issue ASTERISK-19920) reported by Leif Madsen git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@368873 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/Makefile b/main/Makefile index 67f8b2ea08..72465e56df 100644 --- a/main/Makefile +++ b/main/Makefile @@ -26,9 +26,6 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o)) # otherwise modules will not have them available if none of the static # objects use it. OBJS+=stdtime/localtime.o -ifneq ($(firstword $(subst :, ,$(WEAKREF))),1) -OBJS+=../res/res_adsi.o -endif AST_LIBS += $(OPENSSL_LIB) AST_LIBS += $(BKTR_LIB)