X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=epan%2Fdissectors%2FCMakeLists.txt;h=57da2fdb853143fd0907ef0e27052e1fdac052d5;hb=c5c05911c62f0524c3b88086cf20dedb3d6ef769;hp=efc08b400bc00dce24dc0d88f6b8804a1a2d5ca3;hpb=c3f68b724d811195befdb340bca5093c9ae86f7c;p=metze%2Fwireshark%2Fwip.git

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index efc08b400b..57da2fdb85 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists.txt
 #
-# $Id: CMakeLists.txt 30457 2009-10-10 04:10:20Z krj $
-#
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
@@ -18,81 +16,73 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ADD_CUSTOM_CMAKE_INCLUDE()
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/ncp2222.py
-      -o ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
-    DEPENDS
-      packet-ncp2222.inc
-      ${CMAKE_SOURCE_DIR}/tools/ncp2222.py
-)
+add_subdirectory(asn1 EXCLUDE_FROM_ALL)
+add_subdirectory(dcerpc EXCLUDE_FROM_ALL)
+add_subdirectory(pidl EXCLUDE_FROM_ALL)
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT
-       x11-dissector
-#      x11-declarations.h
-#      x11-enum.h
-#      x11-extension-errors.h
-#      x11-extension-implementation.h
-#      x11-fields
-#      x11-glx-render-enum.h
-#      x11-register-info.h
-    COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
-      <x11-fields
-    COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
-    DEPENDS
-      x11-fields
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
+include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-set(PIDL_DISSECTOR_SRC
-	packet-dcerpc-atsvc.c
-	packet-dcerpc-budb.c
-	packet-dcerpc-butc.c
-	packet-dcerpc-dfs.c
-	packet-dcerpc-drsuapi.c
-	packet-dcerpc-dssetup.c
-	packet-dcerpc-efs.c
-	packet-dcerpc-initshutdown.c
-	packet-dcerpc-nspi.c
-	packet-dcerpc-rfr.c
-	packet-dcerpc-wkssvc.c
-	packet-dcerpc-wzcsvc.c
-	packet-dcerpc-frstrans.c
+add_custom_command(
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
+	COMMAND ${PYTHON_EXECUTABLE}
+		${CMAKE_SOURCE_DIR}/tools/ncp2222.py
+		-o ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
+	DEPENDS
+		packet-ncp2222.inc
+		${CMAKE_SOURCE_DIR}/tools/ncp2222.py
 )
-set(DIRTY_PIDL_DISSECTOR_SRC
-	packet-dcerpc-dnsserver.c
-	packet-dcerpc-eventlog.c
-	packet-dcerpc-lsa.c
-	packet-dcerpc-srvsvc.c
-	packet-dcerpc-winreg.c
+
+add_custom_target(x11-dissector
+	COMMAND ${PERL_EXECUTABLE}
+		${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl ${CMAKE_CURRENT_SOURCE_DIR}
+		< ${CMAKE_CURRENT_SOURCE_DIR}/x11-fields
+	COMMAND ${PERL_EXECUTABLE}
+		${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl ${CMAKE_CURRENT_SOURCE_DIR}
+	DEPENDS
+		x11-fields
+		${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
+		${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
+		${CMAKE_CURRENT_SOURCE_DIR}/xcbproto
+		${CMAKE_CURRENT_SOURCE_DIR}/mesa
 )
-set(ASN1_DISSECTOR_SRC
+
+set_target_properties(x11-dissector PROPERTIES FOLDER "Generated Dissectors/X11")
+
+set(CLEAN_ASN1_DISSECTOR_SRC
+	packet-ansi_map.c
 	packet-acp133.c
 	packet-acse.c
 	packet-ansi_tcap.c
+	packet-atn-ulcs.c
+	packet-atn-cm.c
+	packet-atn-cpdlc.c
+	packet-c1222.c
 	packet-camel.c
 	packet-cdt.c
+	packet-charging_ase.c
 	packet-cmip.c
 	packet-cmp.c
 	packet-cms.c
+	packet-credssp.c
 	packet-crmf.c
 	packet-dap.c
 	packet-disp.c
 	packet-dop.c
 	packet-dsp.c
+	packet-ecp.c
 	packet-ess.c
 	packet-ftam.c
 	packet-goose.c
+	packet-gsm_map.c
+	packet-HI2Operations.c
 	packet-h225.c
 	packet-h235.c
 	packet-h245.c
@@ -104,106 +94,529 @@ set(ASN1_DISSECTOR_SRC
 	packet-h450-ros.c
 	packet-h460.c
 	packet-h501.c
+	packet-hnbap.c
+	packet-idmp.c
+	packet-ilp.c
+	packet-inap.c
+	packet-isdn-sup.c
+	packet-kerberos.c
+	packet-lcsap.c
+	packet-ldap.c
 	packet-logotypecertextn.c
+	packet-lpp.c
+	packet-lppa.c
+	packet-lppe.c
+	packet-lte-rrc.c
+	packet-m2ap.c
+	packet-m3ap.c
 	packet-mms.c
 	packet-mpeg-audio.c
 	packet-mpeg-pes.c
+	packet-mudurl.c
+	packet-nbap.c
+	packet-novell_pkis.c
 	packet-ns_cert_exts.c
 	packet-ocsp.c
-	packet-opsi.c
+	packet-p1.c
+	packet-p22.c
 	packet-p7.c
+	packet-p772.c
+	packet-pcap.c
 	packet-pkcs1.c
+	packet-pkcs12.c
 	packet-pkinit.c
 	packet-pkix1explicit.c
 	packet-pkix1implicit.c
+	packet-pkixac.c
 	packet-pkixproxy.c
 	packet-pkixqualified.c
 	packet-pkixtsp.c
+	packet-pres.c
 	packet-q932.c
 	packet-q932-ros.c
 	packet-qsig.c
 	packet-ranap.c
+	packet-rnsap.c
 	packet-ros.c
-	packet-rtnet.c
+	packet-rrc.c
+	packet-rrlp.c
 	packet-rtse.c
-	packet-s4406.c
+	packet-rua.c
+	packet-s1ap.c
 	packet-sabp.c
+	packet-sbc-ap.c
 	packet-smrse.c
+	packet-snmp.c
 	packet-spnego.c
+	packet-sv.c
+	packet-t124.c
+	packet-t125.c
+	packet-t38.c
+	packet-tcap.c
+	packet-tetra.c
 	packet-ulp.c
 	packet-wlancertextn.c
-	packet-x224.c
+	packet-x2ap.c
 	packet-x509af.c
 	packet-x509ce.c
 	packet-x509if.c
-	packet-x509sat.c 
+	packet-x509sat.c
 )
 
 set(DIRTY_ASN1_DISSECTOR_SRC
-	packet-ansi_map.c
-	packet-charging_ase.c
-	packet-gnm.c
-	packet-gsm_map.c
-	packet-inap.c
-	packet-ldap.c
-	packet-lte-rrc.c
-	packet-nbap.c
-	packet-pcap.c
-	packet-pkcs12.c
-	packet-pres.c
-	packet-rnsap.c
-	packet-rrc.c
-	packet-rrlp.c
-	packet-s1ap.c
-	packet-snmp.c
-	packet-t125.c
-	packet-tcap.c
-	packet-x2ap.c
-	packet-x411.c
-	packet-x420.c
+)
+
+set(ASN1_DISSECTOR_SRC
+	${CLEAN_ASN1_DISSECTOR_SRC}
+	${DIRTY_ASN1_DISSECTOR_SRC}
+)
+
+set(DIRTY_CORBA_IDL_DISSECTOR_SRC
+	packet-cosnaming.c
+	packet-gias.c
+	packet-parlay.c
+	packet-tango.c
+)
+
+set(CLEAN_CORBA_IDL_DISSECTOR_SRC
+	packet-coseventcomm.c
+)
+
+set(CORBA_IDL_DISSECTOR_SRC
+	${CLEAN_CORBA_IDL_DISSECTOR_SRC}
+	${DIRTY_CORBA_IDL_DISSECTOR_SRC}
+)
+
+source_group(dissectors-corba FILES ${CORBA_IDL_DISSECTOR_SRC})
+
+add_library(dissectors-corba OBJECT
+	${CORBA_IDL_DISSECTOR_SRC}
+)
+
+set_target_properties(dissectors-corba PROPERTIES
+	FOLDER "Libs/epan/dissectors"
+	COMPILE_DEFINITIONS "WS_BUILD_DLL"
+	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
+)
+
+if(WIN32 AND "${CMAKE_GENERATOR}" STREQUAL "Visual Studio 12 2013 Win64")
+	# CORBA IDL dissectors are triggering a MSVC 2013 x64 /O2 bug leading to a NULL pointer dereference (see bug 12495)
+	target_compile_options(dissectors-corba PRIVATE $<$<CONFIG:Release>:/Ox> $<$<CONFIG:RelWithDebInfo>:/Ox>)
+endif()
+
+set(NCP2222_DISSECTOR_SRC
+	packet-ncp2222.c
+)
+
+source_group(dissectors-ncp2222 FILES ${NCP2222_DISSECTOR_SRC})
+
+set(DISSECTOR_PUBLIC_HEADERS
+	packet-6lowpan.h
+	packet-a21.h
+	packet-acp133.h
+	packet-acse.h
+	packet-actrace.h
+	packet-adb_service.h
+	packet-afp.h
+	packet-alcap.h
+	packet-ansi_a.h
+	packet-ansi_map.h
+	packet-ansi_tcap.h
+	packet-arp.h
+	packet-atalk.h
+	packet-atm.h
+	packet-atn-ulcs.h
+	packet-bacapp.h
+	packet-ber.h
+	packet-bfd.h
+	packet-bgp.h
+	packet-bluetooth.h
+	packet-bssap.h
+	packet-bssgp.h
+	packet-btatt.h
+	packet-btavctp.h
+	packet-btavdtp.h
+	packet-btavrcp.h
+	packet-bthci_acl.h
+	packet-bthci_cmd.h
+	packet-bthci_evt.h
+	packet-bthci_sco.h
+	packet-btl2cap.h
+	packet-btle.h
+	packet-btrfcomm.h
+	packet-btsdp.h
+	packet-c1222.h
+	packet-camel.h
+	packet-cdt.h
+	packet-cell_broadcast.h
+	packet-charging_ase.h
+	packet-chdlc.h
+	packet-cip.h
+	packet-cipsafety.h
+	packet-clearcase.h
+	packet-cmip.h
+	packet-cmp.h
+	packet-cms.h
+	packet-coap.h
+	packet-credssp.h
+	packet-crmf.h
+	packet-csn1.h
+	packet-dap.h
+	packet-dcc.h
+	packet-dccp.h
+	packet-dcerpc.h
+	packet-dcerpc-browser.h
+	packet-dcerpc-budb.h
+	packet-dcerpc-butc.h
+	packet-dcerpc-dce122.h
+	packet-dcerpc-dcom.h
+	packet-dcerpc-dnsserver.h
+	packet-dcerpc-frsapi.h
+	packet-dcerpc-frsrpc.h
+	packet-dcerpc-netlogon.h
+	packet-dcerpc-nt.h
+	packet-dcerpc-pnp.h
+	packet-dcerpc-rras.h
+	packet-dcerpc-samr.h
+	packet-dcerpc-spoolss.h
+	packet-dcerpc-svcctl.h
+	packet-dcerpc-tapi.h
+	packet-dcom.h
+	packet-dcom-dispatch.h
+	packet-diameter.h
+	packet-diameter_3gpp.h
+	packet-diffserv-mpls-common.h
+	packet-disp.h
+	packet-dns.h
+	packet-dop.h
+	packet-dsp.h
+	packet-dtls.h
+	packet-dtn.h
+	packet-dvbci.h
+	packet-enip.h
+	packet-erf.h
+	packet-e164.h
+	packet-e212.h
+	packet-eapol.h
+	packet-edonkey.h
+	packet-eigrp.h
+	packet-epl.h
+	packet-epmd.h
+	packet-ess.h
+	packet-eth.h
+	packet-fc.h
+	packet-fcbls.h
+	packet-fcct.h
+	packet-fcels.h
+	packet-fcfcs.h
+	packet-fcfzs.h
+	packet-fclctl.h
+	packet-fcp.h
+	packet-fcsb3.h
+	packet-fcswils.h
+	packet-ff.h
+	packet-fix.h
+	packet-fmp.h
+	packet-frame.h
+	packet-ftam.h
+	packet-giop.h
+	packet-gluster.h
+	packet-gmr1_common.h
+	packet-gmr1_rr.h
+	packet-gnutella.h
+	packet-gprscdr.h
+	packet-gre.h
+	packet-gsm_a_common.h
+	packet-gsm_a_rr.h
+	packet-gsm_map.h
+	packet-gsm_rlcmac.h
+	packet-gsm_sms.h
+	packet-gsmtap.h
+	packet-gssapi.h
+	packet-gtp.h
+	packet-gtpv2.h
+	packet-h223.h
+	packet-h225.h
+	packet-h235.h
+	packet-h245.h
+	packet-h248.h
+	packet-h263.h
+	packet-h264.h
+	packet-h323.h
+	packet-h450-ros.h
+	packet-hpext.h
+	packet-http.h
+	packet-http2.h
+	packet-iana-oui.h
+	packet-iax2.h
+	packet-icmp.h
+	packet-idmp.h
+	packet-idp.h
+	packet-ieee80211.h
+	packet-ieee80211-radio.h
+	packet-ieee80211-radiotap-iter.h
+	packet-ieee80211-radiotap-defs.h
+	packet-ieee802154.h
+	packet-ieee8023.h
+	packet-ieee802a.h
+	packet-igmp.h
+	packet-imf.h
+	packet-inap.h
+	packet-infiniband.h
+	packet-ip.h
+	packet-ipmi.h
+	packet-ipsec.h
+	packet-ipx.h
+	packet-isakmp.h
+	packet-isis.h
+	packet-isis-clv.h
+	packet-isl.h
+	packet-isup.h
+	packet-iwarp-ddp-rdmap.h
+	packet-juniper.h
+	packet-jxta.h
+	packet-kerberos.h
+	packet-klm.h
+	packet-l2tp.h
+	packet-lapdm.h
+	packet-lbm.h
+	packet-lbtrm.h
+	packet-lbtru.h
+	packet-lbttcp.h
+	packet-ldap.h
+	packet-lcsap.h
+	packet-ldp.h
+	packet-link16.h
+	packet-llc.h
+	packet-logotypecertextn.h
+	packet-lpp.h
+	packet-lte-rrc.h
+	packet-mac-lte.h
+	packet-mausb.h
+	packet-mbim.h
+	packet-mbtcp.h
+	packet-mgcp.h
+	packet-mle.h
+	packet-mms.h
+	packet-mount.h
+	packet-mp4ves.h
+	packet-mpeg-descriptor.h
+	packet-mpeg-pmt.h
+	packet-mpeg-sect.h
+	packet-mpls.h
+	packet-mq.h
+	packet-msrp.h
+	packet-mstp.h
+	packet-mtp3.h
+	packet-nbap.h
+	packet-ncp-int.h
+	packet-ncp-nmas.h
+	packet-ncp-sss.h
+	packet-ndmp.h
+	packet-ndps.h
+	packet-netbios.h
+	packet-netlink.h
+	packet-nfs.h
+	packet-nisplus.h
+	packet-nlm.h
+	packet-nsh.h
+	packet-ntlmssp.h
+	packet-ntp.h
+	packet-nvme.h
+	packet-ocsp.h
+	packet-opensafety.h
+	packet-osi.h
+	packet-osi-options.h
+	packet-p1.h
+	packet-p22.h
+	packet-p7.h
+	packet-p772.h
+	packet-pcap_pktdata.h
+	packet-pcnfsd.h
+	packet-pdcp-lte.h
+	packet-per.h
+	packet-pkcs1.h
+	packet-pkcs12.h
+	packet-pkix1explicit.h
+	packet-pkix1implicit.h
+	packet-pkixac.h
+	packet-pkixproxy.h
+	packet-pkixqualified.h
+	packet-pkixtsp.h
+	packet-pkinit.h
+	packet-pktc.h
+	packet-portmap.h
+	packet-ppi-geolocation-common.h
+	packet-ppp.h
+	packet-pres.h
+	packet-ptp.h
+	packet-ptpip.h
+	packet-pw-atm.h
+	packet-pw-common.h
+	packet-q708.h
+	packet-q931.h
+	packet-q932.h
+	packet-qsig.h
+	packet-radius.h
+	packet-raknet.h
+	packet-ranap.h
+	packet-rdm.h
+	packet-rdt.h
+	packet-reload.h
+	packet-rlc-lte.h
+	packet-rmi.h
+	packet-rmt-common.h
+	packet-rohc.h
+	packet-ros.h
+	packet-rpc.h
+	packet-rquota.h
+	packet-rrc.h
+	packet-rsvp.h
+	packet-rtcp.h
+	packet-rtp.h
+	packet-rtps.h
+	packet-rtp-events.h
+	packet-rtse.h
+	packet-rtsp.h
+	packet-rwall.h
+	packet-rx.h
+	packet-s1ap.h
+	packet-s5066sis.h
+	packet-s7comm.h
+	packet-s7comm_szl_ids.h
+	packet-sccp.h
+	packet-scsi.h
+	packet-scsi-mmc.h
+	packet-scsi-osd.h
+	packet-scsi-sbc.h
+	packet-scsi-smc.h
+	packet-scsi-ssc.h
+	packet-sctp.h
+	packet-sdp.h
+	packet-ses.h
+	packet-sflow.h
+	packet-sip.h
+	packet-skinny.h
+	packet-sll.h
+	packet-smb.h
+	packet-smb2.h
+	packet-smb-browse.h
+	packet-smb-common.h
+	packet-smb-mailslot.h
+	packet-smb-pipe.h
+	packet-smb-sidsnooping.h
+	packet-smpp.h
+	packet-smrse.h
+	packet-snmp.h
+	packet-socketcan.h
+	packet-spice.h
+	packet-spray.h
+	packet-sprt.h
+	packet-sscop.h
+	packet-ssl.h
+	packet-ssl-utils.h
+	packet-stat.h
+	packet-stat-notify.h
+	packet-sv.h
+	packet-t124.h
+	packet-t30.h
+	packet-t38.h
+	packet-tacacs.h
+	packet-tcap.h
+	packet-tcp.h
+	packet-tetra.h
+	packet-tftp.h
+	packet-tn3270.h
+	packet-tn5250.h
+	packet-tpkt.h
+	packet-tr.h
+	packet-tte.h
+	packet-ua.h
+	packet-uaudp.h
+	packet-ubertooth.h
+	packet-udp.h
+	packet-umts_fp.h
+	packet-umts_mac.h
+	packet-umts_rlc.h
+	packet-usb.h
+	packet-usb-hid.h
+	packet-usbip.h
+	packet-vxlan.h
+	packet-wap.h
+	packet-wccp.h
+	packet-windows-common.h
+	packet-wlancertextn.h
+	packet-wps.h
+	packet-wsp.h
+	packet-wtls.h
+	packet-wtp.h
+	packet-x11.h
+	packet-x11-keysymdef.h
+	packet-x509af.h
+	packet-x509ce.h
+	packet-x509if.h
+	packet-x509sat.h
+	packet-xml.h
+	packet-xmpp-conference.h
+	packet-xmpp-core.h
+	packet-xmpp-gtalk.h
+	packet-xmpp.h
+	packet-xmpp-jingle.h
+	packet-xmpp-other.h
+	packet-xmpp-utils.h
+	packet-ypbind.h
+	packet-yppasswd.h
+	packet-ypserv.h
+	packet-ypxfr.h
+	packet-zbee.h
+	packet-zbee-aps.h
+	packet-zbee-nwk.h
+	packet-zbee-security.h
+	packet-zbee-zcl.h
+	packet-zbee-zdp.h
+	packet-ziop.h
 )
 
 set(DISSECTOR_SRC
+	file-btsnoop.c
+	file-elf.c
+	file-file.c
+	file-gif.c
+	file-jpeg.c
+	file-mp4.c
+	file-pcap.c
+	file-pcapng.c
+	file-png.c
 	packet-2dparityfec.c
 	packet-3com-njack.c
 	packet-3com-xns.c
 	packet-3g-a11.c
 	packet-6lowpan.c
 	packet-9p.c
+	packet-a21.c
 	packet-aarp.c
+	packet-aastra-aasp.c
 	packet-acap.c
 	packet-acn.c
+	packet-acr122.c
 	packet-actrace.c
+	packet-adb.c
+	packet-adb_cs.c
+	packet-adb_service.c
+	packet-adwin-config.c
+	packet-adwin.c
+	packet-aeron.c
 	packet-afp.c
 	packet-afs.c
 	packet-agentx.c
 	packet-aim.c
-	packet-aim-adverts.c
-	packet-aim-admin.c
-	packet-aim-bos.c
-	packet-aim-buddylist.c
-	packet-aim-chat.c
-	packet-aim-chatnav.c
-	packet-aim-directory.c
-	packet-aim-email.c
-	packet-aim-generic.c
-	packet-aim-icq.c
-	packet-aim-invitation.c
-	packet-aim-location.c
-	packet-aim-messaging.c
-	packet-aim-oft.c
-	packet-aim-popup.c
-	packet-aim-signon.c
-	packet-aim-ssi.c
-	packet-aim-sst.c
-	packet-aim-stats.c
-	packet-aim-translate.c
-	packet-aim-userlookup.c
-	packet-airopeek.c
 	packet-ajp13.c
 	packet-alcap.c
+	packet-alljoyn.c
 	packet-amqp.c
 	packet-amr.c
+	packet-amt.c
+	packet-ancp.c
 	packet-ans.c
 	packet-ansi_637.c
 	packet-ansi_683.c
@@ -211,82 +624,155 @@ set(DISSECTOR_SRC
 	packet-ansi_a.c
 	packet-aodv.c
 	packet-aoe.c
+	packet-aol.c
 	packet-ap1394.c
 	packet-app-pkix-cert.c
+	packet-applemidi.c
+	packet-aprs.c
 	packet-arcnet.c
 	packet-armagetronad.c
 	packet-arp.c
 	packet-artnet.c
 	packet-aruba-adp.c
+	packet-aruba-erm.c
+	packet-aruba-iap.c
+	packet-aruba-papi.c
+	packet-ar_drone.c
 	packet-asap.c
 	packet-ascend.c
 	packet-asf.c
+	packet-assa_r3.c
+	packet-asterix.c
+	packet-at.c
 	packet-atalk.c
+	packet-ath.c
 	packet-atm.c
+	packet-atmtcp.c
 	packet-auto_rp.c
+	packet-ax25.c
+	packet-ax25-kiss.c
+	packet-ax25-nol3.c
 	packet-ax4000.c
 	packet-ayiya.c
+	packet-babel.c
 	packet-bacapp.c
 	packet-bacnet.c
 	packet-banana.c
 	packet-bat.c
+	packet-batadv.c
 	packet-bctp.c
 	packet-beep.c
+	packet-bencode.c
 	packet-ber.c
+	packet-bfcp.c
 	packet-bfd.c
 	packet-bgp.c
+	packet-bitcoin.c
 	packet-bittorrent.c
 	packet-bjnp.c
+	packet-bluecom.c
+	packet-bluetooth.c
+	packet-bmc.c
+	packet-bmp.c
 	packet-bofl.c
 	packet-bootp.c
 	packet-bootparams.c
 	packet-bpdu.c
+	packet-bpq.c
+	packet-brcm-tag.c
 	packet-brdwlk.c
+	packet-brp.c
 	packet-bssap.c
 	packet-bssgp.c
+	packet-bt-dht.c
+	packet-bt-utp.c
+	packet-bt3ds.c
 	packet-btamp.c
+	packet-btatt.c
+	packet-btbnep.c
+	packet-btbredr_rf.c
+	packet-btavctp.c
+	packet-btavdtp.c
+	packet-btavrcp.c
 	packet-bthci_acl.c
 	packet-bthci_cmd.c
 	packet-bthci_evt.c
 	packet-bthci_sco.c
+	packet-bthci_vendor.c
+	packet-bthcrp.c
+	packet-bthfp.c
+	packet-bthid.c
+	packet-bthsp.c
 	packet-btl2cap.c
+	packet-btle.c
+	packet-btle_rf.c
+	packet-btmcap.c
 	packet-btrfcomm.c
+	packet-btsap.c
 	packet-btsdp.c
+	packet-btsmp.c
 	packet-bvlc.c
+	packet-bzr.c
+	packet-c15ch.c
 	packet-calcappprotocol.c
+	packet-canopen.c
 	packet-capwap.c
+	packet-carp.c
 	packet-cast.c
 	packet-catapult-dct2000.c
+	packet-cattp.c
+	packet-cbor.c
 	packet-ccsds.c
 	packet-cdp.c
+	packet-cell_broadcast.c
+	packet-ceph.c
+	packet-cfdp.c
 	packet-cfm.c
 	packet-cgmp.c
+	packet-chargen.c
 	packet-chdlc.c
 	packet-cigi.c
 	packet-cimd.c
 	packet-cimetrics.c
 	packet-cip.c
+	packet-cipmotion.c
+	packet-cipsafety.c
 	packet-cisco-erspan.c
+	packet-cisco-fp-mim.c
+	packet-cisco-marker.c
+	packet-cisco-metadata.c
 	packet-cisco-oui.c
 	packet-cisco-sm.c
+	packet-cisco-ttag.c
 	packet-cisco-wids.c
 	packet-classicstun.c
 	packet-clearcase.c
 	packet-clip.c
+	packet-clique-rm.c
 	packet-clnp.c
 	packet-cmpp.c
+	packet-cnip.c
+	packet-coap.c
 	packet-collectd.c
 	packet-componentstatus.c
 	packet-cops.c
+	packet-corosync-totemnet.c
+	packet-corosync-totemsrp.c
 	packet-cosine.c
+	packet-couchbase.c
+	packet-cp2179.c
 	packet-cpfi.c
 	packet-cpha.c
+	packet-cql.c
 	packet-csm-encaps.c
+	packet-csn1.c
 	packet-ctdb.c
 	packet-cups.c
 	packet-daap.c
 	packet-data.c
 	packet-daytime.c
+	packet-db-lsp.c
+	packet-dbus.c
 	packet-dcc.c
 	packet-dccp.c
 	packet-dcerpc-bossvr.c
@@ -307,7 +793,6 @@ set(DISSECTOR_SRC
 	packet-dcerpc-icl_rpc.c
 	packet-dcerpc-krb5rpc.c
 	packet-dcerpc-llb.c
-	packet-dcerpc-mapi.c
 	packet-dcerpc-messenger.c
 	packet-dcerpc-mgmt.c
 	packet-dcerpc-ndr.c
@@ -348,42 +833,57 @@ set(DISSECTOR_SRC
 	packet-dcerpc-update.c
 	packet-dcerpc.c
 	packet-dcm.c
-	packet-dcom.c
 	packet-dcom-dispatch.c
 	packet-dcom-oxid.c
 	packet-dcom-remact.c
 	packet-dcom-remunkn.c
 	packet-dcom-sysact.c
+	packet-dcom.c
 	packet-dcp-etsi.c
 	packet-ddtp.c
 	packet-dec-bpdu.c
 	packet-dec-dnart.c
 	packet-dect.c
+	packet-devicenet.c
 	packet-dhcp-failover.c
 	packet-dhcpv6.c
 	packet-diameter.c
 	packet-diameter_3gpp.c
-	packet-dis.c
-	packet-dis-enums.c
-	packet-dis-fields.c
-	packet-dis-pdus.c
 	packet-diffserv-mpls-common.c
+	packet-dis.c
 	packet-distcc.c
+	packet-dji-uav.c
 	packet-dlm3.c
 	packet-dlsw.c
 	packet-dmp.c
+	packet-dmx.c
 	packet-dnp.c
 	packet-dns.c
+	packet-dof.c
 	packet-dplay.c
-	packet-dpnss.c
+	packet-dpnet.c
 	packet-dpnss-link.c
+	packet-dpnss.c
 	packet-drda.c
 	packet-dsi.c
+	packet-dsr.c
+	packet-dtcp-ip.c
 	packet-dtls.c
 	packet-dtn.c
 	packet-dtp.c
 	packet-dtpt.c
 	packet-dua.c
+	packet-dvb-ait.c
+	packet-dvb-bat.c
+	packet-dvb-data-mpe.c
+	packet-dvb-eit.c
+	packet-dvb-ipdc.c
+	packet-dvb-nit.c
+	packet-dvb-s2-bb.c
+	packet-dvb-sdt.c
+	packet-dvb-tdt.c
+	packet-dvb-tot.c
+	packet-dvbci.c
 	packet-dvmrp.c
 	packet-e100.c
 	packet-e164.c
@@ -391,102 +891,185 @@ set(DISSECTOR_SRC
 	packet-eap.c
 	packet-eapol.c
 	packet-echo.c
+	packet-ecmp.c
+	packet-ecp-oui.c
 	packet-edonkey.c
 	packet-egd.c
+	packet-ehdlc.c
 	packet-ehs.c
 	packet-eigrp.c
+	packet-eiss.c
+	packet-elasticsearch.c
+	packet-elcom.c
+	packet-elmi.c
 	packet-enc.c
 	packet-enip.c
 	packet-enrp.c
 	packet-enttec.c
 	packet-epl.c
+	packet-epl-profile-parser.c
 	packet-epl_v1.c
 	packet-epmd.c
+	packet-epon.c
 	packet-erf.c
+	packet-erldp.c
+	packet-esio.c
 	packet-esis.c
+	packet-etag.c
+	packet-etch.c
 	packet-eth.c
 	packet-etherip.c
 	packet-ethertype.c
+	packet-etsi_card_app_toolkit.c
+	packet-etv.c
 	packet-evrc.c
 	packet-exec.c
+	packet-exported_pdu.c
 	packet-extreme.c
+	packet-fc00.c
 	packet-fc.c
 	packet-fcct.c
 	packet-fcdns.c
 	packet-fcels.c
 	packet-fcfcs.c
 	packet-fcfzs.c
+	packet-fcgi.c
 	packet-fcip.c
 	packet-fclctl.c
 	packet-fcoe.c
+	packet-fcoib.c
 	packet-fcp.c
 	packet-fcsb3.c
 	packet-fcsp.c
 	packet-fcswils.c
+	packet-fbzero.c
 	packet-fddi.c
 	packet-fefd.c
 	packet-ff.c
+	packet-finger.c
 	packet-fip.c
 	packet-fix.c
+	packet-flexnet.c
+	packet-flexray.c
+	packet-flip.c
 	packet-fmp.c
 	packet-fmp_notify.c
+	packet-fmtp.c
 	packet-force10-oui.c
+	packet-forces.c
+	packet-foundry.c
+	packet-fp_hint.c
 	packet-fr.c
 	packet-fractalgeneratorprotocol.c
 	packet-frame.c
 	packet-ftp.c
 	packet-fw1.c
 	packet-g723.c
+	packet-gadu-gadu.c
+	packet-gdb.c
 	packet-gdsdb.c
+	packet-gearman.c
+	packet-ged125.c
+	packet-geneve.c
+	packet-gfp.c
 	packet-gift.c
 	packet-giop.c
+	packet-git.c
 	packet-glbp.c
+	packet-gluster_cli.c
+	packet-gluster_pmap.c
+	packet-glusterd.c
+	packet-glusterfs.c
+	packet-glusterfs_hndsk.c
+	packet-gmhdr.c
+	packet-gmr1_bcch.c
+	packet-gmr1_common.c
+	packet-gmr1_dtap.c
+	packet-gmr1_rach.c
+	packet-gmr1_rr.c
 	packet-gmrp.c
 	packet-gnutella.c
+	packet-gopher.c
 	packet-gpef.c
 	packet-gprs-llc.c
-	packet-gprs-ns.c
+	packet-gprscdr.c
 	packet-gre.c
+	packet-grpc.c
 	packet-gsm_a_bssmap.c
 	packet-gsm_a_common.c
 	packet-gsm_a_dtap.c
 	packet-gsm_a_gm.c
 	packet-gsm_a_rp.c
 	packet-gsm_a_rr.c
-	packet-gsm_ipa.c
+	packet-gsm_abis_om2000.c
+	packet-gsm_abis_oml.c
+	packet-gsm_abis_tfp.c
+	packet-gsm_abis_pgsl.c
 	packet-gsm_bsslap.c
 	packet-gsm_bssmap_le.c
+	packet-gsm_cbch.c
+	packet-gsm_ipa.c
+	packet-gsm_osmux.c
+	packet-gsm_rlcmac.c
+	packet-gsm_sim.c
 	packet-gsm_sms.c
 	packet-gsm_sms_ud.c
 	packet-gsm_um.c
+	packet-gsmtap.c
+	packet-gsmtap_log.c
 	packet-gssapi.c
 	packet-gtp.c
 	packet-gtpv2.c
+	packet-gquic.c
+	packet-gvcp.c
 	packet-gvrp.c
+	packet-gvsp.c
 	packet-h1.c
 	packet-h221_nonstd.c
 	packet-h223.c
-	packet-h248_annex_c.c
-	packet-h248_annex_e.c
+	packet-h248_10.c
+	packet-h248_2.c
 	packet-h248_3gpp.c
 	packet-h248_7.c
-	packet-h248_10.c
+	packet-h248_annex_c.c
+	packet-h248_annex_e.c
 	packet-h248_q1950.c
 	packet-h261.c
 	packet-h263.c
 	packet-h263p.c
 	packet-h264.c
+	packet-hartip.c
+	packet-hazelcast.c
 	packet-hci_h1.c
 	packet-hci_h4.c
+	packet-hci_mon.c
+	packet-hci_usb.c
 	packet-hclnfsd.c
-	packet-hilscher.c
+	packet-hcrt.c
+	packet-hdcp.c
+	packet-hdcp2.c
+	packet-hdfs.c
+	packet-hdfsdata.c
+	packet-hdmi.c
 	packet-hip.c
+	packet-hiqnet.c
+	packet-hislip.c
+	packet-hl7.c
+	packet-homeplug-av.c
 	packet-homeplug.c
+	packet-homepna.c
+	packet-hp-erm.c
 	packet-hpext.c
+	packet-hpfeeds.c
 	packet-hpsw.c
 	packet-hpteam.c
+	packet-hsms.c
+	packet-hsr-prp-supervision.c
+	packet-hsr.c
 	packet-hsrp.c
 	packet-http.c
+	packet-http2.c
+	packet-http-urlencoded.c
 	packet-hyperscsi.c
 	packet-i2c.c
 	packet-iana-oui.c
@@ -499,7 +1082,16 @@ set(DISSECTOR_SRC
 	packet-icp.c
 	packet-icq.c
 	packet-idp.c
+	packet-idrp.c
 	packet-iec104.c
+	packet-ieee1722.c
+	packet-ieee17221.c
+	packet-ieee80211-netmon.c
+	packet-ieee80211-prism.c
+	packet-ieee80211-radio.c
+	packet-ieee80211-radiotap-iter.c
+	packet-ieee80211-radiotap.c
+	packet-ieee80211-wlancap.c
 	packet-ieee80211.c
 	packet-ieee802154.c
 	packet-ieee8021ah.c
@@ -509,22 +1101,39 @@ set(DISSECTOR_SRC
 	packet-igap.c
 	packet-igmp.c
 	packet-igrp.c
-	packet-image-gif.c
-	packet-image-jfif.c
-	packet-image-png.c
 	packet-imap.c
 	packet-imf.c
+	packet-indigocare-icall.c
+	packet-indigocare-netrix.c
 	packet-infiniband.c
-	packet-ipars.c
+	packet-infiniband_sdp.c
+	packet-interlink.c
 	packet-ip.c
+	packet-ipars.c
 	packet-ipdc.c
+	packet-ipdr.c
+	packet-iperf.c
 	packet-ipfc.c
 	packet-ipmi.c
+	packet-ipmi-app.c
+	packet-ipmi-bridge.c
+	packet-ipmi-chassis.c
+	packet-ipmi-picmg.c
+	packet-ipmi-se.c
 	packet-ipmi-session.c
+	packet-ipmi-storage.c
+	packet-ipmi-trace.c
+	packet-ipmi-transport.c
+	packet-ipmi-pps.c
+	packet-ipmi-update.c
+	packet-ipmi-vita.c
+	packet-ipnet.c
+	packet-ipoib.c
+	packet-ipos.c
 	packet-ipp.c
-	packet-ipsec.c
 	packet-ipsec-tcp.c
 	packet-ipsec-udp.c
+	packet-ipsec.c
 	packet-ipsi-ctl.c
 	packet-ipv6.c
 	packet-ipvs-syncd.c
@@ -534,6 +1143,8 @@ set(DISSECTOR_SRC
 	packet-isakmp.c
 	packet-iscsi.c
 	packet-isdn.c
+	packet-iser.c
+	packet-isi.c
 	packet-isis-clv.c
 	packet-isis-hello.c
 	packet-isis-lsp.c
@@ -543,109 +1154,205 @@ set(DISSECTOR_SRC
 	packet-ismacryp.c
 	packet-ismp.c
 	packet-isns.c
+	packet-iso14443.c
+	packet-iso15765.c
+	packet-iso7816.c
+	packet-iso8583.c
+	packet-isobus.c
+	packet-isobus-vt.c
 	packet-isup.c
 	packet-itdm.c
 	packet-iua.c
 	packet-iuup.c
 	packet-iwarp-ddp-rdmap.c
 	packet-iwarp-mpa.c
-	packet-jabber.c
+	packet-ixiatrailer.c
+	packet-ixveriwave.c
+	packet-j1939.c
+	packet-jmirror.c
 	packet-jpeg.c
+	packet-json.c
 	packet-juniper.c
 	packet-jxta.c
 	packet-k12.c
 	packet-kadm5.c
+	packet-kafka.c
 	packet-kdp.c
-	packet-kerberos.c
+	packet-kdsp.c
 	packet-kerberos4.c
-	packet-klm.c
 	packet-kingfisher.c
 	packet-kink.c
 	packet-kismet.c
+	packet-klm.c
+	packet-knet.c
+	packet-knxnetip.c
 	packet-kpasswd.c
+	packet-kt.c
+	packet-l1-events.c
 	packet-l2tp.c
+	packet-lacp.c
 	packet-lanforge.c
 	packet-lapb.c
 	packet-lapbether.c
 	packet-lapd.c
 	packet-lapdm.c
 	packet-laplink.c
-	packet-l1-events.c
+	packet-lapsat.c
+	packet-lat.c
+	packet-lbm.c
+	packet-lbmc.c
+	packet-lbmpdm.c
+	packet-lbmpdmtcp.c
+	packet-lbmr.c
+	packet-lbtrm.c
+	packet-lbtru.c
+	packet-lbttcp.c
 	packet-ldp.c
 	packet-ldss.c
+	packet-lg8979.c
 	packet-lge_monitor.c
+	packet-link16.c
 	packet-linx.c
+	packet-lisp-data.c
+	packet-lisp-tcp.c
+	packet-lisp.c
 	packet-llc.c
 	packet-lldp.c
+	packet-llrp.c
 	packet-llt.c
+	packet-lltd.c
 	packet-lmi.c
 	packet-lmp.c
+	packet-logcat.c
+	packet-logcat-text.c
+	packet-lon.c
 	packet-loop.c
+	packet-loratap.c
+	packet-lorawan.c
 	packet-lpd.c
 	packet-lsc.c
+	packet-lsd.c
+	packet-ltp.c
 	packet-lwapp.c
+	packet-lwm.c
+	packet-lwm2mtlv.c
 	packet-lwres.c
 	packet-m2pa.c
 	packet-m2tp.c
 	packet-m2ua.c
 	packet-m3ua.c
+	packet-maap.c
+	packet-mac-lte-framed.c
 	packet-mac-lte.c
 	packet-maccontrol.c
+	packet-macsec.c
+	packet-mactelnet.c
 	packet-manolito.c
+	packet-marker.c
+	packet-mausb.c
+	packet-mbim.c
 	packet-mbtcp.c
+	packet-mcpe.c
 	packet-mdshdr.c
 	packet-media.c
 	packet-megaco.c
 	packet-memcache.c
 	packet-mesh.c
+	packet-messageanalyzer.c
+	packet-meta.c
+	packet-metamako.c
 	packet-mgcp.c
+	packet-mih.c
 	packet-mikey.c
+	packet-mime-encap.c
+	packet-mint.c
 	packet-miop.c
 	packet-mip.c
 	packet-mip6.c
-	packet-ms-mms.c
+	packet-mka.c
+	packet-mle.c
 	packet-mmse.c
+	packet-mndp.c
+	packet-mojito.c
+	packet-moldudp.c
+	packet-moldudp64.c
+	packet-mongo.c
 	packet-mount.c
 	packet-mp2t.c
 	packet-mp4ves.c
+	packet-mpeg-ca.c
+	packet-mpeg-descriptor.c
+	packet-mpeg-dsmcc.c
+	packet-mpeg-pat.c
+	packet-mpeg-pmt.c
+	packet-mpeg-sect.c
 	packet-mpeg1.c
-	packet-mpls.c
 	packet-mpls-echo.c
-	packet-mq.c
+	packet-mpls-pm.c
+	packet-mpls-psc.c
+	packet-mplstp-oam.c
+	packet-mpls-y1711.c
+	packet-mpls.c
+	packet-mq-base.c
 	packet-mq-pcf.c
+	packet-mq.c
+	packet-mqtt.c
+	packet-mqtt-sn.c
+	packet-mrcpv2.c
 	packet-mrdisc.c
+	packet-mrp-mmrp.c
+	packet-mrp-msrp.c
+	packet-mrp-mvrp.c
+	packet-ms-mms.c
 	packet-msdp.c
-	packet-msnlb.c
 	packet-msn-messenger.c
 	packet-msnip.c
+	packet-msnlb.c
 	packet-msproxy.c
 	packet-msrp.c
 	packet-mstp.c
+	packet-mswsp.c
 	packet-mtp2.c
 	packet-mtp3.c
 	packet-mtp3mg.c
 	packet-multipart.c
+	packet-mux27010.c
 	packet-mysql.c
 	packet-nas_eps.c
 	packet-nasdaq-itch.c
+	packet-nasdaq-soup.c
 	packet-nat-pmp.c
 	packet-nb_rtpmux.c
 	packet-nbd.c
+	packet-nbifom.c
 	packet-nbipx.c
-	packet-nbns.c
-	packet-ncp.c
-	packet-ncp2222.c
+	packet-nbt.c
 	packet-ncp-nmas.c
 	packet-ncp-sss.c
+	packet-ncp.c
 	packet-ncs.c
 	packet-ndmp.c
+	packet-ndp.c
 	packet-ndps.c
+	packet-negoex.c
+	packet-netanalyzer.c
 	packet-netbios.c
 	packet-netdump.c
+	packet-netgear-ensemble.c
 	packet-netflow.c
+	packet-netlink-generic.c
+	packet-netlink-netfilter.c
+	packet-netlink-nl80211.c
+	packet-netlink-route.c
+	packet-netlink-sock_diag.c
+	packet-netlink.c
+	packet-netmon.c
+	packet-netperfmeter.c
+	packet-netrom.c
 	packet-netsync.c
 	packet-nettl.c
 	packet-newmail.c
+	packet-nflog.c
 	packet-nfs.c
 	packet-nfsacl.c
 	packet-nfsauth.c
@@ -654,74 +1361,139 @@ set(DISSECTOR_SRC
 	packet-nlm.c
 	packet-nlsp.c
 	packet-nntp.c
-	packet-nstrace.c
+	packet-noe.c
+	packet-nordic_ble.c
+	packet-ns-ha.c
+	packet-ns-mep.c
+	packet-ns-rpc.c
 	packet-nsip.c
+	packet-nsh.c
 	packet-nsrp.c
+	packet-nstrace.c
 	packet-nt-oui.c
-	packet-nt-sonmp.c
 	packet-nt-tpcp.c
 	packet-ntlmssp.c
 	packet-ntp.c
 	packet-null.c
+	packet-nvme.c
+	packet-nvme-rdma.c
+	packet-nwmtp.c
+	packet-nwp.c
+	packet-oampdu.c
+	packet-obd-ii.c
+	packet-obex.c
+	packet-ocfs2.c
 	packet-oicq.c
+	packet-oipf.c
 	packet-olsr.c
 	packet-omapi.c
+	packet-omron-fins.c
+	packet-opa.c
+	packet-opa-fe.c
+	packet-opa-mad.c
+	packet-opa-snc.c
+	packet-openflow.c
+	packet-openflow_v1.c
+	packet-openflow_v4.c
+	packet-openflow_v5.c
+	packet-openflow_v6.c
+	packet-opensafety.c
+	packet-openthread.c
+	packet-openvpn.c
+	packet-openwire.c
+	packet-opsi.c
+	packet-optommp.c
+	packet-osc.c
 	packet-osi-options.c
 	packet-osi.c
 	packet-ositp.c
 	packet-ospf.c
+	packet-ossp.c
+	packet-ouch.c
 	packet-p_mul.c
+	packet-pathport.c
+	packet-packetbb.c
 	packet-packetlogger.c
 	packet-pagp.c
 	packet-paltalk.c
 	packet-pana.c
+	packet-pcap_pktdata.c
+	packet-pcapng_block.c
 	packet-pcep.c
 	packet-pcli.c
 	packet-pcnfsd.c
+	packet-pcp.c
+	packet-pdc.c
 	packet-pdcp-lte.c
+	packet-peekremote.c
 	packet-per.c
+	packet-pfcp.c
 	packet-pflog.c
 	packet-pgm.c
+	packet-pgsql.c
 	packet-pim.c
 	packet-pingpongprotocol.c
-	packet-pktgen.c
+	packet-pktap.c
 	packet-pktc.c
+	packet-pktgen.c
+	packet-pmproxy.c
+	packet-pnrp.c
 	packet-pop.c
 	packet-portmap.c
-	packet-pgsql.c
+	packet-ppcap.c
+	packet-ppi-antenna.c
+	packet-ppi-geolocation-common.c
+	packet-ppi-gps.c
+	packet-ppi-sensor.c
+	packet-ppi-vector.c
 	packet-ppi.c
 	packet-ppp.c
 	packet-pppoe.c
 	packet-pptp.c
 	packet-prp.c
 	packet-ptp.c
+	packet-ptpip.c
+	packet-pulse.c
 	packet-pvfs2.c
+	packet-pw-atm.c
+	packet-pw-cesopsn.c
 	packet-pw-common.c
 	packet-pw-eth.c
-	packet-pw-hdlc.c
 	packet-pw-fr.c
-	packet-pw-atm.c
-	packet-pw-cesopsn.c
+	packet-pw-hdlc.c
+	packet-pw-oam.c
 	packet-pw-satop.c
 	packet-q2931.c
+	packet-q708.c
 	packet-q931.c
 	packet-q933.c
 	packet-qllc.c
+	packet-qnet6.c
 	packet-quake.c
 	packet-quake2.c
 	packet-quake3.c
 	packet-quakeworld.c
+	packet-quic.c
 	packet-radius.c
 	packet-radius_packetcable.c
-	packet-radiotap.c
+	packet-raknet.c
 	packet-raw.c
 	packet-rdm.c
+	packet-rdp.c
 	packet-rdt.c
 	packet-redback.c
 	packet-redbackli.c
+	packet-reload-framing.c
+	packet-reload.c
 	packet-retix-bpdu.c
 	packet-rfc2190.c
+	packet-rfid-felica.c
+	packet-rfid-mifare.c
+	packet-rfid-pn532.c
+	packet-rfid-pn532-hci.c
+	packet-rftap.c
 	packet-rgmp.c
+	packet-riemann.c
 	packet-rip.c
 	packet-ripng.c
 	packet-rlc-lte.c
@@ -731,54 +1503,80 @@ set(DISSECTOR_SRC
 	packet-rmi.c
 	packet-rmp.c
 	packet-rmt-alc.c
-	packet-rmt-common.c
 	packet-rmt-fec.c
 	packet-rmt-lct.c
 	packet-rmt-norm.c
+	packet-rohc.c
 	packet-roofnet.c
 	packet-rpc.c
 	packet-rpcap.c
+	packet-rpcrdma.c
+	packet-rpki-rtr.c
 	packet-rpl.c
 	packet-rquota.c
 	packet-rsh.c
+	packet-rsip.c
 	packet-rsl.c
 	packet-rstat.c
+	packet-rsvd.c
 	packet-rsvp.c
 	packet-rsync.c
+	packet-rtacser.c
+	packet-rtcdc.c
 	packet-rtcp.c
+	packet-rtitcp.c
+	packet-rtls.c
 	packet-rtmpt.c
+	packet-rtnet.c
 	packet-rtp-events.c
+	packet-rtp-midi.c
 	packet-rtp.c
+	packet-rtpproxy.c
 	packet-rtps.c
-	packet-rtps2.c
 	packet-rtsp.c
 	packet-rudp.c
 	packet-rwall.c
 	packet-rx.c
-	packet-s5066.c
+	packet-s5066sis.c
+	packet-s5066dts.c
+	packet-s7comm.c
+	packet-s7comm_szl_ids.c
 	packet-sadmind.c
+	packet-sametime.c
 	packet-sap.c
+	packet-sasp.c
 	packet-sbus.c
+	packet-sbc.c
 	packet-sccp.c
 	packet-sccpmg.c
-	packet-scsi.c
+	packet-scop.c
+	packet-scriptingservice.c
 	packet-scsi-mmc.c
 	packet-scsi-osd.c
 	packet-scsi-sbc.c
 	packet-scsi-smc.c
 	packet-scsi-ssc.c
+	packet-scsi.c
+	packet-scte35.c
 	packet-sctp.c
+	packet-sdh.c
 	packet-sdlc.c
 	packet-sdp.c
 	packet-sebek.c
+	packet-selfm.c
+	packet-sercosiii.c
 	packet-ses.c
 	packet-sflow.c
+	packet-sgsap.c
+	packet-shim6.c
+	packet-sigcomp.c
+	packet-simple.c
 	packet-simulcrypt.c
 	packet-sip.c
-	packet-sigcomp.c
 	packet-sipfrag.c
 	packet-sita.c
 	packet-skinny.c
+	packet-skype.c
 	packet-slimp3.c
 	packet-sll.c
 	packet-slowprotocols.c
@@ -789,100 +1587,166 @@ set(DISSECTOR_SRC
 	packet-smb-mailslot.c
 	packet-smb-pipe.c
 	packet-smb-sidsnooping.c
+	packet-smb-direct.c
 	packet-smb.c
 	packet-smb2.c
+	packet-smcr.c
+	packet-sml.c
 	packet-smpp.c
 	packet-smtp.c
 	packet-sna.c
 	packet-snaeth.c
-	packet-sndcp.c
 	packet-sndcp-xid.c
+	packet-sndcp.c
+	packet-snort.c
+	packet-socketcan.c
 	packet-socks.c
-	packet-nasdaq-soup.c
+	packet-soupbintcp.c
+	packet-spdy.c
+	packet-spice.c
 	packet-spp.c
 	packet-spray.c
+	packet-sprt.c
 	packet-srp.c
-	packet-sscf-nni.c
 	packet-srvloc.c
+	packet-sscf-nni.c
 	packet-sscop.c
-	packet-scriptingservice.c
 	packet-ssh.c
-	packet-ssl.c
 	packet-ssl-utils.c
+	packet-ssl.c
+	packet-sstp.c
+	packet-stanag4607.c
 	packet-starteam.c
 	packet-stat-notify.c
 	packet-stat.c
+	packet-stt.c
 	packet-stun.c
 	packet-sua.c
+	packet-swipe.c
 	packet-symantec.c
+	packet-sync.c
 	packet-synergy.c
 	packet-synphasor.c
+	packet-sysdig-event.c
+	packet-sysex.c
 	packet-syslog.c
 	packet-t30.c
-	packet-t38.c
 	packet-tacacs.c
 	packet-tali.c
 	packet-tapa.c
 	packet-tcp.c
+	packet-tcpros.c
+	packet-tdmoe.c
+	packet-tdmop.c
 	packet-tds.c
 	packet-teamspeak2.c
 	packet-teimanagement.c
+	packet-teklink.c
+	packet-telkonet.c
 	packet-telnet.c
 	packet-teredo.c
 	packet-text-media.c
-	packet-telkonet.c
+	packet-tfp.c
 	packet-tftp.c
+	packet-thread.c
+	packet-thrift.c
+	packet-tibia.c
 	packet-time.c
 	packet-tipc.c
 	packet-tivoconnect.c
+	packet-tn3270.c
+	packet-tn5250.c
 	packet-tnef.c
 	packet-tns.c
-	packet-tn3270.c
 	packet-tpkt.c
 	packet-tpncp.c
 	packet-tr.c
+	packet-trill.c
 	packet-trmac.c
 	packet-tsp.c
-	packet-tte.c
 	packet-tte-pcf.c
+	packet-tte.c
 	packet-turbocell.c
 	packet-turnchannel.c
 	packet-tuxedo.c
 	packet-tzsp.c
+	packet-u3v.c
+	packet-ua.c
+	packet-ua3g.c
+	packet-uasip.c
+	packet-uaudp.c
+	packet-ubertooth.c
 	packet-ucp.c
 	packet-udld.c
-	packet-uma.c
 	packet-udp.c
-	packet-usb.c
-	packet-usb-masstorage.c
-	packet-usb-hid.c
+	packet-udp-nm.c
+	packet-uds.c
+	packet-udt.c
+	packet-uftp.c
+	packet-uftp4.c
+	packet-uhd.c
+	packet-uma.c
 	packet-umts_fp.c
+	packet-umts_mac.c
+	packet-umts_rlc.c
+	packet-usb-audio.c
+	packet-usb-ccid.c
+	packet-usb-com.c
+	packet-usb-dfu.c
+	packet-usb-hid.c
+	packet-usb-hub.c
+	packet-usb-i1d3.c
+	packet-usb-masstorage.c
+	packet-usb-video.c
+	packet-usb.c
+	packet-usbip.c
 	packet-user_encap.c
+	packet-userlog.c
 	packet-uts.c
 	packet-v120.c
-	packet-v5ua.c
+	packet-v150fw.c
 	packet-v52.c
+	packet-v5dl.c
+	packet-v5ef.c
+	packet-v5ua.c
 	packet-vcdu.c
 	packet-vicp.c
 	packet-vines.c
-	packet-vj.c
 	packet-vlan.c
+	packet-vmlab.c
 	packet-vnc.c
+	packet-vntag.c
+	packet-vp8.c
 	packet-vrrp.c
+	packet-vrt.c
+	packet-vsip.c
+	packet-vsock.c
+	packet-vssmonitoring.c
 	packet-vtp.c
+	packet-vuze-dht.c
+	packet-vxi11.c
+	packet-vxlan.c
+	packet-wai.c
 	packet-wap.c
 	packet-wassp.c
+	packet-waveagent.c
 	packet-wbxml.c
 	packet-wccp.c
 	packet-wcp.c
+	packet-websocket.c
 	packet-wfleet-hdlc.c
 	packet-who.c
+	packet-whois.c
+	packet-wifi-dpp.c
+	packet-wifi-display.c
+	packet-wifi-p2p.c
 	packet-windows-common.c
 	packet-winsrepl.c
 	packet-wlccp.c
 	packet-wol.c
 	packet-wow.c
 	packet-wps.c
+	packet-wreth.c
 	packet-wsmp.c
 	packet-wsp.c
 	packet-wtls.c
@@ -892,10 +1756,21 @@ set(DISSECTOR_SRC
 	packet-x29.c
 	packet-xcsl.c
 	packet-xdmcp.c
+	packet-xip.c
+	packet-xip-serval.c
+	packet-xmcp.c
 	packet-xml.c
+	packet-xmpp-conference.c
+	packet-xmpp-core.c
+	packet-xmpp-gtalk.c
+	packet-xmpp-jingle.c
+	packet-xmpp-other.c
+	packet-xmpp-utils.c
+	packet-xmpp.c
 	packet-xot.c
 	packet-xtp.c
 	packet-xyplex.c
+	packet-yami.c
 	packet-yhoo.c
 	packet-ymsg.c
 	packet-ypbind.c
@@ -903,9 +1778,19 @@ set(DISSECTOR_SRC
 	packet-ypserv.c
 	packet-ypxfr.c
 	packet-zbee-aps.c
-	packet-zbee-security.c
 	packet-zbee-nwk.c
+	packet-zbee-nwk-gp.c
+	packet-zbee-security.c
 	packet-zbee-zcl.c
+	packet-zbee-zcl-closures.c
+	packet-zbee-zcl-general.c
+	packet-zbee-zcl-ha.c
+	packet-zbee-zcl-hvac.c
+	packet-zbee-zcl-lighting.c
+	packet-zbee-zcl-meas-sensing.c
+	packet-zbee-zcl-misc.c
+	packet-zbee-zcl-sas.c
+	packet-zbee-zcl-se.c
 	packet-zbee-zdp.c
 	packet-zbee-zdp-binding.c
 	packet-zbee-zdp-discovery.c
@@ -914,54 +1799,93 @@ set(DISSECTOR_SRC
 	packet-zep.c
 	packet-ziop.c
 	packet-zrtp.c
-)
-
-# IPMI sub-parsers for each network function code
-set(IPMI_SUBPARSERS
-	packet-ipmi-app.c
-	packet-ipmi-bridge.c
-	packet-ipmi-chassis.c
-	packet-ipmi-picmg.c
-	packet-ipmi-se.c
-	packet-ipmi-storage.c
-	packet-ipmi-transport.c
-	packet-ipmi-pps.c
-	packet-ipmi-update.c
+	packet-zvt.c
 )
 
 set(DISSECTOR_SUPPORT_SRC
-	${IPMI_SUBPARSERS}
+	errno.c
 	packet-dcerpc-nt.c
+	usb.c
+	snort-config.c
 	register.c
 )
+source_group(dissector-support FILES ${DISSECTOR_SUPPORT_SRC})
 
 set(DISSECTOR_FILES
 	${DISSECTOR_SRC}
 	${PIDL_DISSECTOR_SRC}
-	${DIRTY_PIDL_DISSECTOR_SRC}
+	${PIDL_DISSECTOR_AUTOGEN_SRC}
 	${ASN1_DISSECTOR_SRC}
-	${DIRTY_ASN1_DISSECTOR_SRC}
+	${NCP2222_DISSECTOR_SRC}
+	${CUSTOM_DISSECTOR_SRC}
+	${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
 )
+source_group(dissectors FILES ${DISSECTOR_FILES})
 
-set_source_files_properties(
-	${DISSECTOR_SRC}
-	${PIDL_DISSECTOR_SRC}
-	${ASN1_DISSECTOR_SRC}
-    PROPERTIES
-	# FIXME: -Werror and -pedantic exclude each other: test for -pedantic
-        # COMPILE_FLAGS -Werror
+set(ALL_DISSECTOR_SRC
+	${DISSECTOR_FILES}
+	${CORBA_IDL_DISSECTOR_SRC}
 )
 
 register_dissector_files(register.c
 	dissectors
-	${DISSECTOR_FILES}
+	${ALL_DISSECTOR_SRC}
+)
+
+set(CLEAN_FILES
+	${DISSECTOR_SRC}
+	${PIDL_DISSECTOR_SRC}
+	${CLEAN_ASN1_DISSECTOR_SRC}
+	${CLEAN_CORBA_IDL_DISSECTOR_SRC}
+	${NCP2222_DISSECTOR_SRC}
+	${DISSECTOR_SUPPORT_SRC}
+)
+
+set_source_files_properties(
+	${CLEAN_FILES}
+	PROPERTIES
+	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
 
-add_library(dissectors STATIC
+add_library(dissectors OBJECT
 	${DISSECTOR_FILES}
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-target_link_libraries(dissectors
-	${CRYPT_LIB}
+set_target_properties(dissectors PROPERTIES
+	FOLDER "Libs/epan/dissectors"
+	COMPILE_DEFINITIONS "WS_BUILD_DLL"
+	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
+)
+
+if(NOT WIN32)
+	install(FILES ${DISSECTOR_PUBLIC_HEADERS}
+		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dissectors"
+	)
+endif()
+
+set(CHECKAPI_FILE_LIST "${CMAKE_CURRENT_BINARY_DIR}/files.txt")
+file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
+file(WRITE "${CHECKAPI_FILE_LIST}" "${DISSECTOR_FILES}" ";" "${CORBA_IDL_DISSECTOR_SRC}")
+CHECKAPI(
+	NAME
+	  dissectors
+	SWITCHES
+	  -g abort -g termoutput -build --file ${CHECKAPI_FILE_LIST}
+	SOURCES
+	  ${DISSECTOR_SUPPORT_SRC}
+	  ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#