[asterisk-commits] mmichelson: branch 10 r368885 - in /branches/10: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jun 13 14:36:39 2012
New Revision: 368885

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

Modified:
    branches/10/   (props changed)
    branches/10/main/Makefile

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

Modified: branches/10/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/Makefile?view=diff&rev=368885&r1=368884&r2=368885
==============================================================================
--- branches/10/main/Makefile (original)
+++ branches/10/main/Makefile Wed Jun 13 14:36:39 2012
@@ -26,9 +26,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
 
 AST_LIBS += $(OPENSSL_LIB)
 AST_LIBS += $(BKTR_LIB)