aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--configure.in1
-rw-r--r--epan/dissectors/packet-interlink.c (renamed from plugins/interlink/packet-interlink.c)0
-rw-r--r--packaging/nsis/Makefile.nmake1
-rw-r--r--packaging/nsis/wireshark.nsi1
-rw-r--r--plugins/Makefile.am1
-rw-r--r--plugins/Makefile.nmake1
7 files changed, 0 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index a73c459f69..6ddc6ea72c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -282,7 +282,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
-dlopen plugins/giop/cosnaming.la \
-dlopen plugins/giop/coseventcomm.la \
-dlopen plugins/gryphon/gryphon.la \
- -dlopen plugins/interlink/interlink.la \
-dlopen plugins/irda/irda.la \
-dlopen plugins/m2m/m2m.la \
-dlopen plugins/mate/mate.la \
diff --git a/configure.in b/configure.in
index 3d2072648b..d5fc646331 100644
--- a/configure.in
+++ b/configure.in
@@ -2028,7 +2028,6 @@ AC_OUTPUT(
plugins/ethercat/Makefile
plugins/giop/Makefile
plugins/gryphon/Makefile
- plugins/interlink/Makefile
plugins/irda/Makefile
plugins/m2m/Makefile
plugins/mate/Makefile
diff --git a/plugins/interlink/packet-interlink.c b/epan/dissectors/packet-interlink.c
index c11bcef2bc..c11bcef2bc 100644
--- a/plugins/interlink/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index e627173375..6885ab62d2 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -52,7 +52,6 @@ PLUGINS= \
../../plugins/giop/parlay.dll \
../../plugins/giop/tango.dll \
../../plugins/gryphon/gryphon.dll \
- ../../plugins/interlink/interlink.dll \
../../plugins/irda/irda.dll \
../../plugins/m2m/m2m.dll \
../../plugins/mate/mate.dll \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index fca68ee38d..1a904f992b 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -913,7 +913,6 @@ File "..\..\plugins\giop\cosnaming.dll"
File "..\..\plugins\giop\parlay.dll"
File "..\..\plugins\giop\tango.dll"
File "..\..\plugins\gryphon\gryphon.dll"
-File "..\..\plugins\interlink\interlink.dll"
File "..\..\plugins\irda\irda.dll"
File "..\..\plugins\m2m\m2m.dll"
File "..\..\plugins\opcua\opcua.dll"
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index babd2d17cd..309b940a00 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \
ethercat \
giop \
gryphon \
- interlink \
irda \
m2m \
mate \
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index f7a34acbfe..b0fb679645 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -12,7 +12,6 @@ PLUGIN_LIST = \
ethercat \
giop \
gryphon \
- interlink \
irda \
m2m \
mate \