aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.am
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-09-30 17:48:00 +0100
committerAnders Broman <a.broman58@gmail.com>2017-10-01 16:05:05 +0000
commit6e24d5f69059dd10fd7b5752a9050b79d936a1d4 (patch)
tree3d6e310bf223c87a3a39ae0d73f43668f514b711 /epan/Makefile.am
parente155e9159988a96a85ad1f495a7ce24473e08456 (diff)
Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/Makefile.am')
-rw-r--r--epan/Makefile.am3
1 files changed, 0 insertions, 3 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 8c2eb3f9ac..bc5164a84a 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -484,9 +484,6 @@ plugin_src = \
../plugins/irda/packet-irda.c \
../plugins/irda/packet-sir.c \
../plugins/irda/plugin.c \
- ../plugins/m2m/packet-m2m.c \
- ../plugins/m2m/plugin.c \
- ../plugins/m2m/wimax_tlv.c \
../plugins/Makefile.am.inc \
../plugins/mate/mate_grammar.c \
../plugins/mate/mate_parser.c \