From Guy Martin:
[obnox/wireshark/wip.git] / epan / dissectors / Makefile.common
index d0c8fa0215ffe2909370a4bbb576891da9d8421b..ff8023cfe1ea714a1de2684c901c8acc579e72df 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
@@ -48,7 +50,6 @@ 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 \
@@ -64,9 +65,11 @@ PIDL_DISSECTOR_SRC = \
 # PIDL-generated DCE RPC dissectors with warnings.
 #
 DIRTY_PIDL_DISSECTOR_SRC = \
-       packet-dcerpc-dnsserver.c       \
+       packet-dcerpc-dfs.c \
+       packet-dcerpc-dnsserver.c       \
        packet-dcerpc-eventlog.c \
        packet-dcerpc-lsa.c \
+       packet-dcerpc-mapi.c \
        packet-dcerpc-winreg.c
 
 #
@@ -80,12 +83,14 @@ PIDL_DISSECTOR_INCLUDES = \
        packet-dcerpc-eventlog.h        \
        packet-dcerpc-initshutdown.h    \
        packet-dcerpc-lsa.h     \
+       packet-dcerpc-mapi.h    \
+       packet-dcerpc-misc.h    \
        packet-dcerpc-nspi.h    \
-       packet-dcerpc-rfr.h \
+       packet-dcerpc-rfr.h     \
        packet-dcerpc-srvsvc.h  \
-       packet-dcerpc-winreg.h \
+       packet-dcerpc-winreg.h  \
        packet-dcerpc-wkssvc.h  \
-       packet-dcerpc-wzcsvc.h \
+       packet-dcerpc-wzcsvc.h  \
        packet-dcerpc-frstrans.h
 
 #
@@ -95,13 +100,14 @@ ASN1_DISSECTOR_SRC = \
        packet-acp133.c \
        packet-acse.c \
        packet-ansi_tcap.c \
+       packet-c1222.c \
        packet-camel.c \
        packet-cdt.c \
        packet-charging_ase.c   \
        packet-cmip.c \
        packet-cmp.c \
        packet-cms.c \
-       packet-coap.c \
+       packet-credssp.c \
        packet-crmf.c \
        packet-dap.c \
        packet-disp.c \
@@ -110,6 +116,7 @@ ASN1_DISSECTOR_SRC = \
        packet-ess.c \
        packet-ftam.c \
        packet-goose.c \
+       packet-HI2Operations.c \
        packet-h225.c \
        packet-h235.c \
        packet-h245.c \
@@ -121,13 +128,14 @@ ASN1_DISSECTOR_SRC = \
        packet-h450-ros.c \
        packet-h460.c \
        packet-h501.c \
-       packet-HI2Operations.c \
        packet-hnbap.c \
        packet-idmp.c \
        packet-inap.c \
+       packet-lcsap.c \
        packet-logotypecertextn.c \
+       packet-lppa.c \
+       packet-lte-rrc.c \
        packet-mms.c \
-       packet-mndp.c \
        packet-mpeg-audio.c \
        packet-mpeg-pes.c \
        packet-ns_cert_exts.c \
@@ -153,6 +161,7 @@ ASN1_DISSECTOR_SRC = \
        packet-rua.c \
        packet-s1ap.c           \
        packet-sabp.c \
+       packet-sbc-ap.c \
        packet-smrse.c \
        packet-spnego.c \
        packet-sv.c \
@@ -175,7 +184,8 @@ DIRTY_ASN1_DISSECTOR_SRC = \
        packet-gprscdr.c \
        packet-gsm_map.c \
        packet-ldap.c \
-       packet-lte-rrc.c \
+       packet-lpp.c \
+       packet-m3ap.c \
        packet-nbap.c \
        packet-p1.c \
        packet-pcap.c \
@@ -185,6 +195,7 @@ DIRTY_ASN1_DISSECTOR_SRC = \
        packet-rrc.c \
        packet-rrlp.c \
        packet-snmp.c \
+       packet-t124.c \
        packet-t125.c \
        packet-tcap.c \
        packet-tetra.c
@@ -193,13 +204,14 @@ DIRTY_ASN1_DISSECTOR_SRC = \
 # Dissectors without warnings.
 #
 DISSECTOR_SRC = \
-       packet-2dparityfec.c    \
+       packet-2dparityfec.c    \
        packet-3com-njack.c     \
        packet-3com-xns.c       \
        packet-3g-a11.c         \
        packet-6lowpan.c        \
        packet-9p.c             \
        packet-aarp.c           \
+       packet-aastra-aasp.c    \
        packet-acap.c           \
        packet-acn.c            \
        packet-actrace.c        \
@@ -207,28 +219,28 @@ DISSECTOR_SRC = \
        packet-adwin-config.c   \
        packet-afp.c            \
        packet-afs.c            \
-       packet-agentx.c         \
+       packet-agentx.c         \
        packet-aim.c            \
-       packet-aim-admin.c      \
+       packet-aim-admin.c      \
        packet-aim-adverts.c    \
-       packet-aim-bos.c        \
+       packet-aim-bos.c        \
        packet-aim-buddylist.c  \
        packet-aim-chat.c       \
-       packet-aim-chatnav.c    \
+       packet-aim-chatnav.c    \
        packet-aim-directory.c  \
-       packet-aim-email.c      \
+       packet-aim-email.c      \
        packet-aim-generic.c    \
-       packet-aim-icq.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-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          \
@@ -247,7 +259,7 @@ DISSECTOR_SRC = \
        packet-app-pkix-cert.c  \
        packet-applemidi.c      \
        packet-arcnet.c         \
-       packet-armagetronad.c   \
+       packet-armagetronad.c   \
        packet-arp.c            \
        packet-artnet.c         \
        packet-aruba-adp.c      \
@@ -257,6 +269,7 @@ DISSECTOR_SRC = \
        packet-ascend.c         \
        packet-asf.c            \
        packet-assa_r3.c        \
+       packet-at.c             \
        packet-atalk.c          \
        packet-atm.c            \
        packet-atmtcp.c         \
@@ -274,7 +287,7 @@ DISSECTOR_SRC = \
        packet-ber.c            \
        packet-bfd.c            \
        packet-bgp.c            \
-       packet-bittorrent.c     \
+       packet-bittorrent.c     \
        packet-bjnp.c           \
        packet-bmc.c            \
        packet-bofl.c           \
@@ -282,9 +295,11 @@ DISSECTOR_SRC = \
        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      \
@@ -295,19 +310,22 @@ DISSECTOR_SRC = \
        packet-btsdp.c          \
        packet-bt-utp.c         \
        packet-bvlc.c           \
+       packet-bzr.c            \
        packet-calcappprotocol.c  \
        packet-capwap.c         \
        packet-cast.c           \
        packet-catapult-dct2000.c \
        packet-ccsds.c          \
        packet-cdp.c            \
+       packet-cell_broadcast.c \
        packet-cfm.c            \
        packet-cgmp.c           \
        packet-chdlc.c          \
-       packet-cigi.c           \
+       packet-cigi.c           \
        packet-cimd.c           \
        packet-cimetrics.c      \
        packet-cip.c            \
+       packet-cipmotion.c      \
        packet-cisco-erspan.c   \
        packet-cisco-oui.c      \
        packet-cisco-sm.c       \
@@ -318,9 +336,10 @@ DISSECTOR_SRC = \
        packet-clnp.c           \
        packet-cmpp.c           \
        packet-cnip.c           \
+       packet-coap.c           \
        packet-collectd.c       \
        packet-componentstatus.c \
-       packet-cops.c           \
+       packet-cops.c           \
        packet-cosine.c         \
        packet-cpfi.c           \
        packet-cpha.c           \
@@ -330,42 +349,41 @@ DISSECTOR_SRC = \
        packet-cups.c           \
        packet-daap.c           \
        packet-data.c           \
-       packet-daytime.c        \
+       packet-daytime.c        \
        packet-db-lsp.c         \
        packet-dcc.c            \
        packet-dccp.c           \
        packet-dcerpc-bossvr.c          \
        packet-dcerpc-browser.c         \
        packet-dcerpc-cds_clerkserver.c \
-       packet-dcerpc-cds_solicit.c     \
+       packet-dcerpc-cds_solicit.c     \
        packet-dcerpc-conv.c            \
-       packet-dcerpc-cprpc_server.c    \
+       packet-dcerpc-cprpc_server.c    \
        packet-dcerpc-dce122.c          \
-       packet-dcerpc-dtsprovider.c     \
-       packet-dcerpc-dtsstime_req.c    \
+       packet-dcerpc-dtsprovider.c     \
+       packet-dcerpc-dtsstime_req.c    \
        packet-dcerpc-epm.c             \
        packet-dcerpc-fileexp.c         \
        packet-dcerpc-fldb.c            \
        packet-dcerpc-frsapi.c          \
        packet-dcerpc-frsrpc.c          \
-       packet-dcerpc-ftserver.c        \
+       packet-dcerpc-ftserver.c        \
        packet-dcerpc-icl_rpc.c         \
        packet-dcerpc-krb5rpc.c         \
        packet-dcerpc-llb.c             \
-       packet-dcerpc-mapi.c            \
-       packet-dcerpc-messenger.c       \
+       packet-dcerpc-messenger.c       \
        packet-dcerpc-mgmt.c            \
        packet-dcerpc-ndr.c             \
-       packet-dcerpc-netlogon.c        \
+       packet-dcerpc-netlogon.c        \
        packet-dcerpc-pnp.c             \
        packet-dcerpc-rdaclif.c         \
-       packet-dcerpc-rep_proc.c        \
-       packet-dcerpc-roverride.c       \
+       packet-dcerpc-rep_proc.c        \
+       packet-dcerpc-roverride.c       \
        packet-dcerpc-rpriv.c           \
        packet-dcerpc-rras.c            \
        packet-dcerpc-rs_acct.c         \
        packet-dcerpc-rs_attr.c         \
-       packet-dcerpc-rs_attr_schema.c  \
+       packet-dcerpc-rs_attr_schema.c  \
        packet-dcerpc-rs_bind.c         \
        packet-dcerpc-rs_misc.c         \
        packet-dcerpc-rs_pgo.c          \
@@ -393,12 +411,12 @@ 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-dcom-dispatch.c  \
+       packet-dcom-oxid.c      \
+       packet-dcom-remact.c    \
+       packet-dcom-remunkn.c   \
+       packet-dcom-sysact.c    \
        packet-dcp-etsi.c       \
        packet-ddtp.c           \
        packet-dec-bpdu.c       \
@@ -422,13 +440,14 @@ DISSECTOR_SRC = \
        packet-dplay.c          \
        packet-dpnss.c          \
        packet-dpnss-link.c     \
-       packet-drda.c           \
+       packet-drda.c           \
        packet-dsi.c            \
        packet-dtls.c           \
        packet-dtn.c            \
        packet-dtp.c            \
        packet-dtpt.c           \
        packet-dua.c            \
+       packet-dvb-ipdc.c       \
        packet-dvbci.c          \
        packet-dvmrp.c          \
        packet-e100.c           \
@@ -442,13 +461,14 @@ DISSECTOR_SRC = \
        packet-egd.c            \
        packet-ehs.c            \
        packet-eigrp.c          \
+       packet-elcom.c          \
        packet-enc.c            \
        packet-enip.c           \
        packet-enrp.c           \
        packet-enttec.c         \
        packet-epl.c            \
        packet-epl_v1.c         \
-       packet-epmd.c           \
+       packet-epmd.c           \
        packet-erf.c            \
        packet-esio.c           \
        packet-esis.c           \
@@ -456,6 +476,7 @@ DISSECTOR_SRC = \
        packet-eth.c            \
        packet-etherip.c        \
        packet-ethertype.c      \
+       packet-etsi_card_app_toolkit.c  \
        packet-evrc.c           \
        packet-exec.c           \
        packet-extreme.c        \
@@ -482,6 +503,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             \
@@ -490,6 +512,7 @@ DISSECTOR_SRC = \
        packet-ftp.c            \
        packet-fw1.c            \
        packet-g723.c           \
+       packet-gadu-gadu.c      \
        packet-gdsdb.c          \
        packet-gift.c           \
        packet-giop.c           \
@@ -497,21 +520,24 @@ DISSECTOR_SRC = \
        packet-glbp.c           \
        packet-gmhdr.c          \
        packet-gmrp.c           \
+       packet-gmr1_bcch.c      \
        packet-gnutella.c       \
        packet-gopher.c         \
        packet-gpef.c           \
        packet-gprs-llc.c       \
        packet-gre.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_abis_oml.c   \
        packet-gsm_bsslap.c     \
        packet-gsm_bssmap_le.c  \
+       packet-gsm_cbch.c       \
        packet-gsm_ipa.c        \
        packet-gsm_rlcmac.c     \
+       packet-gsm_sim.c        \
        packet-gsm_sms.c        \
        packet-gsm_sms_ud.c     \
        packet-gsm_um.c         \
@@ -524,11 +550,12 @@ DISSECTOR_SRC = \
        packet-h1.c             \
        packet-h221_nonstd.c    \
        packet-h223.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_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           \
@@ -537,14 +564,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-homeplug-av.c    \
-       packet-hp-erm.c         \
+       packet-homeplug.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      \
@@ -562,6 +593,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       \
@@ -584,6 +618,7 @@ DISSECTOR_SRC = \
        packet-ipmi.c           \
        packet-ipmi-session.c   \
        packet-ipnet.c          \
+       packet-ipoib.c          \
        packet-ipp.c            \
        packet-ipsec.c          \
        packet-ipsec-tcp.c      \
@@ -601,7 +636,7 @@ DISSECTOR_SRC = \
        packet-isis-hello.c     \
        packet-isis-lsp.c       \
        packet-isis-snp.c       \
-       packet-isis.c           \
+       packet-isis.c           \
        packet-isl.c            \
        packet-ismacryp.c       \
        packet-ismp.c           \
@@ -612,13 +647,12 @@ DISSECTOR_SRC = \
        packet-iuup.c           \
        packet-iwarp-ddp-rdmap.c\
        packet-iwarp-mpa.c      \
-       packet-jabber.c         \
        packet-jmirror.c        \
-       packet-jpeg.c           \
+       packet-jpeg.c           \
        packet-json.c           \
-       packet-juniper.c        \
+       packet-juniper.c        \
        packet-jxta.c           \
-       packet-k12.c            \
+       packet-k12.c            \
        packet-kadm5.c          \
        packet-kdp.c            \
        packet-kerberos.c       \
@@ -627,6 +661,7 @@ DISSECTOR_SRC = \
        packet-kink.c           \
        packet-kismet.c         \
        packet-klm.c            \
+       packet-knet.c           \
        packet-kpasswd.c        \
        packet-l1-events.c      \
        packet-l2tp.c           \
@@ -658,7 +693,8 @@ DISSECTOR_SRC = \
        packet-m2tp.c           \
        packet-m2ua.c           \
        packet-m3ua.c           \
-       packet-mac-lte.c                \
+       packet-mac-lte.c        \
+       packet-mac-lte-framed.c \
        packet-maccontrol.c     \
        packet-mactelnet.c      \
        packet-manolito.c       \
@@ -676,18 +712,22 @@ DISSECTOR_SRC = \
        packet-mip.c            \
        packet-mip6.c           \
        packet-mmse.c           \
+       packet-mndp.c           \
        packet-mongo.c          \
        packet-mount.c          \
        packet-mp2t.c           \
        packet-mp4ves.c         \
+       packet-mpeg-pat.c       \
+       packet-mpeg-sect.c      \
        packet-mpeg1.c          \
        packet-mpls.c           \
-       packet-mpls-echo.c      \
+       packet-mpls-echo.c      \
        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-msn-messenger.c  \
@@ -713,17 +753,18 @@ DISSECTOR_SRC = \
        packet-ncp.c            \
        packet-ncp2222.c        \
        packet-ncp-nmas.c       \
-       packet-ncp-sss.c        \
+       packet-ncp-sss.c        \
        packet-ncs.c            \
        packet-ndmp.c           \
        packet-ndp.c            \
        packet-ndps.c           \
+       packet-netanalyzer.c    \
        packet-netbios.c        \
        packet-netdump.c        \
        packet-netflow.c        \
        packet-netmon-802_11.c  \
        packet-netperfmeter.c   \
-       packet-netsync.c        \
+       packet-netsync.c        \
        packet-nettl.c          \
        packet-newmail.c        \
        packet-nfs.c            \
@@ -761,7 +802,7 @@ DISSECTOR_SRC = \
        packet-pcep.c           \
        packet-pcli.c           \
        packet-pcnfsd.c         \
-       packet-pdcp-lte.c               \
+       packet-pdcp-lte.c       \
        packet-per.c            \
        packet-pflog.c          \
        packet-pgm.c            \
@@ -777,6 +818,7 @@ DISSECTOR_SRC = \
        packet-ppi-antenna.c    \
        packet-ppi-geolocation-common.c \
        packet-ppi-gps.c        \
+       packet-ppi-sensor.c     \
        packet-ppi-vector.c     \
        packet-ppp.c            \
        packet-pppoe.c          \
@@ -784,10 +826,10 @@ DISSECTOR_SRC = \
        packet-prp.c            \
        packet-ptp.c            \
        packet-pvfs2.c          \
-       packet-pw-common.c      \
        packet-pw-atm.c         \
        packet-pw-cesopsn.c     \
-       packet-pw-eth.c         \
+       packet-pw-common.c      \
+       packet-pw-eth.c         \
        packet-pw-fr.c          \
        packet-pw-hdlc.c        \
        packet-pw-satop.c       \
@@ -806,16 +848,19 @@ DISSECTOR_SRC = \
        packet-radius_packetcable.c     \
        packet-raw.c            \
        packet-rdm.c            \
+       packet-rdp.c            \
        packet-rdt.c            \
-       packet-redback.c        \
-       packet-redbackli.c      \
+       packet-redback.c        \
+       packet-redbackli.c      \
        packet-reload.c         \
        packet-reload-framing.c \
-       packet-retix-bpdu.c     \
-       packet-rfc2190.c        \
+       packet-retix-bpdu.c     \
+       packet-rfc2190.c        \
+       packet-rfid-felica.c    \
        packet-rgmp.c           \
        packet-rip.c            \
        packet-ripng.c          \
+       packet-rfid-mifare.c    \
        packet-rlc.c            \
        packet-rlc-lte.c        \
        packet-rlm.c            \
@@ -829,7 +874,7 @@ DISSECTOR_SRC = \
        packet-rmt-lct.c        \
        packet-rmt-norm.c       \
        packet-rohc.c           \
-       packet-roofnet.c        \
+       packet-roofnet.c        \
        packet-rpc.c            \
        packet-rpcap.c          \
        packet-rpl.c            \
@@ -856,7 +901,7 @@ DISSECTOR_SRC = \
        packet-sametime.c       \
        packet-sap.c            \
        packet-sasp.c           \
-       packet-sbus.c           \
+       packet-sbus.c           \
        packet-sccp.c           \
        packet-sccpmg.c         \
        packet-scop.c           \
@@ -901,6 +946,7 @@ DISSECTOR_SRC = \
        packet-sndcp-xid.c      \
        packet-socketcan.c      \
        packet-socks.c          \
+       packet-spice.c          \
        packet-spp.c            \
        packet-spray.c          \
        packet-srp.c            \
@@ -916,7 +962,7 @@ DISSECTOR_SRC = \
        packet-stun.c           \
        packet-sua.c            \
        packet-symantec.c       \
-       packet-synergy.c        \
+       packet-synergy.c        \
        packet-synphasor.c      \
        packet-syslog.c         \
        packet-t30.c            \
@@ -943,8 +989,9 @@ DISSECTOR_SRC = \
        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            \
@@ -953,6 +1000,8 @@ DISSECTOR_SRC = \
        packet-turnchannel.c    \
        packet-tuxedo.c         \
        packet-tzsp.c           \
+       packet-ua.c             \
+       packet-uaudp.c          \
        packet-ucp.c            \
        packet-udld.c           \
        packet-udp.c            \
@@ -960,7 +1009,7 @@ DISSECTOR_SRC = \
        packet-umts_fp.c        \
        packet-umts_mac.c       \
        packet-usb.c            \
-       packet-usb-at.c         \
+       packet-usb-ccid.c       \
        packet-usb-hid.c        \
        packet-usb-hub.c        \
        packet-usb-masstorage.c \
@@ -973,11 +1022,15 @@ DISSECTOR_SRC = \
        packet-vicp.c           \
        packet-vines.c          \
        packet-vj.c             \
+       packet-vlan.c           \
        packet-vmlab.c          \
        packet-vnc.c            \
        packet-vrrp.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          \
@@ -997,12 +1050,19 @@ DISSECTOR_SRC = \
        packet-wsp.c            \
        packet-wtls.c           \
        packet-wtp.c            \
-       packet-x11.c            \
        packet-x25.c            \
        packet-x29.c            \
        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         \
@@ -1023,13 +1083,21 @@ DISSECTOR_SRC = \
        packet-zebra.c          \
        packet-zep.c            \
        packet-ziop.c           \
-       packet-zrtp.c
+       packet-zrtp.c   \
+       $(CUSTOM_DISSECTOR_SRC)
+
+#
+# Files that create warnings while building
+#
+DIRTY_DISSECTOR_SRC = \
+       packet-gsm_a_common.c   \
+       packet-x11.c
 
 #
 # Headers for dissectors.
 #
 DISSECTOR_INCLUDES =   \
-       $(PIDL_DISSECTOR_INCLUDES)      \
+       $(PIDL_DISSECTOR_INCLUDES)      \
        packet-acn.h    \
        packet-acp133.h \
        packet-acse.h   \
@@ -1040,7 +1108,7 @@ DISSECTOR_INCLUDES =      \
        packet-alcap.h  \
        packet-ansi_a.h \
        packet-ansi_map.h       \
-       packet-ansi_tcap.h \
+       packet-ansi_tcap.h      \
        packet-ap1394.h \
        packet-arcnet.h \
        packet-arp.h    \
@@ -1049,6 +1117,7 @@ DISSECTOR_INCLUDES =      \
        packet-atm.h    \
        packet-bacapp.h \
        packet-ber.h    \
+       packet-bfd.h    \
        packet-bgp.h    \
        packet-bootparams.h     \
        packet-bssap.h  \
@@ -1057,8 +1126,10 @@ DISSECTOR_INCLUDES =     \
        packet-btl2cap.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-cimd.h   \
@@ -1068,6 +1139,7 @@ DISSECTOR_INCLUDES =      \
        packet-cmip.h \
        packet-cmp.h    \
        packet-cms.h    \
+       packet-credssp.h \
        packet-crmf.h   \
        packet-csn1.h   \
        packet-dap.h    \
@@ -1084,7 +1156,6 @@ DISSECTOR_INCLUDES =      \
        packet-dcerpc-drsuapi.h \
        packet-dcerpc-frsapi.h  \
        packet-dcerpc-frsrpc.h  \
-       packet-dcerpc-mapi.h    \
        packet-dcerpc-netlogon.h        \
        packet-dcerpc-nt.h      \
        packet-dcerpc-pnp.h     \
@@ -1114,7 +1185,7 @@ DISSECTOR_INCLUDES =      \
        packet-e212.h   \
        packet-edonkey.h        \
        packet-enc.h    \
-       packet-epmd.h   \
+       packet-epmd.h   \
        packet-esis.h   \
        packet-ess.h    \
        packet-eth.h    \
@@ -1176,7 +1247,6 @@ DISSECTOR_INCLUDES =      \
        packet-inap.h   \
        packet-infiniband.h     \
        packet-ip.h     \
-       packet-ipdc.h   \
        packet-ipfc.h   \
        packet-ipmi.h   \
        packet-ipsec.h  \
@@ -1194,13 +1264,14 @@ DISSECTOR_INCLUDES =    \
        packet-kerberos.h       \
        packet-klm.h    \
        packet-ldap.h   \
+       packet-lcsap.h \
        packet-ldp.h    \
        packet-llc.h    \
        packet-logotypecertextn.h       \
+       packet-lpp.h            \
        packet-lte-rrc.h        \
        packet-mac-lte.h                \
        packet-mbtcp.h  \
-       packet-meta.h   \
        packet-mgcp.h           \
        packet-mms.h    \
        packet-mount.h  \
@@ -1235,7 +1306,6 @@ DISSECTOR_INCLUDES =      \
        packet-pcnfsd.h \
        packet-pdcp-lte.h       \
        packet-per.h    \
-       packet-pflog.h  \
        packet-pim.h    \
        packet-pkcs1.h  \
        packet-pkcs12.h \
@@ -1264,7 +1334,9 @@ DISSECTOR_INCLUDES =      \
        packet-radius.h \
        packet-ranap.h  \
        packet-raw.h    \
+       packet-rdp.h    \
        packet-rdt.h    \
+       packet-reload.h \
        packet-rgmp.h   \
        packet-rlc.h    \
        packet-rlc-lte.h                \
@@ -1274,6 +1346,7 @@ DISSECTOR_INCLUDES =      \
        packet-rmt-fec.h        \
        packet-rmt-lct.h        \
        packet-rmt-norm.h       \
+       packet-rohc.h   \
        packet-ros.h    \
        packet-rpc.h    \
        packet-rquota.h \
@@ -1285,6 +1358,7 @@ DISSECTOR_INCLUDES =      \
        packet-rtps2.h          \
        packet-rtp-events.h     \
        packet-rtse.h   \
+       packet-rtsp.h   \
        packet-rwall.h  \
        packet-rx.h             \
        packet-s1ap.h   \
@@ -1318,6 +1392,7 @@ DISSECTOR_INCLUDES =      \
        packet-stat.h   \
        packet-stat-notify.h    \
        packet-sv.h     \
+       packet-t124.h   \
        packet-t30.h    \
        packet-t38.h    \
        packet-tacacs.h \
@@ -1330,12 +1405,14 @@ DISSECTOR_INCLUDES =    \
        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       \
@@ -1358,6 +1435,13 @@ DISSECTOR_INCLUDES =     \
        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 \
@@ -1400,8 +1484,8 @@ noinst_HEADERS =  \
 
 ALL_DISSECTORS_SRC = \
        $(DISSECTOR_SRC) \
+       $(DIRTY_DISSECTOR_SRC) \
        $(PIDL_DISSECTOR_SRC) \
        $(DIRTY_PIDL_DISSECTOR_SRC) \
        $(ASN1_DISSECTOR_SRC) \
-       $(DIRTY_ASN1_DISSECTOR_SRC) \
-       $(CUSTOM_DISSECTOR_SRC)
+       $(DIRTY_ASN1_DISSECTOR_SRC)