From Kari Vatjus-Anttila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
[obnox/wireshark/wip.git] / epan / dissectors / Makefile.common
index 86cd9663b70ddaff594e09f0a92f68cb4798ac00..8fa9ce738d2108d3c853d345c941e7857cb0b159 100644 (file)
@@ -23,6 +23,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+include Custom.nmake
+
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
 BUILT_C_FILES = \
        register.c
@@ -80,6 +82,7 @@ PIDL_DISSECTOR_INCLUDES = \
        packet-dcerpc-eventlog.h        \
        packet-dcerpc-initshutdown.h    \
        packet-dcerpc-lsa.h     \
+       packet-dcerpc-misc.h    \
        packet-dcerpc-nspi.h    \
        packet-dcerpc-rfr.h \
        packet-dcerpc-srvsvc.h  \
@@ -102,6 +105,7 @@ ASN1_DISSECTOR_SRC = \
        packet-cmp.c \
        packet-cms.c \
        packet-coap.c \
+       packet-credssp.c \
        packet-crmf.c \
        packet-dap.c \
        packet-disp.c \
@@ -121,15 +125,23 @@ ASN1_DISSECTOR_SRC = \
        packet-h450-ros.c \
        packet-h460.c \
        packet-h501.c \
+       packet-HI2Operations.c \
+       packet-hnbap.c \
+       packet-lcsap.c \
+       packet-lppa.c \
        packet-idmp.c \
+       packet-inap.c \
        packet-logotypecertextn.c \
        packet-mms.c \
+       packet-mndp.c \
        packet-mpeg-audio.c \
        packet-mpeg-pes.c \
        packet-ns_cert_exts.c \
        packet-ocsp.c \
        packet-opsi.c \
+       packet-p22.c \
        packet-p7.c \
+       packet-p772.c \
        packet-pkcs1.c \
        packet-pkinit.c \
        packet-pkix1explicit.c \
@@ -146,11 +158,12 @@ ASN1_DISSECTOR_SRC = \
        packet-rtse.c \
        packet-rua.c \
        packet-s1ap.c           \
-       packet-s4406.c \
        packet-sabp.c \
+       packet-sbc-ap.c \
        packet-smrse.c \
        packet-spnego.c \
        packet-sv.c \
+       packet-t38.c            \
        packet-ulp.c \
        packet-wlancertextn.c \
        packet-x224.c \
@@ -166,13 +179,13 @@ ASN1_DISSECTOR_SRC = \
 DIRTY_ASN1_DISSECTOR_SRC = \
        packet-ansi_map.c \
        packet-gnm.c \
+       packet-gprscdr.c \
        packet-gsm_map.c \
-       packet-HI2Operations.c \
-       packet-hnbap.c \
-       packet-inap.c \
        packet-ldap.c \
+       packet-lpp.c \
        packet-lte-rrc.c \
        packet-nbap.c \
+       packet-p1.c \
        packet-pcap.c \
        packet-pkcs12.c \
        packet-pres.c \
@@ -180,10 +193,10 @@ DIRTY_ASN1_DISSECTOR_SRC = \
        packet-rrc.c \
        packet-rrlp.c \
        packet-snmp.c \
+       packet-t124.c \
        packet-t125.c \
        packet-tcap.c \
-       packet-x411.c \
-       packet-x420.c
+       packet-tetra.c
 
 #
 # Dissectors without warnings.
@@ -196,17 +209,17 @@ DISSECTOR_SRC = \
        packet-6lowpan.c        \
        packet-9p.c             \
        packet-aarp.c           \
-       packet-adwin.c          \
-       packet-adwin-config.c   \
        packet-acap.c           \
        packet-acn.c            \
        packet-actrace.c        \
+       packet-adwin.c          \
+       packet-adwin-config.c   \
        packet-afp.c            \
        packet-afs.c            \
        packet-agentx.c         \
        packet-aim.c            \
-       packet-aim-adverts.c    \
        packet-aim-admin.c      \
+       packet-aim-adverts.c    \
        packet-aim-bos.c        \
        packet-aim-buddylist.c  \
        packet-aim-chat.c       \
@@ -255,9 +268,11 @@ DISSECTOR_SRC = \
        packet-assa_r3.c        \
        packet-atalk.c          \
        packet-atm.c            \
+       packet-atmtcp.c         \
        packet-auto_rp.c        \
        packet-ax4000.c         \
        packet-ayiya.c          \
+       packet-babel.c          \
        packet-bacapp.c         \
        packet-bacnet.c         \
        packet-banana.c         \
@@ -270,14 +285,17 @@ DISSECTOR_SRC = \
        packet-bgp.c            \
        packet-bittorrent.c     \
        packet-bjnp.c           \
+       packet-bmc.c            \
        packet-bofl.c           \
        packet-bootp.c          \
        packet-bootparams.c     \
        packet-bpdu.c           \
        packet-brdwlk.c         \
+       packet-brp.c            \
        packet-bssap.c          \
        packet-bssgp.c          \
        packet-btamp.c          \
+       packet-bt-dht.c \
        packet-bthci_acl.c      \
        packet-bthci_cmd.c      \
        packet-bthci_evt.c      \
@@ -286,6 +304,7 @@ DISSECTOR_SRC = \
        packet-btobex.c         \
        packet-btrfcomm.c       \
        packet-btsdp.c          \
+       packet-bt-utp.c         \
        packet-bvlc.c           \
        packet-calcappprotocol.c  \
        packet-capwap.c         \
@@ -300,6 +319,7 @@ DISSECTOR_SRC = \
        packet-cimd.c           \
        packet-cimetrics.c      \
        packet-cip.c            \
+       packet-cipmotion.c      \
        packet-cisco-erspan.c   \
        packet-cisco-oui.c      \
        packet-cisco-sm.c       \
@@ -309,6 +329,7 @@ DISSECTOR_SRC = \
        packet-clip.c           \
        packet-clnp.c           \
        packet-cmpp.c           \
+       packet-cnip.c           \
        packet-collectd.c       \
        packet-componentstatus.c \
        packet-cops.c           \
@@ -316,6 +337,7 @@ DISSECTOR_SRC = \
        packet-cpfi.c           \
        packet-cpha.c           \
        packet-csm-encaps.c     \
+       packet-csn1.c           \
        packet-ctdb.c           \
        packet-cups.c           \
        packet-daap.c           \
@@ -398,11 +420,11 @@ DISSECTOR_SRC = \
        packet-dhcpv6.c         \
        packet-diameter.c       \
        packet-diameter_3gpp.c  \
+       packet-diffserv-mpls-common.c   \
        packet-dis.c            \
        packet-dis-enums.c      \
        packet-dis-fields.c     \
        packet-dis-pdus.c       \
-       packet-diffserv-mpls-common.c   \
        packet-distcc.c         \
        packet-dlm3.c           \
        packet-dlsw.c           \
@@ -419,6 +441,7 @@ DISSECTOR_SRC = \
        packet-dtp.c            \
        packet-dtpt.c           \
        packet-dua.c            \
+       packet-dvbci.c          \
        packet-dvmrp.c          \
        packet-e100.c           \
        packet-e164.c           \
@@ -427,6 +450,7 @@ DISSECTOR_SRC = \
        packet-eapol.c          \
        packet-echo.c           \
        packet-edonkey.c        \
+       packet-erldp.c          \
        packet-egd.c            \
        packet-ehs.c            \
        packet-eigrp.c          \
@@ -457,6 +481,7 @@ DISSECTOR_SRC = \
        packet-fcip.c           \
        packet-fclctl.c         \
        packet-fcoe.c           \
+       packet-fcoib.c          \
        packet-fcp.c            \
        packet-fcsb3.c          \
        packet-fcsp.c           \
@@ -469,6 +494,7 @@ DISSECTOR_SRC = \
        packet-flip.c           \
        packet-fmp.c            \
        packet-fmp_notify.c     \
+       packet-fmtp.c           \
        packet-force10-oui.c    \
        packet-fp_hint.c        \
        packet-fr.c             \
@@ -495,9 +521,10 @@ DISSECTOR_SRC = \
        packet-gsm_a_gm.c       \
        packet-gsm_a_rp.c       \
        packet-gsm_a_rr.c       \
-       packet-gsm_ipa.c        \
        packet-gsm_bsslap.c     \
        packet-gsm_bssmap_le.c  \
+       packet-gsm_ipa.c        \
+       packet-gsm_rlcmac.c     \
        packet-gsm_sms.c        \
        packet-gsm_sms_ud.c     \
        packet-gsm_um.c         \
@@ -510,11 +537,11 @@ DISSECTOR_SRC = \
        packet-h1.c             \
        packet-h221_nonstd.c    \
        packet-h223.c           \
-       packet-h248_annex_c.c   \
-       packet-h248_annex_e.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           \
@@ -523,13 +550,18 @@ DISSECTOR_SRC = \
        packet-hci_h1.c         \
        packet-hci_h4.c         \
        packet-hclnfsd.c        \
-       packet-hilscher.c       \
+       packet-hdcp.c           \
+       packet-hdfs.c           \
+       packet-hdfsdata.c       \
        packet-hip.c            \
        packet-homeplug.c       \
-       packet-hp-erm.c         \
+       packet-homeplug-av.c    \
+       packet-hp-erm.c         \
        packet-hpext.c          \
        packet-hpsw.c           \
        packet-hpteam.c         \
+       packet-hsr.c            \
+       packet-hsr-prp-supervision.c            \
        packet-hsrp.c           \
        packet-http.c           \
        packet-hyperscsi.c      \
@@ -537,7 +569,6 @@ DISSECTOR_SRC = \
        packet-iana-oui.c       \
        packet-iapp.c           \
        packet-iax2.c           \
-       packet-infiniband_sdp.c \
        packet-icap.c           \
        packet-icep.c           \
        packet-icmp.c           \
@@ -548,6 +579,9 @@ DISSECTOR_SRC = \
        packet-iec104.c         \
        packet-ieee1722.c       \
        packet-ieee80211.c      \
+       packet-ieee80211-prism.c \
+       packet-ieee80211-radio.c \
+       packet-ieee80211-wlancap.c \
        packet-ieee802154.c     \
        packet-ieee8021ah.c     \
        packet-ieee8023.c       \
@@ -562,8 +596,9 @@ DISSECTOR_SRC = \
        packet-imap.c           \
        packet-imf.c            \
        packet-infiniband.c     \
-       packet-ipars.c          \
+       packet-infiniband_sdp.c \
        packet-ip.c             \
+       packet-ipars.c          \
        packet-ipdc.c           \
        packet-ipfc.c           \
        packet-ipmi.c           \
@@ -597,9 +632,9 @@ DISSECTOR_SRC = \
        packet-iuup.c           \
        packet-iwarp-ddp-rdmap.c\
        packet-iwarp-mpa.c      \
-       packet-jabber.c         \
        packet-jmirror.c        \
        packet-jpeg.c           \
+       packet-json.c           \
        packet-juniper.c        \
        packet-jxta.c           \
        packet-k12.c            \
@@ -607,11 +642,13 @@ DISSECTOR_SRC = \
        packet-kdp.c            \
        packet-kerberos.c       \
        packet-kerberos4.c      \
-       packet-klm.c            \
        packet-kingfisher.c     \
        packet-kink.c           \
        packet-kismet.c         \
+       packet-klm.c            \
+       packet-knet.c           \
        packet-kpasswd.c        \
+       packet-l1-events.c      \
        packet-l2tp.c           \
        packet-lanforge.c       \
        packet-lapb.c           \
@@ -619,16 +656,18 @@ DISSECTOR_SRC = \
        packet-lapd.c           \
        packet-lapdm.c          \
        packet-laplink.c        \
-       packet-l1-events.c      \
        packet-ldp.c            \
        packet-ldss.c           \
        packet-lge_monitor.c    \
        packet-linx.c           \
+       packet-lisp-data.c      \
+       packet-lisp.c           \
        packet-llc.c            \
        packet-lldp.c           \
        packet-llt.c            \
        packet-lmi.c            \
        packet-lmp.c            \
+       packet-lon.c            \
        packet-loop.c           \
        packet-lpd.c            \
        packet-lsc.c            \
@@ -640,8 +679,8 @@ DISSECTOR_SRC = \
        packet-m2ua.c           \
        packet-m3ua.c           \
        packet-mac-lte.c                \
-       packet-mactelnet.c      \
        packet-maccontrol.c     \
+       packet-mactelnet.c      \
        packet-manolito.c       \
        packet-mbtcp.c          \
        packet-mdshdr.c         \
@@ -652,10 +691,10 @@ DISSECTOR_SRC = \
        packet-meta.c           \
        packet-mgcp.c           \
        packet-mikey.c          \
+       packet-mime-encap.c     \
        packet-miop.c           \
        packet-mip.c            \
        packet-mip6.c           \
-       packet-ms-mms.c         \
        packet-mmse.c           \
        packet-mongo.c          \
        packet-mount.c          \
@@ -667,11 +706,14 @@ DISSECTOR_SRC = \
        packet-mq.c             \
        packet-mq-pcf.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           \
@@ -679,9 +721,11 @@ DISSECTOR_SRC = \
        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            \
@@ -695,6 +739,7 @@ DISSECTOR_SRC = \
        packet-ndmp.c           \
        packet-ndp.c            \
        packet-ndps.c           \
+  packet-netanalyzer.c  \
        packet-netbios.c        \
        packet-netdump.c        \
        packet-netflow.c        \
@@ -711,9 +756,9 @@ DISSECTOR_SRC = \
        packet-nlm.c            \
        packet-nlsp.c           \
        packet-nntp.c           \
-       packet-nstrace.c        \
        packet-nsip.c           \
        packet-nsrp.c           \
+       packet-nstrace.c        \
        packet-nt-oui.c         \
        packet-nt-tpcp.c        \
        packet-ntlmssp.c        \
@@ -724,6 +769,7 @@ DISSECTOR_SRC = \
        packet-olsr.c           \
        packet-omapi.c          \
        packet-omron-fins.c     \
+       packet-opensafety.c     \
        packet-osi-options.c    \
        packet-osi.c            \
        packet-ositp.c          \
@@ -741,19 +787,20 @@ DISSECTOR_SRC = \
        packet-per.c            \
        packet-pflog.c          \
        packet-pgm.c            \
+       packet-pgsql.c          \
        packet-pim.c            \
        packet-pingpongprotocol.c       \
-       packet-pktgen.c         \
        packet-pktc.c           \
+       packet-pktgen.c         \
        packet-pnrp.c           \
        packet-pop.c            \
        packet-portmap.c        \
-       packet-pgsql.c          \
        packet-ppi.c            \
        packet-ppi-antenna.c    \
        packet-ppi-geolocation-common.c \
        packet-ppi-gps.c        \
        packet-ppi-vector.c     \
+       packet-ppi-sensor.c     \
        packet-ppp.c            \
        packet-pppoe.c          \
        packet-pptp.c           \
@@ -761,11 +808,11 @@ DISSECTOR_SRC = \
        packet-ptp.c            \
        packet-pvfs2.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-eth.c         \
+       packet-pw-fr.c          \
+       packet-pw-hdlc.c        \
        packet-pw-satop.c       \
        packet-q2931.c          \
        packet-q708.c           \
@@ -776,12 +823,13 @@ DISSECTOR_SRC = \
        packet-quake2.c         \
        packet-quake3.c         \
        packet-quakeworld.c     \
-       packet-radius.c         \
-       packet-radius_packetcable.c     \
        packet-radiotap.c       \
        packet-radiotap-iter.c  \
+       packet-radius.c         \
+       packet-radius_packetcable.c     \
        packet-raw.c            \
        packet-rdm.c            \
+       packet-rdp.c            \
        packet-rdt.c            \
        packet-redback.c        \
        packet-redbackli.c      \
@@ -792,8 +840,9 @@ DISSECTOR_SRC = \
        packet-rgmp.c           \
        packet-rip.c            \
        packet-ripng.c          \
+       packet-rfid-mifare.c    \
        packet-rlc.c            \
-       packet-rlc-lte.c                \
+       packet-rlc-lte.c        \
        packet-rlm.c            \
        packet-rlogin.c         \
        packet-rmcp.c           \
@@ -804,12 +853,14 @@ DISSECTOR_SRC = \
        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-rpl.c            \
        packet-rquota.c         \
        packet-rsh.c            \
+       packet-rsip.c           \
        packet-rsl.c            \
        packet-rstat.c          \
        packet-rsvp.c           \
@@ -834,6 +885,7 @@ DISSECTOR_SRC = \
        packet-sccp.c           \
        packet-sccpmg.c         \
        packet-scop.c           \
+       packet-scriptingservice.c \
        packet-scsi.c           \
        packet-scsi-mmc.c       \
        packet-scsi-osd.c       \
@@ -844,11 +896,13 @@ DISSECTOR_SRC = \
        packet-sdlc.c           \
        packet-sdp.c            \
        packet-sebek.c          \
+       packet-sercosiii.c      \
        packet-ses.c            \
        packet-sflow.c          \
+       packet-sgsap.c          \
+       packet-sigcomp.c        \
        packet-simulcrypt.c     \
        packet-sip.c            \
-       packet-sigcomp.c        \
        packet-sipfrag.c        \
        packet-sita.c           \
        packet-skinny.c         \
@@ -872,14 +926,13 @@ DISSECTOR_SRC = \
        packet-sndcp-xid.c      \
        packet-socketcan.c      \
        packet-socks.c          \
-       packet-nasdaq-soup.c    \
+       packet-spice.c          \
        packet-spp.c            \
        packet-spray.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      \
@@ -893,7 +946,6 @@ DISSECTOR_SRC = \
        packet-synphasor.c      \
        packet-syslog.c         \
        packet-t30.c            \
-       packet-t38.c            \
        packet-tacacs.c         \
        packet-tali.c           \
        packet-tapa.c           \
@@ -902,23 +954,24 @@ DISSECTOR_SRC = \
        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-teklink.c        \
        packet-tftp.c           \
        packet-time.c           \
        packet-tipc.c           \
        packet-tivoconnect.c    \
-       packet-tnef.c           \
-       packet-tns.c            \
        packet-tn3270.c         \
        packet-tn5250.c         \
+       packet-tnef.c           \
+       packet-tns.c            \
        packet-tpkt.c           \
        packet-tpncp.c          \
-       packet-tr.c             \
-       packet-trill.c          \
+       packet-tr.c                     \
+       packet-trill.c      \
+       packet-mim.c        \
        packet-trmac.c          \
        packet-tsp.c            \
        packet-tte.c            \
@@ -927,30 +980,37 @@ DISSECTOR_SRC = \
        packet-turnchannel.c    \
        packet-tuxedo.c         \
        packet-tzsp.c           \
+       packet-ua.c                     \
+       packet-uaudp.c          \
        packet-ucp.c            \
        packet-udld.c           \
-       packet-uma.c            \
        packet-udp.c            \
+       packet-uma.c            \
+       packet-umts_fp.c        \
+       packet-umts_mac.c       \
        packet-usb.c            \
-       packet-usb-masstorage.c \
+       packet-usb-at.c         \
+       packet-usb-ccid.c       \
        packet-usb-hid.c        \
        packet-usb-hub.c        \
-       packet-umts_fp.c        \
-       packet-umts_mac.c       \
+       packet-usb-masstorage.c \
        packet-user_encap.c     \
        packet-uts.c            \
        packet-v120.c           \
-       packet-v5ua.c           \
        packet-v52.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-vrrp.c           \
        packet-vtp.c            \
+       packet-vuze-dht.c       \
        packet-vxi11.c          \
+       packet-vxlan.c          \
        packet-wai.c            \
        packet-wap.c            \
        packet-wassp.c          \
@@ -976,6 +1036,14 @@ DISSECTOR_SRC = \
        packet-xcsl.c           \
        packet-xdmcp.c          \
        packet-xml.c            \
+       packet-xmcp.c           \
+       packet-xmpp.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-xot.c            \
        packet-xtp.c            \
        packet-xyplex.c         \
@@ -986,8 +1054,8 @@ DISSECTOR_SRC = \
        packet-ypserv.c         \
        packet-ypxfr.c          \
        packet-zbee-aps.c       \
-       packet-zbee-security.c  \
        packet-zbee-nwk.c       \
+       packet-zbee-security.c  \
        packet-zbee-zcl.c       \
        packet-zbee-zdp.c       \
        packet-zbee-zdp-binding.c       \
@@ -996,7 +1064,8 @@ DISSECTOR_SRC = \
        packet-zebra.c          \
        packet-zep.c            \
        packet-ziop.c           \
-       packet-zrtp.c
+       packet-zrtp.c   \
+       $(CUSTOM_DISSECTOR_SRC)
 
 #
 # Headers for dissectors.
@@ -1020,6 +1089,7 @@ DISSECTOR_INCLUDES =      \
        packet-assa_r3_public.h \
        packet-atalk.h  \
        packet-atm.h    \
+       packet-bacapp.h \
        packet-ber.h    \
        packet-bgp.h    \
        packet-bootparams.h     \
@@ -1028,10 +1098,11 @@ DISSECTOR_INCLUDES =    \
        packet-bthci_acl.h      \
        packet-btl2cap.h        \
        packet-btrfcomm.h       \
+       packet-btsdp.h  \
        packet-camel.h  \
-       packet-chdlc.h  \
        packet-cdt.h    \
        packet-charging_ase.h   \
+       packet-chdlc.h  \
        packet-cimd.h   \
        packet-cip.h    \
        packet-clearcase.h      \
@@ -1039,11 +1110,14 @@ DISSECTOR_INCLUDES =    \
        packet-cmip.h \
        packet-cmp.h    \
        packet-cms.h    \
+       packet-credssp.h \
        packet-crmf.h   \
+       packet-csn1.h   \
        packet-dap.h    \
        packet-data.h   \
        packet-dcc.h    \
        packet-dccp.h   \
+       packet-dcerpc.h \
        packet-dcerpc-browser.h \
        packet-dcerpc-budb.h    \
        packet-dcerpc-butc.h    \
@@ -1062,7 +1136,6 @@ DISSECTOR_INCLUDES =      \
        packet-dcerpc-spoolss.h \
        packet-dcerpc-svcctl.h  \
        packet-dcerpc-tapi.h    \
-       packet-dcerpc.h \
        packet-dcom.h   \
        packet-dcom-dispatch.h  \
        packet-dcm.h    \
@@ -1084,8 +1157,7 @@ DISSECTOR_INCLUDES =      \
        packet-e212.h   \
        packet-edonkey.h        \
        packet-enc.h    \
-       packet-epl.h    \
-       packet-epl_v1.h \
+       packet-epmd.h   \
        packet-esis.h   \
        packet-ess.h    \
        packet-eth.h    \
@@ -1110,9 +1182,11 @@ DISSECTOR_INCLUDES =     \
        packet-giop.h   \
        packet-gnm.h    \
        packet-gnutella.h       \
+       packet-gprscdr.h \
        packet-gre.h    \
        packet-gsm_a_common.h   \
        packet-gsm_map.h        \
+       packet-gsm_rlcmac.h     \
        packet-gsm_sms.h        \
        packet-gssapi.h \
        packet-gtp.h    \
@@ -1131,6 +1205,7 @@ DISSECTOR_INCLUDES =      \
        packet-http.h   \
        packet-i2c.h    \
        packet-iax2.h   \
+       packet-icmp.h   \
        packet-idmp.h   \
        packet-idp.h    \
        packet-ieee80211.h      \
@@ -1144,29 +1219,30 @@ DISSECTOR_INCLUDES =    \
        packet-inap.h   \
        packet-infiniband.h     \
        packet-ip.h     \
-       packet-ipdc.h   \
        packet-ipfc.h   \
        packet-ipmi.h   \
        packet-ipsec.h  \
        packet-ipv6.h   \
        packet-ipx.h    \
        packet-isakmp.h \
+       packet-isis.h   \
        packet-isis-clv.h       \
        packet-isis-hello.h     \
        packet-isis-lsp.h       \
        packet-isis-snp.h       \
-       packet-isis.h   \
        packet-isl.h    \
        packet-isup.h   \
        packet-jxta.h   \
        packet-kerberos.h       \
        packet-klm.h    \
        packet-ldap.h   \
+       packet-lcsap.h \
        packet-ldp.h    \
        packet-llc.h    \
        packet-logotypecertextn.h       \
        packet-lte-rrc.h        \
        packet-mac-lte.h                \
+       packet-mbtcp.h  \
        packet-meta.h   \
        packet-mgcp.h           \
        packet-mms.h    \
@@ -1193,13 +1269,15 @@ DISSECTOR_INCLUDES =    \
        packet-ntp.h    \
        packet-null.h   \
        packet-ocsp.h   \
-       packet-osi-options.h    \
        packet-osi.h    \
+       packet-osi-options.h    \
+       packet-p1.h     \
+       packet-p22.h    \
        packet-p7.h \
+       packet-p772.h   \
        packet-pcnfsd.h \
        packet-pdcp-lte.h       \
        packet-per.h    \
-       packet-pflog.h  \
        packet-pim.h    \
        packet-pkcs1.h  \
        packet-pkcs12.h \
@@ -1228,9 +1306,10 @@ DISSECTOR_INCLUDES =     \
        packet-radius.h \
        packet-ranap.h  \
        packet-raw.h    \
+       packet-rdp.h    \
        packet-rdt.h    \
+       packet-reload.h \
        packet-rgmp.h   \
-       packet-ripng.h  \
        packet-rlc.h    \
        packet-rlc-lte.h                \
        packet-rmi.h    \
@@ -1250,10 +1329,10 @@ DISSECTOR_INCLUDES =    \
        packet-rtps2.h          \
        packet-rtp-events.h     \
        packet-rtse.h   \
+       packet-rtsp.h   \
        packet-rwall.h  \
        packet-rx.h             \
        packet-s1ap.h   \
-       packet-s4406.h  \
        packet-sccp.h \
        packet-scsi.h   \
        packet-scsi-mmc.h       \
@@ -1281,26 +1360,30 @@ DISSECTOR_INCLUDES =    \
        packet-sscop.h \
        packet-ssl.h    \
        packet-ssl-utils.h      \
-       packet-stat-notify.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-tns.h    \
+       packet-tetra.h  \
        packet-tn3270.h \
        packet-tn5250.h \
+       packet-tns.h    \
        packet-tpkt.h   \
        packet-tr.h     \
        packet-tte.h \
+       packet-ua.h \
        packet-udp.h    \
        packet-umts_fp.h        \
        packet-umts_mac.h       \
        packet-usb.h    \
        packet-usb-hid.h        \
        packet-vines.h  \
+       packet-vlan.h   \
        packet-wap.h    \
        packet-wccp.h   \
        packet-wifi-p2p.h       \
@@ -1318,22 +1401,26 @@ DISSECTOR_INCLUDES =    \
        x11-extension-errors.h  \
        x11-glx-render-enum.h   \
        x11-enum.h      \
-       packet-x411.h   \
-       packet-x420.h   \
        packet-x509af.h \
        packet-x509ce.h \
        packet-x509if.h \
        packet-x509sat.h        \
        packet-xml.h    \
-       packet-xtp.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-security.h  \
        packet-zbee-nwk.h       \
+       packet-zbee-security.h  \
        packet-zbee-zcl.h       \
        packet-zbee-zdp.h       \
        packet-zep.h    \
@@ -1371,11 +1458,4 @@ ALL_DISSECTORS_SRC = \
        $(PIDL_DISSECTOR_SRC) \
        $(DIRTY_PIDL_DISSECTOR_SRC) \
        $(ASN1_DISSECTOR_SRC) \
-       $(DIRTY_ASN1_DISSECTOR_SRC) \
-       $(CUSTOM_DISSECTOR_SRC)
-
-
-checkapi:
-       $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
-               $(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) \
-               packet-dcerpc-nt.c
+       $(DIRTY_ASN1_DISSECTOR_SRC)