Kill libwscodecs plugin library, just use plugins

Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5
Reviewed-on: https://code.wireshark.org/review/33068
Reviewed-by: Anders Broman <a.broman58@gmail.com>

12 files changed, 12 insertions, 12 deletions

diff --git a/plugins/codecs/G711/CMakeLists.txt b/plugins/codecs/G711/CMakeLists.txt
index 642d32a3ae..94fa07a914 100644
--- a/plugins/codecs/G711/CMakeLists.txt
+++ b/plugins/codecs/G711/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 
 add_plugin_library(g711 codecs)
 
-target_link_libraries(g711 wscodecs)
+target_link_libraries(g711 wsutil)
 
 install_plugin(g711 codecs)
 
diff --git a/plugins/codecs/G711/G711decode.c b/plugins/codecs/G711/G711decode.c
index 19a7f32893..bd1aae42c2 100644
--- a/plugins/codecs/G711/G711decode.c
+++ b/plugins/codecs/G711/G711decode.c
@@ -12,7 +12,7 @@
 
 #include <glib.h>
 
-#include "codecs/codecs.h"
+#include "wsutil/codecs.h"
 #include "ws_attributes.h"
 
 static gint16 ulaw_exp_table[256] = {
diff --git a/plugins/codecs/G722/CMakeLists.txt b/plugins/codecs/G722/CMakeLists.txt
index 2350cb0909..8f2b02270e 100644
--- a/plugins/codecs/G722/CMakeLists.txt
+++ b/plugins/codecs/G722/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 
 add_plugin_library(g722 codecs)
 
-target_link_libraries(g722 wscodecs ${SPANDSP_LIBRARIES})
+target_link_libraries(g722 wsutil ${SPANDSP_LIBRARIES})
 
 target_include_directories(g722 SYSTEM PRIVATE ${SPANDSP_INCLUDE_DIRS})
 
diff --git a/plugins/codecs/G722/G722decode.c b/plugins/codecs/G722/G722decode.c
index 789e31b478..c58b8e5079 100644
--- a/plugins/codecs/G722/G722decode.c
+++ b/plugins/codecs/G722/G722decode.c
@@ -13,7 +13,7 @@
 #include <glib.h>
 
 #include "spandsp.h"
-#include "codecs/codecs.h"
+#include "wsutil/codecs.h"
 #include "ws_attributes.h"
 
 static void *
diff --git a/plugins/codecs/G726/CMakeLists.txt b/plugins/codecs/G726/CMakeLists.txt
index e598cb82c0..2b6c215e7b 100644
--- a/plugins/codecs/G726/CMakeLists.txt
+++ b/plugins/codecs/G726/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 
 add_plugin_library(g726 codecs)
 
-target_link_libraries(g726 wscodecs ${SPANDSP_LIBRARIES})
+target_link_libraries(g726 wsutil ${SPANDSP_LIBRARIES})
 
 target_include_directories(g726 SYSTEM PRIVATE ${SPANDSP_INCLUDE_DIRS})
 
diff --git a/plugins/codecs/G726/G726decode.c b/plugins/codecs/G726/G726decode.c
index 86b61c0cbd..2c2ff6d167 100644
--- a/plugins/codecs/G726/G726decode.c
+++ b/plugins/codecs/G726/G726decode.c
@@ -13,7 +13,7 @@
 #include <glib.h>
 
 #include "spandsp.h"
-#include "codecs/codecs.h"
+#include "wsutil/codecs.h"
 #include "ws_attributes.h"
 
 typedef struct _g726_codec_ctx {
diff --git a/plugins/codecs/G729/CMakeLists.txt b/plugins/codecs/G729/CMakeLists.txt
index f4c1765f27..aa3edc0196 100644
--- a/plugins/codecs/G729/CMakeLists.txt
+++ b/plugins/codecs/G729/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 
 add_plugin_library(g729 codecs)
 
-target_link_libraries(g729 wscodecs ${BCG729_LIBRARIES})
+target_link_libraries(g729 wsutil ${BCG729_LIBRARIES})
 
 target_include_directories(g729 SYSTEM PRIVATE ${BCG729_INCLUDE_DIRS})
 
diff --git a/plugins/codecs/G729/G729decode.c b/plugins/codecs/G729/G729decode.c
index e2308f36f8..a54b3c76c9 100644
--- a/plugins/codecs/G729/G729decode.c
+++ b/plugins/codecs/G729/G729decode.c
@@ -13,7 +13,7 @@
 #include <glib.h>
 
 #include "bcg729/decoder.h"
-#include "codecs/codecs.h"
+#include "wsutil/codecs.h"
 #include "ws_attributes.h"
 
 static void *
diff --git a/plugins/codecs/l16_mono/CMakeLists.txt b/plugins/codecs/l16_mono/CMakeLists.txt
index 51589c37da..b549875848 100644
--- a/plugins/codecs/l16_mono/CMakeLists.txt
+++ b/plugins/codecs/l16_mono/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 
 add_plugin_library(l16mono codecs)
 
-target_link_libraries(l16mono wscodecs)
+target_link_libraries(l16mono wsutil)
 
 install_plugin(l16mono codecs)
 
diff --git a/plugins/codecs/l16_mono/l16decode.c b/plugins/codecs/l16_mono/l16decode.c
index 1c60ab225d..5b6411901a 100644
--- a/plugins/codecs/l16_mono/l16decode.c
+++ b/plugins/codecs/l16_mono/l16decode.c
@@ -13,7 +13,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "codecs/codecs.h"
+#include "wsutil/codecs.h"
 #include "ws_attributes.h"
 
 void codec_register_l16(void);
diff --git a/plugins/codecs/sbc/CMakeLists.txt b/plugins/codecs/sbc/CMakeLists.txt
index bf068ed5e3..0cd2ba8eee 100644
--- a/plugins/codecs/sbc/CMakeLists.txt
+++ b/plugins/codecs/sbc/CMakeLists.txt
@@ -39,7 +39,7 @@ register_plugin_files(plugin.c
 
 add_plugin_library(sbc codecs)
 
-target_link_libraries(sbc wscodecs ${SBC_LIBRARIES})
+target_link_libraries(sbc wsutil ${SBC_LIBRARIES})
 
 target_include_directories(sbc SYSTEM PRIVATE ${SBC_INCLUDE_DIRS})
 
diff --git a/plugins/codecs/sbc/sbc.c b/plugins/codecs/sbc/sbc.c
index 3992cd3840..1014efb72f 100644
--- a/plugins/codecs/sbc/sbc.c
+++ b/plugins/codecs/sbc/sbc.c
@@ -15,7 +15,7 @@
 #include <glib.h>
 #include <sbc/sbc.h>
 
-#include "codecs/codecs.h"
+#include "wsutil/codecs.h"
 
 #define SBC_BUFFER 8192