Merged revisions 368885 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r368885 | mmichelson | 2012-06-13 14:36:39 -0500 (Wed, 13 Jun 2012) | 11 lines
  
  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
  ........
  
  Merged revisions 368873 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


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

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)