diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2014-01-02 17:47:34 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2014-01-02 17:47:34 +0000 |
| commit | 643b57266512d0a2c417cca9737ec3ffa93007f2 (patch) | |
| tree | bbb8bd720c33aa774749e72fe3efacecb28fbf88 | |
| parent | 61c72710a72810a9ac81c9a6adabcbc303f08b6d (diff) | |
| download | wireshark-643b57266512d0a2c417cca9737ec3ffa93007f2.tar.gz | |
Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.
svn path=/trunk/; revision=54559
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/Makefile.nmake | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index daf22de11e..24c51e793a 100644 --- 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 3e81b7e958..c86f4637bf 100644 --- 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 91020c151f..92b670bbe5 100644 --- 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 9058bac931..f51ce173eb 100644 --- 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 2415d9286b..1d073a8132 100644 --- 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 \ |