We no longer support the old plugin API so remove it completely from the build system

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29821 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16c4915bf0c58cb71b0a4b7f86f35b6bbb89f8fe..7c66bba4f9f153ea2df8ac967fe1d088be6c905e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ if(APPLE)
 endif()
 
 if(WIN32)
-       add_definitions(-DHAVE_WIN32_LIBWIRESHARK_LIB -D_NEED_VAR_IMPORT_)
+       add_definitions(-D_NEED_VAR_IMPORT_)
        set(WS_VAR_IMPORT "__declspec(dllimport) extern")
 
        # Disable deprecation

diff --git a/config.h.win32 b/config.h.win32
index eff90988ca5733a29070b4af5e55102128ac0480..6cc50556c176d3f742c312b137ac5ad548b3da8b 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -40,17 +40,6 @@
 #define YYTEXT_POINTER 1
 
 #define HAVE_PLUGINS           1
-#define PLUGINS_NEED_ADDRESS_TABLE 1
-
-/* Plugins can also use the import library of libwireshark.dll instead
-   of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE 
-   for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally.
-   Thus Wireshark will be still able to load plugins using the old API. 
-   The macro HAVE_WIN32_LIBWIRESHARK_LIB has to be defined in plugin's 
-   makefile.nmake. A template is available in doc/README.plugins */
-#ifdef HAVE_WIN32_LIBWIRESHARK_LIB
-#undef PLUGINS_NEED_ADDRESS_TABLE
-#endif
 
 /* #undef HAVE_SA_LEN */
 

diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 6bdc36773d1afbaa7093ea8862e7378dfecd9e2e..8207592f656a78c207f2954b96ac4a1d69ad16cd 100644 (file)
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake
index 3d04e32b3433a487027b8388b395020de51da1cd..c651fa648ce0de1beed9b6961f435b834f03da54 100644 (file)
--- a/plugins/easy_codec/Makefile.nmake
+++ b/plugins/easy_codec/Makefile.nmake
@@ -21,7 +21,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 CODEC_OBJECTS = $(CODEC_SRC:.c=.obj)
 

diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake
index 810e87397e9727c0cfcc542d024a3fb697ed8738..1a360e370bacb776f6a3e9e6e97221ea32d38560 100644 (file)
--- a/plugins/ethercat/Makefile.nmake
+++ b/plugins/ethercat/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 13eaf65a6a76004e45a8c87ac1be672241b03b73..313aaded88a9e08da12f7dd24124dd66496eea5d 100644 (file)
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 OBJECTS=packet-cosnaming.obj  packet-coseventcomm.obj packet-tango.obj packet-parlay.obj
 

diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake
index ee662b26ab406c58e8e79988295fb57661c56118..4f7eb894d724036ab28e7326894c96a33c2458ce 100644 (file)
--- a/plugins/m2m/Makefile.nmake
+++ b/plugins/m2m/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index bf33acc2d93fe340519fbbed7b76481748d3d2d5..64eb838d0e373a0e12c676161e5831a2547333d4 100644 (file)
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -25,7 +25,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/opcua/Makefile.nmake
+++ b/plugins/opcua/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/profinet/Makefile.nmake
+++ b/plugins/profinet/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/sercosiii/Makefile.nmake
+++ b/plugins/sercosiii/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
index 89fc5c9376e67622362de7a21158af5863ac653f..79efff19e7a1045a4478e32b35d99d8d35672bdd 100644 (file)
--- a/plugins/stats_tree/Makefile.nmake
+++ b/plugins/stats_tree/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 TAP_OBJECTS = $(TAP_SRC:.c=.obj)
 

diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake
index 5026083b65b254cbdd662744795cab7b8c7b1de6..616c93b7782f59a11e008ddbdea10f157ae052f4 100644 (file)
--- a/plugins/tpg/Makefile.nmake
+++ b/plugins/tpg/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 OBJECTS=packet-mate.obj\
                mate_setup.obj\

diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake
index 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..c01e58bfe7d46a3a7b314f15985665d27486f160 100644 (file)
--- a/plugins/unistim/Makefile.nmake
+++ b/plugins/unistim/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake
index 37220cbb5ca22f27dd9ca8427f9a5cbeb8d679b3..8b05b5cce3d943668f8dc7bc6fef9a5b091f912a 100644 (file)
--- a/plugins/wimax/Makefile.nmake
+++ b/plugins/wimax/Makefile.nmake
@@ -19,7 +19,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 

diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 4d3fcf97b9da590da8189391e003564eaba94873..f5305c0c47c3bc54d41571eba98675402e3f61d6 100644 (file)
--- a/plugins/wimaxasncp/Makefile.nmake
+++ b/plugins/wimaxasncp/Makefile.nmake
@@ -25,7 +25,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS)
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)