]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Remove forced linking of res_adsi.o
authorMark Michelson <mmichelson@digium.com>
Wed, 13 Jun 2012 19:36:39 +0000 (19:36 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 13 Jun 2012 19:36:39 +0000 (19:36 +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

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

main/Makefile

index 728b80591a06cb14fda2b06791135c9949e61f12..e29e88fbde63748f98198bced6ff8d653dabd20d 100644 (file)
@@ -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)