From: Matthew Jordan Date: Thu, 26 Feb 2015 04:58:19 +0000 (+0000) Subject: make: Remove 'res_features' from libraries to link against with cygwin/mingw32 X-Git-Tag: 13.3.0-rc1~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de86b30dbaaa616ca1752690c89eaa1bea4798a2;p=thirdparty%2Fasterisk.git 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@432342 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/Makefile b/apps/Makefile index 1d5d2b38d5..1dfe8c8385 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -34,6 +34,6 @@ $(if $(filter app_confbridge,$(EMBEDDED_MODS)),modules.link,app_confbridge.so): $(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 diff --git a/channels/Makefile b/channels/Makefile index b24478a6a6..1f4cff4c76 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -20,7 +20,7 @@ all: _all include $(ASTTOPDIR)/Makefile.moddir_rules ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) - LIBS+= -lres_monitor.so -lres_features.so + LIBS+= -lres_monitor.so endif clean::