Remove forced linking of res_adsi.o
authorMark Michelson <mmichelson@digium.com>
Wed, 13 Jun 2012 19:51:08 +0000 (19:51 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 13 Jun 2012 19:51:08 +0000 (19:51 +0000)
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
........

Merged revisions 368873 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 368885 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368886 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/Makefile

index 0662f22..4d446f0 100644 (file)
@@ -30,10 +30,6 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o))
 # objects use it.
 OBJS+=stdtime/localtime.o
 
-ifneq ($(firstword $(subst :, ,$(WEAKREF))),1)
-OBJS+=../res/res_adsi.o
-endif
-
 ASTSSL_LIBS:=$(OPENSSL_LIB)
 AST_LIBS+=$(BKTR_LIB)
 AST_LIBS+=$(LIBXML2_LIB)