From 8a16c2f0c24925877ba9e2d38fd0b38248a4ab9e Mon Sep 17 00:00:00 2001 From: Matthew Jordan <mjordan@digium.com> Date: Thu, 26 Feb 2015 04:58:38 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432343 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/Makefile | 2 +- channels/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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:: -- GitLab