[asterisk-commits] mjordan: trunk r432343 - in /trunk: ./ apps/Makefile channels/Makefile

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Feb 25 22:58:38 2015
New Revision: 432343

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=432343
Log:
make: Remove 'res_features' from libraries to link against with cygwin/mingw32

Both the apps and channels Makefiles still listed 'res_features' as modules to
link against when compiling for cygwin or mingw32. This module hasn't existed
for quite some time.

ASTERISK-18105 #close
Reported by: feyfre
........

Merged revisions 432341 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 432342 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/apps/Makefile
    trunk/channels/Makefile

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

Modified: trunk/apps/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/Makefile?view=diff&rev=432343&r1=432342&r2=432343
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Wed Feb 25 22:58:38 2015
@@ -34,6 +34,6 @@
 $(subst .c,.o,$(wildcard confbridge/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,app_confbridge)
 
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  LIBS+= -lres_features.so -lres_ael_share.so -lres_monitor.so -lres_speech.so
+  LIBS+= -lres_ael_share.so -lres_monitor.so -lres_speech.so
   LIBS+= -lres_smdi.so
 endif

Modified: trunk/channels/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/Makefile?view=diff&rev=432343&r1=432342&r2=432343
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Wed Feb 25 22:58:38 2015
@@ -20,7 +20,7 @@
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  LIBS+= -lres_monitor.so -lres_features.so
+  LIBS+= -lres_monitor.so
 endif
 
 clean::