[asterisk-commits] mmichelson: branch 1.8 r368927 - /branches/1.8/main/Makefile

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jun 14 10:23:10 2012
New Revision: 368927

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368927
Log:
Revert Makefile change to remove embedding res_adsi.so

The change has resulted in a linking error for certain versions
of GCC. This is much worse than the original issue, so for now,
temporarily revert the change. A more thorough change will be
sought out.


Modified:
    branches/1.8/main/Makefile

Modified: branches/1.8/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/Makefile?view=diff&rev=368927&r1=368926&r2=368927
==============================================================================
--- branches/1.8/main/Makefile (original)
+++ branches/1.8/main/Makefile Thu Jun 14 10:23:10 2012
@@ -26,6 +26,9 @@
 # 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)