[asterisk-commits] mmichelson: trunk r368886 - in /trunk: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jun 13 14:51:08 2012
New Revision: 368886

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368886
Log:
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
........

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

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=368886&r1=368885&r2=368886
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Wed Jun 13 14:51:08 2012
@@ -29,10 +29,6 @@
 # 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
 
 ASTSSL_LIBS:=$(OPENSSL_LIB)
 AST_LIBS+=$(BKTR_LIB)