[asterisk-commits] rmudgett: trunk r318352 - in /trunk: ./ res/Makefile res/res_features.exports.in

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon May  9 18:16:12 2011
New Revision: 318352

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318352
Log:
Merged revisions 318351 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318351 | rmudgett | 2011-05-09 18:15:32 -0500 (Mon, 09 May 2011) | 6 lines
  
  Remove references to res_features and its export file.
  
  The contents of res/res_features.c was moved to into main/features.c
  awhile ago.  There is no longer any need for the res/Makefile to reference
  res_features or the res_features linker exports file to exist.
........

Removed:
    trunk/res/res_features.exports.in
Modified:
    trunk/   (props changed)
    trunk/res/Makefile

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

Modified: trunk/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/res/Makefile?view=diff&rev=318352&r1=318351&r2=318352
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Mon May  9 18:16:12 2011
@@ -22,9 +22,6 @@
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   # cygwin has some dependencies among res_ things.
   # We use order-only dependencies, and then add the libraries as required.
-  res_features.so: | res_monitor.so
-  res_features.so_LIBS:= -lres_monitor.so
-  #
   res_agi.so: | res_speech.so
   res_agi.so_LIBS:= -lres_speech.so
 endif