diff --git a/bmake/libui/Makefile b/bmake/libui/Makefile
index b04062d52c..352603fa08 100644
--- a/bmake/libui/Makefile
+++ b/bmake/libui/Makefile
@@ -1,30 +1,5 @@
-.PATH:	${.CURDIR}/../../ui
-
-SRCS=	\
-	alert_box.c \
-	export_object.c \
-	export_object_dicom.c \
-	export_object_http.c \
-	export_object_smb.c \
-	help_url.c \
-	packet_list_utils.c \
-	iface_lists.c \
-	preference_utils.c \
-	profile.c \
-	recent.c \
-	ssl_key_export.c \
-	software_update.c \
-	tap-megaco-common.c \
-	tap-rtp-common.c \
-	text_import.c \
-	time_shift.c \
-	util.c
+.include "Makefile.src"
 
 LIB=	ui
 
-CFLAGS+=	-I${.CURDIR}/../.. \
-		-I${.CURDIR}/../../wiretap \
-		-I/usr/local/include/glib-2.0
-
-#-I${.CURDIR}/../../wsutil/abi-check-headers
 .include <bsd.lib.mk>
diff --git a/bmake/libui/Makefile.src b/bmake/libui/Makefile.src
new file mode 100644
index 0000000000..d333c76bc5
--- /dev/null
+++ b/bmake/libui/Makefile.src
@@ -0,0 +1,25 @@
+.PATH:	${.CURDIR}/../../ui
+
+SRCS+=	\
+	alert_box.c \
+	export_object.c \
+	export_object_dicom.c \
+	export_object_http.c \
+	export_object_smb.c \
+	help_url.c \
+	packet_list_utils.c \
+	iface_lists.c \
+	preference_utils.c \
+	profile.c \
+	recent.c \
+	ssl_key_export.c \
+	software_update.c \
+	tap-megaco-common.c \
+	tap-rtp-common.c \
+	text_import.c \
+	time_shift.c \
+	util.c
+
+CFLAGS+=	-I${.CURDIR}/../.. \
+		-I${.CURDIR}/../../wiretap \
+		-I/usr/local/include/glib-2.0
diff --git a/bmake/libwireshark/Makefile b/bmake/libwireshark/Makefile
index 70e892b3a8..fb68801bba 100644
--- a/bmake/libwireshark/Makefile
+++ b/bmake/libwireshark/Makefile
@@ -1,1338 +1,8 @@
-.PATH:	${.CURDIR}/../../epan
-
-.PATH: ${.CURDIR}/../../epan/crypt
-CRYPT_SRCS=	airpdcap.c \
-		airpdcap_ccmp.c \
-		airpdcap_debug.c \
-		airpdcap_rijndael.c \
-		airpdcap_tkip.c
-
-.PATH: ${.CURDIR}/../../epan/dfilter
-DFILTER_SRCS=	dfilter.c \
-		dfilter-macro.c \
-		dfunctions.c \
-		dfvm.c \
-		drange.c \
-		gencode.c \
-		semcheck.c \
-		sttype-function.c \
-		sttype-integer.c \
-		sttype-pointer.c \
-		sttype-range.c \
-		sttype-string.c    \
-		sttype-test.c \
-		syntax-tree.c \
-		scanner.l
-# XXX: generated by lemon
-DFILTER_SRCS+= grammar.c
-
-.PATH: ${.CURDIR}/../../epan/dissectors
-DISSECTOR_SRCS=	packet-dcerpc-atsvc.c \
-		packet-dcerpc-budb.c \
-		packet-dcerpc-butc.c \
-		packet-dcerpc-drsuapi.c \
-		packet-dcerpc-dssetup.c \
-		packet-dcerpc-efs.c \
-		packet-dcerpc-frstrans.c \
-		packet-dcerpc-initshutdown.c \
-		packet-dcerpc-nspi.c \
-		packet-dcerpc-rfr.c \
-		packet-dcerpc-srvsvc.c \
-		packet-dcerpc-wkssvc.c \
-		packet-dcerpc-wzcsvc.c \
-		packet-dcerpc-dfs.c \
-		packet-dcerpc-dnsserver.c \
-		packet-dcerpc-eventlog.c \
-		packet-dcerpc-lsa.c \
-		packet-dcerpc-mapi.c
-DISSECTOR_SRCS+= \
-		packet-dcerpc-winreg.c \
-		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-credssp.c \
-		packet-crmf.c \
-		packet-dap.c \
-		packet-disp.c \
-		packet-dop.c \
-		packet-dsp.c \
-		packet-ess.c \
-		packet-ftam.c \
-		packet-goose.c \
-		packet-HI2Operations.c \
-		packet-h225.c \
-		packet-h235.c \
-		packet-h245.c \
-		packet-h248.c \
-		packet-h282.c \
-		packet-h283.c \
-		packet-h323.c \
-		packet-h450.c \
-		packet-h450-ros.c \
-		packet-h460.c \
-		packet-h501.c \
-		packet-hnbap.c \
-		packet-idmp.c \
-		packet-inap.c \
-		packet-isdn-sup.c \
-		packet-lcsap.c \
-		packet-logotypecertextn.c \
-		packet-lpp.c \
-		packet-lppa.c \
-		packet-lppe.c \
-		packet-lte-rrc.c \
-		packet-mms.c \
-		packet-mpeg-audio.c \
-		packet-mpeg-pes.c \
-		packet-nbap.c \
-		packet-ns_cert_exts.c \
-		packet-ocsp.c \
-		packet-p22.c \
-		packet-p7.c \
-		packet-p772.c \
-		packet-pcap.c \
-		packet-pkcs1.c \
-		packet-pkinit.c \
-		packet-pkix1explicit.c \
-		packet-pkix1implicit.c \
-		packet-pkixac.c \
-		packet-pkixproxy.c \
-		packet-pkixqualified.c \
-		packet-pkixtsp.c \
-		packet-q932.c \
-		packet-q932-ros.c \
-		packet-qsig.c \
-		packet-ranap.c \
-		packet-ros.c \
-		packet-rrc.c \
-		packet-rrlp.c \
-		packet-rtse.c \
-		packet-rua.c \
-		packet-s1ap.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-x2ap.c \
-		packet-x509af.c \
-		packet-x509ce.c \
-		packet-x509if.c \
-		packet-x509sat.c \
-		packet-ansi_map.c \
-		packet-coseventcomm.c \
-		packet-cosnaming.c \
-		packet-gnm.c \
-		packet-gprscdr.c \
-		packet-gsm_map.c \
-		packet-ldap.c \
-		packet-m3ap.c \
-		packet-p1.c \
-		packet-parlay.c \
-		packet-pkcs12.c \
-		packet-pres.c \
-		packet-rnsap.c \
-		packet-snmp.c \
-		packet-t124.c \
-		packet-t125.c \
-		packet-tango.c \
-		packet-tcap.c \
-		packet-tetra.c
-DISSECTOR_SRCS+= \
-		file-mp4.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 \
-		packet-adwin-config.c \
-		packet-adwin.c \
-		packet-afp.c \
-		packet-afs.c \
-		packet-agentx.c \
-		packet-aim-admin.c \
-		packet-aim-adverts.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-aim.c \
-		packet-ajp13.c \
-		packet-alcap.c \
-		packet-amqp.c \
-		packet-amr.c \
-		packet-ancp.c \
-		packet-ans.c \
-		packet-ansi_637.c \
-		packet-ansi_683.c \
-		packet-ansi_801.c \
-		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-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-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-ber.c \
-		packet-bfcp.c \
-		packet-bfd.c \
-		packet-bgp.c \
-		packet-bitcoin.c \
-		packet-bittorrent.c \
-		packet-bjnp.c \
-		packet-bmc.c \
-		packet-bofl.c \
-		packet-bootp.c \
-		packet-bootparams.c \
-		packet-bpdu.c \
-		packet-bpq.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-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-bthcrp.c \
-		packet-bthfp.c \
-		packet-bthid.c \
-		packet-btl2cap.c \
-		packet-btmcap.c \
-		packet-btobex.c \
-		packet-btrfcomm.c \
-		packet-btsap.c \
-		packet-btsdp.c \
-		packet-btsmp.c \
-		packet-bt-oui.c \
-		packet-bvlc.c \
-		packet-bzr.c \
-		packet-calcappprotocol.c \
-		packet-canopen.c \
-		packet-capwap.c \
-		packet-carp.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-cimd.c \
-		packet-cimetrics.c \
-		packet-cip.c \
-		packet-cipmotion.c \
-		packet-cipsafety.c \
-		packet-cisco-erspan.c \
-		packet-cisco-metadata.c \
-		packet-cisco-oui.c \
-		packet-cisco-sm.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-cosine.c \
-		packet-cpfi.c \
-		packet-cpha.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 \
-		packet-dcerpc-browser.c \
-		packet-dcerpc-cds_clerkserver.c \
-		packet-dcerpc-cds_solicit.c \
-		packet-dcerpc-conv.c \
-		packet-dcerpc-cprpc_server.c \
-		packet-dcerpc-dce122.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-icl_rpc.c \
-		packet-dcerpc-krb5rpc.c \
-		packet-dcerpc-llb.c \
-		packet-dcerpc-messenger.c \
-		packet-dcerpc-mgmt.c \
-		packet-dcerpc-ndr.c \
-		packet-dcerpc-netlogon.c \
-		packet-dcerpc-pnp.c \
-		packet-dcerpc-rdaclif.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_bind.c \
-		packet-dcerpc-rs_misc.c \
-		packet-dcerpc-rs_pgo.c \
-		packet-dcerpc-rs_plcy.c \
-		packet-dcerpc-rs_prop_acct.c \
-		packet-dcerpc-rs_prop_acl.c \
-		packet-dcerpc-rs_prop_attr.c \
-		packet-dcerpc-rs_prop_pgo.c \
-		packet-dcerpc-rs_prop_plcy.c \
-		packet-dcerpc-rs_pwd_mgmt.c \
-		packet-dcerpc-rs_repadm.c \
-		packet-dcerpc-rs_replist.c \
-		packet-dcerpc-rs_repmgr.c \
-		packet-dcerpc-rs_unix.c \
-		packet-dcerpc-rsec_login.c \
-		packet-dcerpc-samr.c \
-		packet-dcerpc-secidmap.c \
-		packet-dcerpc-spoolss.c \
-		packet-dcerpc-svcctl.c \
-		packet-dcerpc-tapi.c \
-		packet-dcerpc-tkn4int.c \
-		packet-dcerpc-trksvr.c \
-		packet-dcerpc-ubikdisk.c \
-		packet-dcerpc-ubikvote.c \
-		packet-dcerpc-update.c \
-		packet-dcerpc.c \
-		packet-dcm.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-dhcp-failover.c \
-		packet-dhcpv6.c \
-		packet-diameter.c \
-		packet-diameter_3gpp.c \
-		packet-diffserv-mpls-common.c \
-		packet-dis-enums.c \
-		packet-dis-fields.c \
-		packet-dis-pdus.c \
-		packet-dis.c \
-		packet-distcc.c \
-		packet-dlm3.c \
-		packet-dlsw.c \
-		packet-dmp.c \
-		packet-dmx-chan.c \
-		packet-dmx-sip.c \
-		packet-dmx-test.c \
-		packet-dmx-text.c \
-		packet-dmx.c \
-		packet-dnp.c \
-		packet-dns.c \
-		packet-dplay.c \
-		packet-dpnss-link.c \
-		packet-dpnss.c \
-		packet-drda.c \
-		packet-dsi.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 \
-		packet-e212.c \
-		packet-eap.c \
-		packet-eapol.c \
-		packet-echo.c \
-		packet-ecp-oui.c \
-		packet-edonkey.c \
-		packet-egd.c \
-		packet-ehdlc.c \
-		packet-ehs.c \
-		packet-eigrp.c \
-		packet-eiss.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-erf.c \
-		packet-erldp.c \
-		packet-esio.c \
-		packet-esis.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-extreme.c \
-		packet-exported_pdu.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-fddi.c \
-		packet-fefd.c \
-		packet-ff.c \
-		packet-fip.c \
-		packet-fix.c \
-		packet-flexnet.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-gdsdb.c \
-		packet-gearman.c \
-		packet-ged125.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-gre.c \
-		packet-gsm_a_bssmap.c \
-		packet-gsm_a_dtap.c \
-		packet-gsm_a_gm.c \
-		packet-gsm_a_rp.c \
-		packet-gsm_a_rr.c \
-		packet-gsm_abis_om2000.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 \
-		packet-gsmtap.c \
-		packet-gssapi.c \
-		packet-gtp.c \
-		packet-gtpv2.c \
-		packet-gvcp.c \
-		packet-gvrp.c \
-		packet-h1.c \
-		packet-h221_nonstd.c \
-		packet-h223.c \
-		packet-h248_10.c \
-		packet-h248_2.c \
-		packet-h248_3gpp.c \
-		packet-h248_7.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_usb.c \
-		packet-hclnfsd.c \
-		packet-hdcp.c \
-		packet-hdcp2.c \
-		packet-hdfs.c \
-		packet-hdfsdata.c \
-		packet-hip.c \
-		packet-homeplug-av.c \
-		packet-homeplug.c \
-		packet-hp-erm.c \
-		packet-hpext.c \
-		packet-hpfeeds.c \
-		packet-hpsw.c \
-		packet-hpteam.c \
-		packet-hsr-prp-supervision.c \
-		packet-hsr.c \
-		packet-hsrp.c \
-		packet-http.c \
-		packet-http-urlencoded.c \
-		packet-hyperscsi.c \
-		packet-i2c.c \
-		packet-iana-oui.c \
-		packet-iapp.c \
-		packet-iax2.c \
-		packet-icap.c \
-		packet-icep.c \
-		packet-icmp.c \
-		packet-icmpv6.c \
-		packet-icp.c \
-		packet-icq.c \
-		packet-idp.c \
-		packet-idrp.c \
-		packet-iec104.c \
-		packet-ieee1722.c \
-		packet-ieee17221.c \
-		packet-ieee80211-airopeek.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 \
-		packet-ieee8023.c \
-		packet-ieee802a.c \
-		packet-ifcp.c \
-		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-infiniband.c \
-		packet-infiniband_sdp.c \
-		packet-interlink.c \
-		packet-ip.c \
-		packet-ipars.c \
-		packet-ipdc.c \
-		packet-ipfc.c \
-		packet-ipmi-session.c \
-		packet-ipmi.c \
-		packet-ipnet.c \
-		packet-ipoib.c \
-		packet-ipp.c \
-		packet-ipsec-tcp.c \
-		packet-ipsec-udp.c \
-		packet-ipsec.c \
-		packet-ipsi-ctl.c \
-		packet-ipv6.c \
-		packet-ipvs-syncd.c \
-		packet-ipx.c \
-		packet-ipxwan.c \
-		packet-irc.c \
-		packet-isakmp.c \
-		packet-iscsi.c \
-		packet-isdn.c \
-		packet-isis-clv.c \
-		packet-isis-hello.c \
-		packet-isis-lsp.c \
-		packet-isis-snp.c \
-		packet-isis.c \
-		packet-isl.c \
-		packet-ismacryp.c \
-		packet-ismp.c \
-		packet-isns.c \
-		packet-iso7816.c \
-		packet-isup.c \
-		packet-itdm.c \
-		packet-iua.c \
-		packet-iuup.c \
-		packet-iwarp-ddp-rdmap.c \
-		packet-iwarp-mpa.c \
-		packet-ixiatrailer.c \
-		packet-ixveriwave.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-kdsp.c \
-		packet-kerberos.c \
-		packet-kerberos4.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 \
-		packet-lapbether.c \
-		packet-lapd.c \
-		packet-lapdm.c \
-		packet-laplink.c \
-		packet-lapsat.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-llrp.c \
-		packet-llt.c \
-		packet-lmi.c \
-		packet-lmp.c \
-		packet-lon.c \
-		packet-loop.c \
-		packet-lpd.c \
-		packet-lsc.c \
-		packet-ltp.c \
-		packet-lwapp.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-mactelnet.c \
-		packet-manolito.c \
-		packet-mbtcp.c \
-		packet-mdshdr.c \
-		packet-media.c \
-		packet-megaco.c \
-		packet-memcache.c \
-		packet-mesh.c \
-		packet-meta.c \
-		packet-mgcp.c \
-		packet-mih.c \
-		packet-mikey.c \
-		packet-mim.c \
-		packet-mime-encap.c \
-		packet-miop.c \
-		packet-mip.c \
-		packet-mip6.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-echo.c \
-		packet-mpls-pm.c \
-		packet-mpls-psc.c \
-		packet-mplstp-oam.c \
-		packet-mpls-y1711.c \
-		packet-mpls.c \
-		packet-mq-pcf.c \
-		packet-mq.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-msn-messenger.c \
-		packet-msnip.c \
-		packet-msnlb.c \
-		packet-msproxy.c \
-		packet-msrp.c \
-		packet-mstp.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-nbipx.c \
-		packet-nbns.c \
-		packet-ncp-nmas.c \
-		packet-ncp-sss.c \
-		packet-ncp.c \
-		packet-ncp2222.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-netflow.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 \
-		packet-nhrp.c \
-		packet-nisplus.c \
-		packet-nlm.c \
-		packet-nlsp.c \
-		packet-nntp.c \
-		packet-noe.c \
-		packet-nsip.c \
-		packet-nsrp.c \
-		packet-nstrace.c \
-		packet-nt-oui.c \
-		packet-nt-tpcp.c \
-		packet-ntlmssp.c \
-		packet-ntp.c \
-		packet-null.c \
-		packet-nwmtp.c \
-		packet-oicq.c \
-		packet-oipf.c \
-		packet-olsr.c \
-		packet-omapi.c \
-		packet-omron-fins.c \
-		packet-openflow.c \
-		packet-opensafety.c \
-		packet-openvpn.c \
-		packet-openwire.c \
-		packet-opsi.c \
-		packet-osi-options.c \
-		packet-osi.c \
-		packet-ositp.c \
-		packet-ospf.c \
-		packet-ouch.c \
-		packet-p_mul.c \
-		packet-packetbb.c \
-		packet-packetlogger.c \
-		packet-pagp.c \
-		packet-paltalk.c \
-		packet-pana.c \
-		packet-pcep.c \
-		packet-pcli.c \
-		packet-pcnfsd.c \
-		packet-pcp.c \
-		packet-pdcp-lte.c \
-		packet-peekremote.c \
-		packet-per.c \
-		packet-pflog.c \
-		packet-pgm.c \
-		packet-pgsql.c \
-		packet-pim.c \
-		packet-pingpongprotocol.c \
-		packet-pktc.c \
-		packet-pktgen.c \
-		packet-pnrp.c \
-		packet-pop.c \
-		packet-portmap.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-fr.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-quake.c \
-		packet-quake2.c \
-		packet-quake3.c \
-		packet-quakeworld.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 \
-		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-rgmp.c \
-		packet-rip.c \
-		packet-ripng.c \
-		packet-rlc-lte.c \
-		packet-rlc.c \
-		packet-rlm.c \
-		packet-rlogin.c \
-		packet-rmcp.c \
-		packet-rmi.c \
-		packet-rmp.c \
-		packet-rmt-alc.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-rpki-rtr.c \
-		packet-rpl.c \
-		packet-rquota.c \
-		packet-rsh.c \
-		packet-rsip.c \
-		packet-rsl.c \
-		packet-rstat.c \
-		packet-rsvp.c \
-		packet-rsync.c \
-		packet-rtacser.c \
-		packet-rtcdc.c \
-		packet-rtcp.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-rtsp.c \
-		packet-rudp.c \
-		packet-rwall.c \
-		packet-rx.c \
-		packet-s5066.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-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-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-sigcomp.c \
-		packet-simulcrypt.c \
-		packet-sip.c \
-		packet-sipfrag.c \
-		packet-sita.c \
-		packet-skinny.c \
-		packet-skype.c \
-		packet-slimp3.c \
-		packet-sll.c \
-		packet-slowprotocols.c \
-		packet-slsk.c \
-		packet-smb-browse.c \
-		packet-smb-common.c \
-		packet-smb-logon.c \
-		packet-smb-mailslot.c \
-		packet-smb-pipe.c \
-		packet-smb-sidsnooping.c \
-		packet-smb.c \
-		packet-smb2.c \
-		packet-sml.c \
-		packet-smpp.c \
-		packet-smtp.c \
-		packet-sna.c \
-		packet-snaeth.c \
-		packet-sndcp-xid.c \
-		packet-sndcp.c \
-		packet-socketcan.c \
-		packet-socks.c \
-		packet-soupbintcp.c \
-		packet-spice.c \
-		packet-spp.c \
-		packet-spray.c \
-		packet-sprt.c \
-		packet-srp.c \
-		packet-srvloc.c \
-		packet-sscf-nni.c \
-		packet-sscop.c \
-		packet-ssh.c \
-		packet-ssl-utils.c \
-		packet-ssl.c \
-		packet-stanag4607.c \
-		packet-starteam.c \
-		packet-stat-notify.c \
-		packet-stat.c \
-		packet-stun.c \
-		packet-sua.c \
-		packet-symantec.c \
-		packet-sync.c \
-		packet-synergy.c \
-		packet-synphasor.c \
-		packet-sysex.c \
-		packet-syslog.c \
-		packet-t30.c \
-		packet-tacacs.c \
-		packet-tali.c \
-		packet-tapa.c \
-		packet-tcp.c \
-		packet-tdmoe.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-tftp.c \
-		packet-time.c \
-		packet-tipc.c \
-		packet-tivoconnect.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-trmac.c \
-		packet-tsp.c \
-		packet-tte-pcf.c \
-		packet-tte.c \
-		packet-turbocell.c \
-		packet-turnchannel.c \
-		packet-tuxedo.c \
-		packet-tzsp.c \
-		packet-ua.c \
-		packet-ua3g.c \
-		packet-uasip.c \
-		packet-uaudp.c \
-		packet-ucp.c \
-		packet-udld.c \
-		packet-udp.c \
-		packet-udt.c \
-		packet-uhd.c \
-		packet-uma.c \
-		packet-umts_fp.c \
-		packet-umts_mac.c \
-		packet-usb-audio.c \
-		packet-usb-ccid.c \
-		packet-usb-hid.c \
-		packet-usb-hub.c \
-		packet-usb-masstorage.c \
-		packet-usb-video.c \
-		packet-usb.c \
-		packet-user_encap.c \
-		packet-uts.c \
-		packet-v120.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-vrrp.c \
-		packet-vrt.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-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 \
-		packet-wtp.c \
-		packet-x224.c \
-		packet-x25.c \
-		packet-x29.c \
-		packet-xcsl.c \
-		packet-xdmcp.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 \
-		packet-yppasswd.c \
-		packet-ypserv.c \
-		packet-ypxfr.c \
-		packet-zbee-aps.c \
-		packet-zbee-nwk.c \
-		packet-zbee-security.c \
-		packet-zbee-zcl.c \
-		packet-zbee-zcl-general.c \
-		packet-zbee-zcl-ha.c \
-		packet-zbee-zcl-meas-sensing.c \
-		packet-zbee-zcl-se.c \
-		packet-zbee-zdp-binding.c \
-		packet-zbee-zdp-discovery.c \
-		packet-zbee-zdp-management.c \
-		packet-zbee-zdp.c \
-		packet-zebra.c \
-		packet-zep.c \
-		packet-ziop.c \
-		packet-zrtp.c \
-		packet-gsm_a_common.c \
-		packet-x11.c
-
-DISSECTOR_SUPPORT_SRCS= \
-		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-dcerpc-nt.c \
-		usb.c
-DISSECTOR_SUPPORT_SRCS+= register.c
-
-.PATH: ${.CURDIR}/../../epan/ftypes
-FTYPE_SRCS= \
-	ftypes.c \
-	ftype-bytes.c \
-	ftype-double.c \
-	ftype-integer.c \
-	ftype-ipv4.c \
-	ftype-ipv6.c \
-	ftype-guid.c \
-	ftype-none.c \
-	ftype-pcre.c \
-	ftype-string.c \
-	ftype-time.c \
-	ftype-tvbuff.c
-
-.PATH: ${.CURDIR}/../../epan/wmem
-WMEM_SRCS= \
-	wmem_array.c \
-	wmem_core.c \
-	wmem_allocator_block.c \
-	wmem_allocator_simple.c \
-	wmem_allocator_strict.c \
-	wmem_list.c \
-	wmem_miscutl.c \
-	wmem_scopes.c \
-	wmem_stack.c \
-	wmem_strbuf.c \
-	wmem_strutl.c \
-	wmem_tree.c \
-	wmem_user_cb.c
-		
-LIBWIRESHARK_SRCS= \
-	addr_and_mask.c \
-	addr_resolv.c \
-	address_to_str.c \
-	adler32.c \
-	afn.c \
-	app_mem_usage.c \
-	asn1.c \
-	asm_utils.c \
-	atalk-utils.c \
-	base64.c \
-	bitswap.c \
-	camel-persistentdata.c \
-	charsets.c \
-	circuit.c \
-	codecs.c \
-	column.c \
-	column-utils.c \
-	conversation.c \
-	crc16-tvb.c \
-	crc32-tvb.c \
-	crc8-tvb.c \
-	disabled_protos.c \
-	dissector_filters.c \
-	emem.c \
-	epan.c \
-	ex-opt.c \
-	except.c \
-	expert.c \
-	exported_pdu.c \
-	filesystem.c \
-	filter_expressions.c \
-	follow.c \
-	frame_data.c \
-	frame_data_sequence.c \
-	frequency-utils.c \
-	funnel.c \
-	gcp.c \
-	geoip_db.c \
-	golay.c \
-	guid-utils.c \
-	h225-persistentdata.c \
-	in_cksum.c \
-	ipproto.c \
-	ipv4.c \
-	next_tvb.c \
-	oids.c \
-	osi-utils.c \
-	packet-range.c \
-	packet.c \
-	plugins.c \
-	print.c \
-	prefs.c \
-	proto.c \
-	ps.c \
-	range.c \
-	reassemble.c \
-	reedsolomon.c \
-	req_resp_hdrs.c \
-	show_exception.c \
-	sigcomp_state_hdlr.c \
-	sigcomp-udvm.c \
-	sminmpec.c \
-	sna-utils.c \
-	stat_cmd_args.c \
-	stats_tree.c \
-	strutil.c \
-	stream.c \
-	t35.c \
-	tap.c \
-	tcap-persistentdata.c \
-	timestamp.c \
-	timestats.c \
-	tfs.c \
-	to_str.c \
-	tvbparse.c \
-	tvbuff.c \
-	tvbuff_composite.c \
-	tvbuff_real.c \
-	tvbuff_subset.c \
-	uat.c \
-	value_string.c \
-	xdlc.c \
-	diam_dict.l \
-	dtd_parse.l \
-	dtd_preparse.l \
-	radius_dict.l \
-	uat_load.l
-# XXX generated
-LIBWIRESHARK_SRCS+=	dtd_grammar.c
-
-SRCS=	${CRYPT_SRCS} \
-	${DFILTER_SRCS} \
-	${DISSECTOR_SRCS} \
-	${DISSECTOR_SUPPORT_SRCS} \
-	${FTYPE_SRCS} \
-	${WMEM_SRCS} \
-	${LIBWIRESHARK_SRCS}
+.include "Makefile.src"
 
 LIB=	wireshark
 
-CFLAGS+=	-I${.CURDIR}/../.. \
-		-I${.CURDIR}/../../epan \
-		-I${.CURDIR}/../../epan/dfilter \
-		-I${.CURDIR}/../../epan/dissectors \
-		-I${.CURDIR}/../../epan/ftypes \
-		-I${.CURDIR}/../../tools/lemon \
-		-I/usr/local/include \
-		-I/usr/local/include/glib-2.0 \
-		'-DPLUGIN_DIR="/nonexistant"'
+.include <bsd.own.mk>
 
 #-I${.CURDIR}/../../wsutil/abi-check-headers
 .include <bsd.lib.mk>
diff --git a/bmake/libwireshark/Makefile.src b/bmake/libwireshark/Makefile.src
new file mode 100644
index 0000000000..8a324132ce
--- /dev/null
+++ b/bmake/libwireshark/Makefile.src
@@ -0,0 +1,1333 @@
+.PATH:	${.CURDIR}/../../epan
+
+.PATH: ${.CURDIR}/../../epan/crypt
+CRYPT_SRCS=	airpdcap.c \
+		airpdcap_ccmp.c \
+		airpdcap_debug.c \
+		airpdcap_rijndael.c \
+		airpdcap_tkip.c
+
+.PATH: ${.CURDIR}/../../epan/dfilter
+DFILTER_SRCS=	dfilter.c \
+		dfilter-macro.c \
+		dfunctions.c \
+		dfvm.c \
+		drange.c \
+		gencode.c \
+		semcheck.c \
+		sttype-function.c \
+		sttype-integer.c \
+		sttype-pointer.c \
+		sttype-range.c \
+		sttype-string.c    \
+		sttype-test.c \
+		syntax-tree.c \
+		scanner.l
+# XXX: generated by lemon
+DFILTER_SRCS+= grammar.c
+
+.PATH: ${.CURDIR}/../../epan/dissectors
+DISSECTOR_SRCS=	packet-dcerpc-atsvc.c \
+		packet-dcerpc-budb.c \
+		packet-dcerpc-butc.c \
+		packet-dcerpc-drsuapi.c \
+		packet-dcerpc-dssetup.c \
+		packet-dcerpc-efs.c \
+		packet-dcerpc-frstrans.c \
+		packet-dcerpc-initshutdown.c \
+		packet-dcerpc-nspi.c \
+		packet-dcerpc-rfr.c \
+		packet-dcerpc-srvsvc.c \
+		packet-dcerpc-wkssvc.c \
+		packet-dcerpc-wzcsvc.c \
+		packet-dcerpc-dfs.c \
+		packet-dcerpc-dnsserver.c \
+		packet-dcerpc-eventlog.c \
+		packet-dcerpc-lsa.c \
+		packet-dcerpc-mapi.c
+DISSECTOR_SRCS+= \
+		packet-dcerpc-winreg.c \
+		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-credssp.c \
+		packet-crmf.c \
+		packet-dap.c \
+		packet-disp.c \
+		packet-dop.c \
+		packet-dsp.c \
+		packet-ess.c \
+		packet-ftam.c \
+		packet-goose.c \
+		packet-HI2Operations.c \
+		packet-h225.c \
+		packet-h235.c \
+		packet-h245.c \
+		packet-h248.c \
+		packet-h282.c \
+		packet-h283.c \
+		packet-h323.c \
+		packet-h450.c \
+		packet-h450-ros.c \
+		packet-h460.c \
+		packet-h501.c \
+		packet-hnbap.c \
+		packet-idmp.c \
+		packet-inap.c \
+		packet-isdn-sup.c \
+		packet-lcsap.c \
+		packet-logotypecertextn.c \
+		packet-lpp.c \
+		packet-lppa.c \
+		packet-lppe.c \
+		packet-lte-rrc.c \
+		packet-mms.c \
+		packet-mpeg-audio.c \
+		packet-mpeg-pes.c \
+		packet-nbap.c \
+		packet-ns_cert_exts.c \
+		packet-ocsp.c \
+		packet-p22.c \
+		packet-p7.c \
+		packet-p772.c \
+		packet-pcap.c \
+		packet-pkcs1.c \
+		packet-pkinit.c \
+		packet-pkix1explicit.c \
+		packet-pkix1implicit.c \
+		packet-pkixac.c \
+		packet-pkixproxy.c \
+		packet-pkixqualified.c \
+		packet-pkixtsp.c \
+		packet-q932.c \
+		packet-q932-ros.c \
+		packet-qsig.c \
+		packet-ranap.c \
+		packet-ros.c \
+		packet-rrc.c \
+		packet-rrlp.c \
+		packet-rtse.c \
+		packet-rua.c \
+		packet-s1ap.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-x2ap.c \
+		packet-x509af.c \
+		packet-x509ce.c \
+		packet-x509if.c \
+		packet-x509sat.c \
+		packet-ansi_map.c \
+		packet-coseventcomm.c \
+		packet-cosnaming.c \
+		packet-gnm.c \
+		packet-gprscdr.c \
+		packet-gsm_map.c \
+		packet-ldap.c \
+		packet-m3ap.c \
+		packet-p1.c \
+		packet-parlay.c \
+		packet-pkcs12.c \
+		packet-pres.c \
+		packet-rnsap.c \
+		packet-snmp.c \
+		packet-t124.c \
+		packet-t125.c \
+		packet-tango.c \
+		packet-tcap.c \
+		packet-tetra.c
+DISSECTOR_SRCS+= \
+		file-mp4.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 \
+		packet-adwin-config.c \
+		packet-adwin.c \
+		packet-afp.c \
+		packet-afs.c \
+		packet-agentx.c \
+		packet-aim-admin.c \
+		packet-aim-adverts.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-aim.c \
+		packet-ajp13.c \
+		packet-alcap.c \
+		packet-amqp.c \
+		packet-amr.c \
+		packet-ancp.c \
+		packet-ans.c \
+		packet-ansi_637.c \
+		packet-ansi_683.c \
+		packet-ansi_801.c \
+		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-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-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-ber.c \
+		packet-bfcp.c \
+		packet-bfd.c \
+		packet-bgp.c \
+		packet-bitcoin.c \
+		packet-bittorrent.c \
+		packet-bjnp.c \
+		packet-bmc.c \
+		packet-bofl.c \
+		packet-bootp.c \
+		packet-bootparams.c \
+		packet-bpdu.c \
+		packet-bpq.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-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-bthcrp.c \
+		packet-bthfp.c \
+		packet-bthid.c \
+		packet-btl2cap.c \
+		packet-btmcap.c \
+		packet-btobex.c \
+		packet-btrfcomm.c \
+		packet-btsap.c \
+		packet-btsdp.c \
+		packet-btsmp.c \
+		packet-bt-oui.c \
+		packet-bvlc.c \
+		packet-bzr.c \
+		packet-calcappprotocol.c \
+		packet-canopen.c \
+		packet-capwap.c \
+		packet-carp.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-cimd.c \
+		packet-cimetrics.c \
+		packet-cip.c \
+		packet-cipmotion.c \
+		packet-cipsafety.c \
+		packet-cisco-erspan.c \
+		packet-cisco-metadata.c \
+		packet-cisco-oui.c \
+		packet-cisco-sm.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-cosine.c \
+		packet-cpfi.c \
+		packet-cpha.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 \
+		packet-dcerpc-browser.c \
+		packet-dcerpc-cds_clerkserver.c \
+		packet-dcerpc-cds_solicit.c \
+		packet-dcerpc-conv.c \
+		packet-dcerpc-cprpc_server.c \
+		packet-dcerpc-dce122.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-icl_rpc.c \
+		packet-dcerpc-krb5rpc.c \
+		packet-dcerpc-llb.c \
+		packet-dcerpc-messenger.c \
+		packet-dcerpc-mgmt.c \
+		packet-dcerpc-ndr.c \
+		packet-dcerpc-netlogon.c \
+		packet-dcerpc-pnp.c \
+		packet-dcerpc-rdaclif.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_bind.c \
+		packet-dcerpc-rs_misc.c \
+		packet-dcerpc-rs_pgo.c \
+		packet-dcerpc-rs_plcy.c \
+		packet-dcerpc-rs_prop_acct.c \
+		packet-dcerpc-rs_prop_acl.c \
+		packet-dcerpc-rs_prop_attr.c \
+		packet-dcerpc-rs_prop_pgo.c \
+		packet-dcerpc-rs_prop_plcy.c \
+		packet-dcerpc-rs_pwd_mgmt.c \
+		packet-dcerpc-rs_repadm.c \
+		packet-dcerpc-rs_replist.c \
+		packet-dcerpc-rs_repmgr.c \
+		packet-dcerpc-rs_unix.c \
+		packet-dcerpc-rsec_login.c \
+		packet-dcerpc-samr.c \
+		packet-dcerpc-secidmap.c \
+		packet-dcerpc-spoolss.c \
+		packet-dcerpc-svcctl.c \
+		packet-dcerpc-tapi.c \
+		packet-dcerpc-tkn4int.c \
+		packet-dcerpc-trksvr.c \
+		packet-dcerpc-ubikdisk.c \
+		packet-dcerpc-ubikvote.c \
+		packet-dcerpc-update.c \
+		packet-dcerpc.c \
+		packet-dcm.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-dhcp-failover.c \
+		packet-dhcpv6.c \
+		packet-diameter.c \
+		packet-diameter_3gpp.c \
+		packet-diffserv-mpls-common.c \
+		packet-dis-enums.c \
+		packet-dis-fields.c \
+		packet-dis-pdus.c \
+		packet-dis.c \
+		packet-distcc.c \
+		packet-dlm3.c \
+		packet-dlsw.c \
+		packet-dmp.c \
+		packet-dmx-chan.c \
+		packet-dmx-sip.c \
+		packet-dmx-test.c \
+		packet-dmx-text.c \
+		packet-dmx.c \
+		packet-dnp.c \
+		packet-dns.c \
+		packet-dplay.c \
+		packet-dpnss-link.c \
+		packet-dpnss.c \
+		packet-drda.c \
+		packet-dsi.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 \
+		packet-e212.c \
+		packet-eap.c \
+		packet-eapol.c \
+		packet-echo.c \
+		packet-ecp-oui.c \
+		packet-edonkey.c \
+		packet-egd.c \
+		packet-ehdlc.c \
+		packet-ehs.c \
+		packet-eigrp.c \
+		packet-eiss.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-erf.c \
+		packet-erldp.c \
+		packet-esio.c \
+		packet-esis.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-extreme.c \
+		packet-exported_pdu.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-fddi.c \
+		packet-fefd.c \
+		packet-ff.c \
+		packet-fip.c \
+		packet-fix.c \
+		packet-flexnet.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-gdsdb.c \
+		packet-gearman.c \
+		packet-ged125.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-gre.c \
+		packet-gsm_a_bssmap.c \
+		packet-gsm_a_dtap.c \
+		packet-gsm_a_gm.c \
+		packet-gsm_a_rp.c \
+		packet-gsm_a_rr.c \
+		packet-gsm_abis_om2000.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 \
+		packet-gsmtap.c \
+		packet-gssapi.c \
+		packet-gtp.c \
+		packet-gtpv2.c \
+		packet-gvcp.c \
+		packet-gvrp.c \
+		packet-h1.c \
+		packet-h221_nonstd.c \
+		packet-h223.c \
+		packet-h248_10.c \
+		packet-h248_2.c \
+		packet-h248_3gpp.c \
+		packet-h248_7.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_usb.c \
+		packet-hclnfsd.c \
+		packet-hdcp.c \
+		packet-hdcp2.c \
+		packet-hdfs.c \
+		packet-hdfsdata.c \
+		packet-hip.c \
+		packet-homeplug-av.c \
+		packet-homeplug.c \
+		packet-hp-erm.c \
+		packet-hpext.c \
+		packet-hpfeeds.c \
+		packet-hpsw.c \
+		packet-hpteam.c \
+		packet-hsr-prp-supervision.c \
+		packet-hsr.c \
+		packet-hsrp.c \
+		packet-http.c \
+		packet-http-urlencoded.c \
+		packet-hyperscsi.c \
+		packet-i2c.c \
+		packet-iana-oui.c \
+		packet-iapp.c \
+		packet-iax2.c \
+		packet-icap.c \
+		packet-icep.c \
+		packet-icmp.c \
+		packet-icmpv6.c \
+		packet-icp.c \
+		packet-icq.c \
+		packet-idp.c \
+		packet-idrp.c \
+		packet-iec104.c \
+		packet-ieee1722.c \
+		packet-ieee17221.c \
+		packet-ieee80211-airopeek.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 \
+		packet-ieee8023.c \
+		packet-ieee802a.c \
+		packet-ifcp.c \
+		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-infiniband.c \
+		packet-infiniband_sdp.c \
+		packet-interlink.c \
+		packet-ip.c \
+		packet-ipars.c \
+		packet-ipdc.c \
+		packet-ipfc.c \
+		packet-ipmi-session.c \
+		packet-ipmi.c \
+		packet-ipnet.c \
+		packet-ipoib.c \
+		packet-ipp.c \
+		packet-ipsec-tcp.c \
+		packet-ipsec-udp.c \
+		packet-ipsec.c \
+		packet-ipsi-ctl.c \
+		packet-ipv6.c \
+		packet-ipvs-syncd.c \
+		packet-ipx.c \
+		packet-ipxwan.c \
+		packet-irc.c \
+		packet-isakmp.c \
+		packet-iscsi.c \
+		packet-isdn.c \
+		packet-isis-clv.c \
+		packet-isis-hello.c \
+		packet-isis-lsp.c \
+		packet-isis-snp.c \
+		packet-isis.c \
+		packet-isl.c \
+		packet-ismacryp.c \
+		packet-ismp.c \
+		packet-isns.c \
+		packet-iso7816.c \
+		packet-isup.c \
+		packet-itdm.c \
+		packet-iua.c \
+		packet-iuup.c \
+		packet-iwarp-ddp-rdmap.c \
+		packet-iwarp-mpa.c \
+		packet-ixiatrailer.c \
+		packet-ixveriwave.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-kdsp.c \
+		packet-kerberos.c \
+		packet-kerberos4.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 \
+		packet-lapbether.c \
+		packet-lapd.c \
+		packet-lapdm.c \
+		packet-laplink.c \
+		packet-lapsat.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-llrp.c \
+		packet-llt.c \
+		packet-lmi.c \
+		packet-lmp.c \
+		packet-lon.c \
+		packet-loop.c \
+		packet-lpd.c \
+		packet-lsc.c \
+		packet-ltp.c \
+		packet-lwapp.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-mactelnet.c \
+		packet-manolito.c \
+		packet-mbtcp.c \
+		packet-mdshdr.c \
+		packet-media.c \
+		packet-megaco.c \
+		packet-memcache.c \
+		packet-mesh.c \
+		packet-meta.c \
+		packet-mgcp.c \
+		packet-mih.c \
+		packet-mikey.c \
+		packet-mim.c \
+		packet-mime-encap.c \
+		packet-miop.c \
+		packet-mip.c \
+		packet-mip6.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-echo.c \
+		packet-mpls-pm.c \
+		packet-mpls-psc.c \
+		packet-mplstp-oam.c \
+		packet-mpls-y1711.c \
+		packet-mpls.c \
+		packet-mq-pcf.c \
+		packet-mq.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-msn-messenger.c \
+		packet-msnip.c \
+		packet-msnlb.c \
+		packet-msproxy.c \
+		packet-msrp.c \
+		packet-mstp.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-nbipx.c \
+		packet-nbns.c \
+		packet-ncp-nmas.c \
+		packet-ncp-sss.c \
+		packet-ncp.c \
+		packet-ncp2222.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-netflow.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 \
+		packet-nhrp.c \
+		packet-nisplus.c \
+		packet-nlm.c \
+		packet-nlsp.c \
+		packet-nntp.c \
+		packet-noe.c \
+		packet-nsip.c \
+		packet-nsrp.c \
+		packet-nstrace.c \
+		packet-nt-oui.c \
+		packet-nt-tpcp.c \
+		packet-ntlmssp.c \
+		packet-ntp.c \
+		packet-null.c \
+		packet-nwmtp.c \
+		packet-oicq.c \
+		packet-oipf.c \
+		packet-olsr.c \
+		packet-omapi.c \
+		packet-omron-fins.c \
+		packet-openflow.c \
+		packet-opensafety.c \
+		packet-openvpn.c \
+		packet-openwire.c \
+		packet-opsi.c \
+		packet-osi-options.c \
+		packet-osi.c \
+		packet-ositp.c \
+		packet-ospf.c \
+		packet-ouch.c \
+		packet-p_mul.c \
+		packet-packetbb.c \
+		packet-packetlogger.c \
+		packet-pagp.c \
+		packet-paltalk.c \
+		packet-pana.c \
+		packet-pcep.c \
+		packet-pcli.c \
+		packet-pcnfsd.c \
+		packet-pcp.c \
+		packet-pdcp-lte.c \
+		packet-peekremote.c \
+		packet-per.c \
+		packet-pflog.c \
+		packet-pgm.c \
+		packet-pgsql.c \
+		packet-pim.c \
+		packet-pingpongprotocol.c \
+		packet-pktc.c \
+		packet-pktgen.c \
+		packet-pnrp.c \
+		packet-pop.c \
+		packet-portmap.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-fr.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-quake.c \
+		packet-quake2.c \
+		packet-quake3.c \
+		packet-quakeworld.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 \
+		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-rgmp.c \
+		packet-rip.c \
+		packet-ripng.c \
+		packet-rlc-lte.c \
+		packet-rlc.c \
+		packet-rlm.c \
+		packet-rlogin.c \
+		packet-rmcp.c \
+		packet-rmi.c \
+		packet-rmp.c \
+		packet-rmt-alc.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-rpki-rtr.c \
+		packet-rpl.c \
+		packet-rquota.c \
+		packet-rsh.c \
+		packet-rsip.c \
+		packet-rsl.c \
+		packet-rstat.c \
+		packet-rsvp.c \
+		packet-rsync.c \
+		packet-rtacser.c \
+		packet-rtcdc.c \
+		packet-rtcp.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-rtsp.c \
+		packet-rudp.c \
+		packet-rwall.c \
+		packet-rx.c \
+		packet-s5066.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-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-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-sigcomp.c \
+		packet-simulcrypt.c \
+		packet-sip.c \
+		packet-sipfrag.c \
+		packet-sita.c \
+		packet-skinny.c \
+		packet-skype.c \
+		packet-slimp3.c \
+		packet-sll.c \
+		packet-slowprotocols.c \
+		packet-slsk.c \
+		packet-smb-browse.c \
+		packet-smb-common.c \
+		packet-smb-logon.c \
+		packet-smb-mailslot.c \
+		packet-smb-pipe.c \
+		packet-smb-sidsnooping.c \
+		packet-smb.c \
+		packet-smb2.c \
+		packet-sml.c \
+		packet-smpp.c \
+		packet-smtp.c \
+		packet-sna.c \
+		packet-snaeth.c \
+		packet-sndcp-xid.c \
+		packet-sndcp.c \
+		packet-socketcan.c \
+		packet-socks.c \
+		packet-soupbintcp.c \
+		packet-spice.c \
+		packet-spp.c \
+		packet-spray.c \
+		packet-sprt.c \
+		packet-srp.c \
+		packet-srvloc.c \
+		packet-sscf-nni.c \
+		packet-sscop.c \
+		packet-ssh.c \
+		packet-ssl-utils.c \
+		packet-ssl.c \
+		packet-stanag4607.c \
+		packet-starteam.c \
+		packet-stat-notify.c \
+		packet-stat.c \
+		packet-stun.c \
+		packet-sua.c \
+		packet-symantec.c \
+		packet-sync.c \
+		packet-synergy.c \
+		packet-synphasor.c \
+		packet-sysex.c \
+		packet-syslog.c \
+		packet-t30.c \
+		packet-tacacs.c \
+		packet-tali.c \
+		packet-tapa.c \
+		packet-tcp.c \
+		packet-tdmoe.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-tftp.c \
+		packet-time.c \
+		packet-tipc.c \
+		packet-tivoconnect.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-trmac.c \
+		packet-tsp.c \
+		packet-tte-pcf.c \
+		packet-tte.c \
+		packet-turbocell.c \
+		packet-turnchannel.c \
+		packet-tuxedo.c \
+		packet-tzsp.c \
+		packet-ua.c \
+		packet-ua3g.c \
+		packet-uasip.c \
+		packet-uaudp.c \
+		packet-ucp.c \
+		packet-udld.c \
+		packet-udp.c \
+		packet-udt.c \
+		packet-uhd.c \
+		packet-uma.c \
+		packet-umts_fp.c \
+		packet-umts_mac.c \
+		packet-usb-audio.c \
+		packet-usb-ccid.c \
+		packet-usb-hid.c \
+		packet-usb-hub.c \
+		packet-usb-masstorage.c \
+		packet-usb-video.c \
+		packet-usb.c \
+		packet-user_encap.c \
+		packet-uts.c \
+		packet-v120.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-vrrp.c \
+		packet-vrt.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-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 \
+		packet-wtp.c \
+		packet-x224.c \
+		packet-x25.c \
+		packet-x29.c \
+		packet-xcsl.c \
+		packet-xdmcp.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 \
+		packet-yppasswd.c \
+		packet-ypserv.c \
+		packet-ypxfr.c \
+		packet-zbee-aps.c \
+		packet-zbee-nwk.c \
+		packet-zbee-security.c \
+		packet-zbee-zcl.c \
+		packet-zbee-zcl-general.c \
+		packet-zbee-zcl-ha.c \
+		packet-zbee-zcl-meas-sensing.c \
+		packet-zbee-zcl-se.c \
+		packet-zbee-zdp-binding.c \
+		packet-zbee-zdp-discovery.c \
+		packet-zbee-zdp-management.c \
+		packet-zbee-zdp.c \
+		packet-zebra.c \
+		packet-zep.c \
+		packet-ziop.c \
+		packet-zrtp.c \
+		packet-gsm_a_common.c \
+		packet-x11.c
+
+DISSECTOR_SUPPORT_SRCS= \
+		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-dcerpc-nt.c \
+		usb.c
+DISSECTOR_SUPPORT_SRCS+= register.c
+
+.PATH: ${.CURDIR}/../../epan/ftypes
+FTYPE_SRCS= \
+	ftypes.c \
+	ftype-bytes.c \
+	ftype-double.c \
+	ftype-integer.c \
+	ftype-ipv4.c \
+	ftype-ipv6.c \
+	ftype-guid.c \
+	ftype-none.c \
+	ftype-pcre.c \
+	ftype-string.c \
+	ftype-time.c \
+	ftype-tvbuff.c
+
+.PATH: ${.CURDIR}/../../epan/wmem
+WMEM_SRCS= \
+	wmem_array.c \
+	wmem_core.c \
+	wmem_allocator_block.c \
+	wmem_allocator_simple.c \
+	wmem_allocator_strict.c \
+	wmem_list.c \
+	wmem_miscutl.c \
+	wmem_scopes.c \
+	wmem_stack.c \
+	wmem_strbuf.c \
+	wmem_strutl.c \
+	wmem_tree.c \
+	wmem_user_cb.c
+		
+LIBWIRESHARK_SRCS= \
+	addr_and_mask.c \
+	addr_resolv.c \
+	address_to_str.c \
+	adler32.c \
+	afn.c \
+	app_mem_usage.c \
+	asn1.c \
+	asm_utils.c \
+	atalk-utils.c \
+	base64.c \
+	bitswap.c \
+	camel-persistentdata.c \
+	charsets.c \
+	circuit.c \
+	codecs.c \
+	column.c \
+	column-utils.c \
+	conversation.c \
+	crc16-tvb.c \
+	crc32-tvb.c \
+	crc8-tvb.c \
+	disabled_protos.c \
+	dissector_filters.c \
+	emem.c \
+	epan.c \
+	ex-opt.c \
+	except.c \
+	expert.c \
+	exported_pdu.c \
+	filesystem.c \
+	filter_expressions.c \
+	follow.c \
+	frame_data.c \
+	frame_data_sequence.c \
+	frequency-utils.c \
+	funnel.c \
+	gcp.c \
+	geoip_db.c \
+	golay.c \
+	guid-utils.c \
+	h225-persistentdata.c \
+	in_cksum.c \
+	ipproto.c \
+	ipv4.c \
+	next_tvb.c \
+	oids.c \
+	osi-utils.c \
+	packet-range.c \
+	packet.c \
+	plugins.c \
+	print.c \
+	prefs.c \
+	proto.c \
+	ps.c \
+	range.c \
+	reassemble.c \
+	reedsolomon.c \
+	req_resp_hdrs.c \
+	show_exception.c \
+	sigcomp_state_hdlr.c \
+	sigcomp-udvm.c \
+	sminmpec.c \
+	sna-utils.c \
+	stat_cmd_args.c \
+	stats_tree.c \
+	strutil.c \
+	stream.c \
+	t35.c \
+	tap.c \
+	tcap-persistentdata.c \
+	timestamp.c \
+	timestats.c \
+	tfs.c \
+	to_str.c \
+	tvbparse.c \
+	tvbuff.c \
+	tvbuff_composite.c \
+	tvbuff_real.c \
+	tvbuff_subset.c \
+	uat.c \
+	value_string.c \
+	xdlc.c \
+	diam_dict.l \
+	dtd_parse.l \
+	dtd_preparse.l \
+	radius_dict.l \
+	uat_load.l
+# XXX generated
+LIBWIRESHARK_SRCS+=	dtd_grammar.c
+
+SRCS+=	${CRYPT_SRCS} \
+	${DFILTER_SRCS} \
+	${DISSECTOR_SRCS} \
+	${DISSECTOR_SUPPORT_SRCS} \
+	${FTYPE_SRCS} \
+	${WMEM_SRCS} \
+	${LIBWIRESHARK_SRCS}
+
+CFLAGS+=	-I${.CURDIR}/../.. \
+		-I${.CURDIR}/../../epan \
+		-I${.CURDIR}/../../epan/dfilter \
+		-I${.CURDIR}/../../epan/dissectors \
+		-I${.CURDIR}/../../epan/ftypes \
+		-I${.CURDIR}/../../tools/lemon \
+		-I/usr/local/include \
+		-I/usr/local/include/glib-2.0 \
+		'-DPLUGIN_DIR="/nonexistant"'
diff --git a/bmake/libwiretap/Makefile b/bmake/libwiretap/Makefile
index 57e25bbe12..0051422f32 100644
--- a/bmake/libwiretap/Makefile
+++ b/bmake/libwiretap/Makefile
@@ -1,67 +1,5 @@
-.PATH:	${.CURDIR}/../../wiretap
-
-SRCS=	5views.c \
-	aethra.c \
-	ascendtext.c \
-	atm.c \
-	ber.c \
-	btsnoop.c \
-	buffer.c \
-	camins.c \
-	catapult_dct2000.c \
-	commview.c \
-	cosine.c \
-	csids.c \
-	daintree-sna.c \
-	dbs-etherwatch.c \
-	dct3trace.c \
-	erf.c \
-	eyesdn.c \
-	file_access.c \
-	file_wrappers.c \
-	hcidump.c \
-	i4btrace.c \
-	ipfix.c \
-	iptrace.c \
-	iseries.c \
-	k12.c \
-	lanalyzer.c \
-	libpcap.c \
-	merge.c \
-	mpeg.c \
-	mime_file.c \
-	mp2t.c \
-	netmon.c \
-	netscaler.c \
-	netscreen.c \
-	nettl.c \
-	network_instruments.c \
-	netxray.c \
-	ngsniffer.c \
-	packetlogger.c \
-	pcap-common.c \
-	pcapng.c \
-	peekclassic.c \
-	peektagged.c \
-	pppdump.c \
-	radcom.c \
-	snoop.c \
-	stanag4607.c \
-	tnef.c \
-	toshiba.c \
-	visual.c \
-	vms.c \
-	vwr.c \
-	wtap.c \
-	ascend.y \
-	ascend_scanner.l \
-	k12text.l
+.include "Makefile.src"
 
 LIB=	wiretap
 
-CFLAGS+=	-I${.CURDIR}/../.. \
-		-I${.CURDIR}/../../wiretap \
-		-I/usr/local/include/glib-2.0
-YFLAGS+=	-p ascend
-
 .include <bsd.lib.mk>
diff --git a/bmake/libwiretap/Makefile.src b/bmake/libwiretap/Makefile.src
new file mode 100644
index 0000000000..e8068d3515
--- /dev/null
+++ b/bmake/libwiretap/Makefile.src
@@ -0,0 +1,63 @@
+.PATH:	${.CURDIR}/../../wiretap
+
+SRCS+=	5views.c \
+	aethra.c \
+	ascendtext.c \
+	atm.c \
+	ber.c \
+	btsnoop.c \
+	buffer.c \
+	camins.c \
+	catapult_dct2000.c \
+	commview.c \
+	cosine.c \
+	csids.c \
+	daintree-sna.c \
+	dbs-etherwatch.c \
+	dct3trace.c \
+	erf.c \
+	eyesdn.c \
+	file_access.c \
+	file_wrappers.c \
+	hcidump.c \
+	i4btrace.c \
+	ipfix.c \
+	iptrace.c \
+	iseries.c \
+	k12.c \
+	lanalyzer.c \
+	libpcap.c \
+	merge.c \
+	mpeg.c \
+	mime_file.c \
+	mp2t.c \
+	netmon.c \
+	netscaler.c \
+	netscreen.c \
+	nettl.c \
+	network_instruments.c \
+	netxray.c \
+	ngsniffer.c \
+	packetlogger.c \
+	pcap-common.c \
+	pcapng.c \
+	peekclassic.c \
+	peektagged.c \
+	pppdump.c \
+	radcom.c \
+	snoop.c \
+	stanag4607.c \
+	tnef.c \
+	toshiba.c \
+	visual.c \
+	vms.c \
+	vwr.c \
+	wtap.c \
+	ascend.y \
+	ascend_scanner.l \
+	k12text.l
+
+CFLAGS+=	-I${.CURDIR}/../.. \
+		-I${.CURDIR}/../../wiretap \
+		-I/usr/local/include/glib-2.0
+YFLAGS+=	-p ascend
diff --git a/bmake/libwsutil/Makefile b/bmake/libwsutil/Makefile
index a2323cfd2b..058428eb4b 100644
--- a/bmake/libwsutil/Makefile
+++ b/bmake/libwsutil/Makefile
@@ -1,37 +1,5 @@
-.PATH:	${.CURDIR}/../../wsutil
-
-SRCS=	aes.c \
-	airpdcap_wep.c \
-	crash_info.c \
-	crc10.c \
-	crc16.c \
-	crc16-plain.c \
-	crc32.c \
-	crc6.c \
-	crc7.c \
-	crc8.c \
-	crc11.c \
-	crcdrm.c \
-	des.c \
-	eax.c \
-	g711.c \
-	md4.c \
-	md5.c \
-	mpeg-audio.c \
-	nstime.c \
-	privileges.c \
-	sha1.c \
-	strnatcmp.c \
-	str_util.c \
-	rc4.c \
-	report_err.c \
-	tempfile.c \
-	type_util.c \
-	u3.c
+.include "Makefile.src"
 
 LIB=	wsutil
 
-CFLAGS+=	-I${.CURDIR}/../../ -I/usr/local/include/glib-2.0
-
-#-I${.CURDIR}/../../wsutil/abi-check-headers
 .include <bsd.lib.mk>
diff --git a/bmake/libwsutil/Makefile.src b/bmake/libwsutil/Makefile.src
new file mode 100644
index 0000000000..9317c4fcf5
--- /dev/null
+++ b/bmake/libwsutil/Makefile.src
@@ -0,0 +1,32 @@
+.PATH:	${.CURDIR}/../../wsutil
+
+SRCS+=	aes.c \
+	airpdcap_wep.c \
+	crash_info.c \
+	crc10.c \
+	crc16.c \
+	crc16-plain.c \
+	crc32.c \
+	crc6.c \
+	crc7.c \
+	crc8.c \
+	crc11.c \
+	crcdrm.c \
+	des.c \
+	eax.c \
+	g711.c \
+	md4.c \
+	md5.c \
+	mpeg-audio.c \
+	nstime.c \
+	privileges.c \
+	sha1.c \
+	strnatcmp.c \
+	str_util.c \
+	rc4.c \
+	report_err.c \
+	tempfile.c \
+	type_util.c \
+	u3.c
+
+CFLAGS+=	-I${.CURDIR}/../../ -I/usr/local/include/glib-2.0
diff --git a/bmake/tshark/Makefile b/bmake/tshark/Makefile
index f3ab2bf12a..60d8364467 100644
--- a/bmake/tshark/Makefile
+++ b/bmake/tshark/Makefile
@@ -69,11 +69,21 @@ WIRESHARK_COMMON_SRC= \
 CFLAGS+=	-I${.CURDIR}/../.. \
 		-I${.CURDIR}/../../wiretap \
 		-I/usr/local/include/glib-2.0
+
+.include <bsd.own.mk>
+
 LDADD+=	-lkrb5 -lm -lpcap -lz \
 	-L/usr/local/lib -ladns -lglib-2.0 -lgmodule-2.0 -lGeoIP \
-	-L../libui -L${.CURDIR}/../libui -lui \
-	-L../libwiretap -L${.CURDIR}/../libwiretap -lwiretap \
+	-L../libui -L${.CURDIR}/../libui -lui
+
+.if ${MK_SOAAP} == "no"
+LDADD+=	-L../libwiretap -L${.CURDIR}/../libwiretap -lwiretap \
 	-L../libwireshark -L${.CURDIR}/../libwireshark -lwireshark \
 	-L../libwsutil -L${.CURDIR}/../libwsutil -l wsutil
+.else
+.include "${.CURDIR}/../libwiretap/Makefile.src"
+.include "${.CURDIR}/../libwireshark/Makefile.src"
+.include "${.CURDIR}/../libwsutil/Makefile.src"
+.endif
 
 .include <bsd.prog.mk>