Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index daf22de11e054e48f862b56049bf1176156d8a08..24c51e793a8dba70c861b3464d1f1966aa38b6dc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,7 +617,6 @@ if(ENABLE_PLUGINS)
        set(HAVE_PLUGINS 1)
        set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
        set(PLUGIN_SRC_DIRS
-               plugins/asn1
                plugins/docsis
                plugins/ethercat
                plugins/gryphon

diff --git a/Makefile.am b/Makefile.am
index 3e81b7e958a63dc7c48afb25497f4c4e23b332ac..c86f4637bf4cceb9261cd3202ad5df2872a5305a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -298,7 +298,6 @@ PLATFORM_SRC = \
 if HAVE_PLUGINS
 -include plugins/Custom.make
 plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
-       -dlopen plugins/asn1/asn1.la \
        -dlopen plugins/docsis/docsis.la \
        -dlopen plugins/ethercat/ethercat.la \
        -dlopen plugins/gryphon/gryphon.la \

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 91020c151fc4ac4aa806524cff75990d7b3025b5..92b670bbe5f3b4b3a0b2d489e483d6bc488a63ca 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -892,7 +892,6 @@ SectionGroup "Plugins / Extensions" SecPluginsGroup
 Section "Dissector Plugins" SecPlugins
 ;-------------------------------------------
 SetOutPath '$INSTDIR\plugins\${VERSION}'
-File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll"
 File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll"
 File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll"
 File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll"

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9058bac9311c356abedbb9ce24bee5e8f2e6289a..f51ce173ebce13bb31e2d4151f313f4600041789 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -24,7 +24,6 @@
 -include Custom.make
 
 SUBDIRS = $(_CUSTOM_SUBDIRS_) \
-       asn1 \
        docsis \
        ethercat \
        gryphon \

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 2415d9286b227034223f210a73d3b25eeaa9b8d4..1d073a81324d904da8eb01286d4504d0f1d54a13 100644 (file)
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -7,7 +7,6 @@ include ..\config.nmake
 ## To add a plugin: Add entry to PLUGIN_LIST
 
 PLUGIN_LIST = \
-       asn1        \
        docsis      \
        ethercat    \
        gryphon     \