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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@318352 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/Makefile b/res/Makefile
index 009c7e6ad779eb3cf8314da734a1860c5aafaccc..14fbf6488dd0b3d28d147200d4057e4d5f4638d8 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -22,9 +22,6 @@ include $(ASTTOPDIR)/Makefile.moddir_rules
 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

diff --git a/res/res_features.exports.in b/res/res_features.exports.in
deleted file mode 100644 (file)
index 0575e98..0000000
--- a/res/res_features.exports.in
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-       global:
-               LINKER_SYMBOL_PREFIXast_bridge_call;
-               LINKER_SYMBOL_PREFIXast_masq_park_call;
-               LINKER_SYMBOL_PREFIXast_park_call;
-               LINKER_SYMBOL_PREFIXast_parking_ext;
-               LINKER_SYMBOL_PREFIXast_pickup_call;
-               LINKER_SYMBOL_PREFIXast_pickup_ext;
-               LINKER_SYMBOL_PREFIXast_register_feature;
-               LINKER_SYMBOL_PREFIXast_unregister_feature;
-       local:
-               *;
-};