Add files by folder to distribution tarball (EXTRA_DIST)

This takes away much of the pain (and merge conflicts) of micro-managing every
sub-folder file.

Change-Id: I7d7bb1173511ec9312ca4a97c6a59a26b0b194f4
Reviewed-on: https://code.wireshark.org/review/14595
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

5 files changed, 21 insertions, 703 deletions

diff --git a/Makefile.am b/Makefile.am
index b2df0eb0b4..e3307d811e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -703,633 +703,44 @@ EXTRA_DIST = \
 	README.vmware		\
 	README.windows		\
 	abi-descriptor.template	\
-	m4/ax_append_flag.m4		\
-	m4/ax_check_compile_flag.m4	\
-	m4/ax_compiler_vendor.m4	\
-	m4/ax_prog_cc_for_build.m4	\
-	m4/libsmi.m4			\
-	m4/libgcrypt.m4			\
-	m4/pkg.m4			\
 	autogen.sh		\
-	capinfos.c		\
-	captype.c		\
 	cfilters		\
 	colorfilters		\
 	config.h.win32		\
 	config.nmake		\
-	debian/changelog	\
-	debian/compat		\
-	debian/control		\
-	debian/copyright	\
-	debian/dirs		\
-	debian/ethereal-common.NEWS	\
-	debian/geoip_db_paths	\
-	debian/headers-check.c	\
-	debian/libwireshark0.install	\
-	debian/libwireshark0.symbols	\
-	debian/libwireshark-data.install	\
-	debian/libwireshark-dev.install	\
-	debian/libwiretap0.docs	\
-	debian/libwiretap0.install	\
-	debian/libwiretap0.symbols	\
-	debian/libwiretap-dev.install	\
-	debian/libwscodecs0.install	\
-	debian/libwscodecs0.symbols	\
-	debian/libwsutil0.install	\
-	debian/libwsutil0.symbols	\
-	debian/libwsutil-dev.install	\
-	debian/license-text-about-dialog	\
-	debian/patches/02_use_packaged_openlayers_js.patch	\
-	debian/patches/04_asn2wrs_ply.patch	\
-	debian/patches/05_note-README-when-running-as-root.patch	\
-	debian/patches/06_release-version.patch	\
-	debian/patches/09_idl2wrs.patch	\
-	debian/patches/16_licence_about_location.patch	\
-	debian/patches/series	\
-	debian/po/POTFILES.in	\
-	debian/po/cs.po	\
-	debian/po/da.po	\
-	debian/po/de.po	\
-	debian/po/es.po	\
-	debian/po/eu.po	\
-	debian/po/fi.po	\
-	debian/po/fr.po	\
-	debian/po/hu.po	\
-	debian/po/id.po	\
-	debian/po/it.po	\
-	debian/po/ja.po	\
-	debian/po/ko.po	\
-	debian/po/nl.po	\
-	debian/po/pt.po	\
-	debian/po/pt_BR.po	\
-	debian/po/ru.po	\
-	debian/po/sk.po	\
-	debian/po/sv.po	\
-	debian/po/templates.pot	\
-	debian/po/vi.po	\
-	debian/postinst		\
-	debian/README.Debian	\
-	debian/README.Debian.security	\
-	debian/rules		\
-	debian/source/format	\
-	debian/templates	\
-	debian/tshark.docs	\
-	debian/tshark.install	\
-	debian/tshark.manpages	\
-	debian/wireshark-common.config	\
-	debian/wireshark-common.install	\
-	debian/wireshark-common.manpages \
-	debian/wireshark-common.postinst	\
-	debian/wireshark-common.postrm	\
-	debian/wireshark-dev.docs \
-	debian/wireshark-dev.install	\
-	debian/wireshark-dev.manpages \
-	debian/wireshark-dev.prerm \
-	debian/wireshark-doc.docs	\
-	debian/wireshark-gtk.docs	\
-	debian/wireshark-gtk.install	\
-	debian/wireshark-qt.docs	\
-	debian/wireshark-qt.install	\
-	debian/wireshark-qt.manpages \
+	debian			\
 	dfilters		\
 	doxygen_global.cfg	\
 	doxygen.cfg.in		\
-	dumpcap.c		\
-	editcap.c		\
-	epan/print.ps		\
-	fix/FIX.xml		\
-	fix/FIX40.xml		\
-	fix/FIX41.xml		\
-	fix/FIX42.xml		\
-	fix/FIX43.xml		\
-	fix/FIX44.xml		\
-	fix/FIX50.xml		\
-	fix/FIX50SP1.xml	\
-	fix/FIX50SP2.xml	\
-	fix/README		\
-	fix/Values.xsl		\
-	fix/hfDecl.xsl		\
-	fix/hfField.xsl		\
-	fix/hfList.xsl		\
-	idl/coseventcomm.idl	\
-	idl/cosnaming.idl	\
-	idl/tango.idl	\
-	idl/parlay/am.idl	\
-	idl/parlay/cccs.idl	\
-	idl/parlay/cm.idl	\
-	idl/parlay/common_cc_data.idl	\
-	idl/parlay/cs.idl	\
-	idl/parlay/dsc.idl	\
-	idl/parlay/fw_data.idl	\
-	idl/parlay/fw_if.idl	\
-	idl/parlay/fw_if_access.idl	\
-	idl/parlay/fw_if_app.idl	\
-	idl/parlay/fw_if_entop.idl	\
-	idl/parlay/fw_if_service.idl	\
-	idl/parlay/gcc_data.idl	\
-	idl/parlay/gcc_interfaces.idl	\
-	idl/parlay/gms.idl	\
-	idl/parlay/mm.idl	\
-	idl/parlay/mmccs.idl	\
-	idl/parlay/mmm.idl	\
-	idl/parlay/mpcc_data.idl	\
-	idl/parlay/mpcc_interfaces.idl	\
-	idl/parlay/osa.idl	\
-	idl/parlay/pam_data.idl	\
-	idl/parlay/pam_interfaces.idl	\
-	idl/parlay/Parlay.idl	\
-	idl/parlay/policy_data.idl	\
-	idl/parlay/policy_interfaces.idl	\
-	idl/parlay/README.parlay	\
-	idl/parlay/termcap.idl	\
-	idl/parlay/ui_data.idl	\
-	idl/parlay/ui_interfaces.idl	\
-	image/capinfos.rc.in	\
-	image/captype.rc.in	\
-	image/capture_comment.svg	\
-	image/capture_comment_add.png	\
-	image/capture_comment_disabled.png	\
-	image/capture_comment_update.png	\
-	image/capture_comment_update.svg	\
-	image/clist_ascend.xpm			\
-	image/clist_descend.xpm			\
-	image/copy-8.png			\
-	image/dumpcap.rc.in	\
-	image/editcap.rc.in	\
-	image/file_dlg_win32.rc \
-	image/hi16-app-wireshark.png	\
-	image/hi32-app-wireshark.png	\
-	image/hi48-app-wireshark.png	\
-	image/languages/de.svg		\
-	image/languages/en.svg		\
-	image/languages/fr.svg		\
-	image/languages/it.svg		\
-	image/languages/ja_JP.svg	\
-	image/languages/pl.svg		\
-	image/languages/zh_CN.svg	\
-	image/layout_1.png		\
-	image/layout_1@2x.png		\
-	image/layout_2.png		\
-	image/layout_2@2x.png		\
-	image/layout_3.png		\
-	image/layout_3@2x.png		\
-	image/layout_4.png		\
-	image/layout_4@2x.png		\
-	image/layout_5.png		\
-	image/layout_5@2x.png		\
-	image/layout_6.png		\
-	image/layout_6@2x.png		\
-	image/libwscodecs.rc.in		\
-	image/libwireshark.rc.in	\
-	image/libwsutil.rc.in		\
-	image/lo16-app-wireshark.png	\
-	image/lo32-app-wireshark.png	\
-	image/lo48-app-wireshark.png	\
-	image/Makefile.nmake			\
-	image/mergecap.rc.in			\
-	image/minus-8.png			\
-	image/nsis-checked.bmp			\
-	image/nsis-unchecked.bmp		\
-	image/openhand-16.png			\
-	image/plus-8.png			\
-	image/rawshark.rc.in			\
-	image/README.image			\
-	image/reordercap.rc.in			\
-	image/rubberband-16.png			\
-	image/stock_dialog_error_48.xpm		\
-	image/stock_dialog_info_48.xpm		\
-	image/stock_dialog_question_48.xpm	\
-	image/stock_dialog_stop_48.xpm		\
-	image/stock_dialog_warning_48.xpm	\
-	image/text2pcap.rc.in			\
-	image/tfshark.rc.in			\
-	image/expert_ok.png			\
-	image/toolbar/14x14/x-capture-comment-update.png	\
-	image/toolbar/14x14/x-capture-comment-update.svg	\
-	image/toolbar/14x14/x-capture-comment-update@2x.png	\
-	image/toolbar/14x14/x-capture-filter-bookmark.active.png \
-	image/toolbar/14x14/x-capture-filter-bookmark.active.svg \
-	image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png \
-	image/toolbar/14x14/x-capture-filter-bookmark.png \
-	image/toolbar/14x14/x-capture-filter-bookmark.selected.png \
-	image/toolbar/14x14/x-capture-filter-bookmark.selected.svg \
-	image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png \
-	image/toolbar/14x14/x-capture-filter-bookmark.svg \
-	image/toolbar/14x14/x-capture-filter-bookmark@2x.png \
-	image/toolbar/14x14/x-display-filter-bookmark.active.png \
-	image/toolbar/14x14/x-display-filter-bookmark.active.svg \
-	image/toolbar/14x14/x-display-filter-bookmark.active@2x.png \
-	image/toolbar/14x14/x-display-filter-bookmark.png \
-	image/toolbar/14x14/x-display-filter-bookmark.selected.png \
-	image/toolbar/14x14/x-display-filter-bookmark.selected.svg \
-	image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png \
-	image/toolbar/14x14/x-display-filter-bookmark.svg \
-	image/toolbar/14x14/x-display-filter-bookmark@2x.png \
-	image/toolbar/14x14/x-expert-chat.png	\
-	image/toolbar/14x14/x-expert-chat@2x.png	\
-	image/toolbar/14x14/x-expert-error.png	\
-	image/toolbar/14x14/x-expert-error@2x.png	\
-	image/toolbar/14x14/x-expert-indicators-all.svg	\
-	image/toolbar/14x14/x-expert-none.png	\
-	image/toolbar/14x14/x-expert-none@2x.png	\
-	image/toolbar/14x14/x-expert-note.png	\
-	image/toolbar/14x14/x-expert-note@2x.png	\
-	image/toolbar/14x14/x-expert-warn.png	\
-	image/toolbar/14x14/x-expert-warn@2x.png	\
-	image/toolbar/14x14/x-filter-clear.active.png \
-	image/toolbar/14x14/x-filter-clear.active.svg \
-	image/toolbar/14x14/x-filter-clear.active@2x.png \
-	image/toolbar/14x14/x-filter-clear.png \
-	image/toolbar/14x14/x-filter-clear.selected.png \
-	image/toolbar/14x14/x-filter-clear.selected.svg \
-	image/toolbar/14x14/x-filter-clear.selected@2x.png \
-	image/toolbar/14x14/x-filter-clear.svg \
-	image/toolbar/14x14/x-filter-clear@2x.png \
-	image/toolbar/14x14/x-filter-dropdown.png \
-	image/toolbar/14x14/x-filter-dropdown.svg \
-	image/toolbar/14x14/x-filter-dropdown@2x.png \
-	image/toolbar/14x14/x-filter-matching-bookmark.active.png \
-	image/toolbar/14x14/x-filter-matching-bookmark.active.svg \
-	image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png \
-	image/toolbar/14x14/x-filter-matching-bookmark.png \
-	image/toolbar/14x14/x-filter-matching-bookmark.selected.png \
-	image/toolbar/14x14/x-filter-matching-bookmark.selected.svg \
-	image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png \
-	image/toolbar/14x14/x-filter-matching-bookmark.svg \
-	image/toolbar/14x14/x-filter-matching-bookmark@2x.png \
-	image/toolbar/16x16/edit-find.png		\
-	image/toolbar/16x16/edit-find.svg		\
-	image/toolbar/16x16/edit-find@2x.png		\
-	image/toolbar/16x16/go-first.png		\
-	image/toolbar/16x16/go-first.svg		\
-	image/toolbar/16x16/go-first@2x.png		\
-	image/toolbar/16x16/go-jump.png			\
-	image/toolbar/16x16/go-jump.svg			\
-	image/toolbar/16x16/go-jump@2x.png		\
-	image/toolbar/16x16/go-last.png			\
-	image/toolbar/16x16/go-last.svg			\
-	image/toolbar/16x16/go-last@2x.png		\
-	image/toolbar/16x16/go-next.png			\
-	image/toolbar/16x16/go-next.svg			\
-	image/toolbar/16x16/go-next@2x.png		\
-	image/toolbar/16x16/go-previous.png		\
-	image/toolbar/16x16/go-previous.svg		\
-	image/toolbar/16x16/go-previous@2x.png		\
-	image/toolbar/16x16/x-capture-file-close.png	\
-	image/toolbar/16x16/x-capture-file-close.svg	\
-	image/toolbar/16x16/x-capture-file-close@2x.png	\
-	image/toolbar/16x16/x-capture-file-close@2x.svg	\
-	image/toolbar/16x16/x-capture-file-reload.png	\
-	image/toolbar/16x16/x-capture-file-reload.svg	\
-	image/toolbar/16x16/x-capture-file-reload@2x.png	\
-	image/toolbar/16x16/x-capture-file-reload@2x.svg	\
-	image/toolbar/16x16/x-capture-file-save.png	\
-	image/toolbar/16x16/x-capture-file-save.svg	\
-	image/toolbar/16x16/x-capture-file-save@2x.png	\
-	image/toolbar/16x16/x-capture-file-save@2x.svg	\
-	image/toolbar/16x16/x-capture-options-gear.svg	\
-	image/toolbar/16x16/x-capture-options-wrench.svg	\
-	image/toolbar/16x16/x-capture-options.png	\
-	image/toolbar/16x16/x-capture-options@2x.png	\
-	image/toolbar/16x16/x-capture-restart-fin.svg	\
-	image/toolbar/16x16/x-capture-restart-triangle1.svg	\
-	image/toolbar/16x16/x-capture-restart-triangle2.svg	\
-	image/toolbar/16x16/x-capture-restart-turn1.svg	\
-	image/toolbar/16x16/x-capture-restart-turn2.svg	\
-	image/toolbar/16x16/x-capture-restart.png	\
-	image/toolbar/16x16/x-capture-restart@2x.png	\
-	image/toolbar/16x16/x-capture-start.on.png	\
-	image/toolbar/16x16/x-capture-start.on.svg	\
-	image/toolbar/16x16/x-capture-start.on@2x.png	\
-	image/toolbar/16x16/x-capture-start.png		\
-	image/toolbar/16x16/x-capture-start.svg		\
-	image/toolbar/16x16/x-capture-start@2x.png	\
-	image/toolbar/16x16/x-capture-stop-red.svg	\
-	image/toolbar/16x16/x-capture-stop-white.svg	\
-	image/toolbar/16x16/x-capture-stop.png		\
-	image/toolbar/16x16/x-capture-stop@2x.png	\
-	image/toolbar/16x16/x-colorize-packets.png	\
-	image/toolbar/16x16/x-colorize-packets.svg	\
-	image/toolbar/16x16/x-colorize-packets@2x.png	\
-	image/toolbar/16x16/x-resize-columns.png	\
-	image/toolbar/16x16/x-resize-columns.svg	\
-	image/toolbar/16x16/x-resize-columns@2x.png	\
-	image/toolbar/16x16/x-stay-last.png		\
-	image/toolbar/16x16/x-stay-last.svg		\
-	image/toolbar/16x16/x-stay-last@2x.png		\
-	image/toolbar/16x16/zoom-in.png			\
-	image/toolbar/16x16/zoom-in.svg			\
-	image/toolbar/16x16/zoom-in@2x.png		\
-	image/toolbar/16x16/zoom-original.png		\
-	image/toolbar/16x16/zoom-original.svg		\
-	image/toolbar/16x16/zoom-original@2x.png	\
-	image/toolbar/16x16/zoom-out.png		\
-	image/toolbar/16x16/zoom-out.svg		\
-	image/toolbar/16x16/zoom-out@2x.png		\
-	image/toolbar/24x14/x-filter-apply.active.png \
-	image/toolbar/24x14/x-filter-apply.active.svg \
-	image/toolbar/24x14/x-filter-apply.active@2x.png \
-	image/toolbar/24x14/x-filter-apply.png \
-	image/toolbar/24x14/x-filter-apply.selected.png \
-	image/toolbar/24x14/x-filter-apply.selected.svg \
-	image/toolbar/24x14/x-filter-apply.selected@2x.png \
-	image/toolbar/24x14/x-filter-apply.svg \
-	image/toolbar/24x14/x-filter-apply@2x.png \
-	image/toolbar/24x24/edit-find.png	\
-	image/toolbar/24x24/edit-find.svg	\
-	image/toolbar/24x24/edit-find@2x.png	\
-	image/toolbar/24x24/go-first.png	\
-	image/toolbar/24x24/go-first.svg	\
-	image/toolbar/24x24/go-first@2x.png	\
-	image/toolbar/24x24/go-jump.png		\
-	image/toolbar/24x24/go-jump.svg		\
-	image/toolbar/24x24/go-jump@2x.png	\
-	image/toolbar/24x24/go-last.png		\
-	image/toolbar/24x24/go-last.svg		\
-	image/toolbar/24x24/go-last@2x.png	\
-	image/toolbar/24x24/go-next.png		\
-	image/toolbar/24x24/go-next.svg		\
-	image/toolbar/24x24/go-next@2x.png	\
-	image/toolbar/24x24/go-previous.png	\
-	image/toolbar/24x24/go-previous.svg	\
-	image/toolbar/24x24/go-previous@2x.png	\
-	image/toolbar/24x24/x-capture-file-close.png		\
-	image/toolbar/24x24/x-capture-file-close.svg		\
-	image/toolbar/24x24/x-capture-file-close@2x.png		\
-	image/toolbar/24x24/x-capture-file-close@2x.svg		\
-	image/toolbar/24x24/x-capture-file-reload.png		\
-	image/toolbar/24x24/x-capture-file-reload.svg		\
-	image/toolbar/24x24/x-capture-file-reload@2x.png	\
-	image/toolbar/24x24/x-capture-file-reload@2x.svg	\
-	image/toolbar/24x24/x-capture-file-save.png		\
-	image/toolbar/24x24/x-capture-file-save.svg		\
-	image/toolbar/24x24/x-capture-file-save@2x.png		\
-	image/toolbar/24x24/x-capture-file-save@2x.svg		\
-	image/toolbar/24x24/x-capture-options-gear.svg		\
-	image/toolbar/24x24/x-capture-options-wrench.svg	\
-	image/toolbar/24x24/x-capture-options.png		\
-	image/toolbar/24x24/x-capture-options@2x.png		\
-	image/toolbar/24x24/x-capture-restart-fin.svg		\
-	image/toolbar/24x24/x-capture-restart-triangle1.svg	\
-	image/toolbar/24x24/x-capture-restart-triangle2.svg	\
-	image/toolbar/24x24/x-capture-restart-turn1.svg		\
-	image/toolbar/24x24/x-capture-restart-turn2.svg		\
-	image/toolbar/24x24/x-capture-restart.png		\
-	image/toolbar/24x24/x-capture-restart@2x.png		\
-	image/toolbar/24x24/x-capture-start.on.png		\
-	image/toolbar/24x24/x-capture-start.on.svg		\
-	image/toolbar/24x24/x-capture-start.on@2x.png		\
-	image/toolbar/24x24/x-capture-start.png		\
-	image/toolbar/24x24/x-capture-start.svg		\
-	image/toolbar/24x24/x-capture-start@2x.png	\
-	image/toolbar/24x24/x-capture-stop-red.svg	\
-	image/toolbar/24x24/x-capture-stop-white.svg	\
-	image/toolbar/24x24/x-capture-stop.png		\
-	image/toolbar/24x24/x-capture-stop@2x.png	\
-	image/toolbar/24x24/x-colorize-packets.png	\
-	image/toolbar/24x24/x-colorize-packets.svg	\
-	image/toolbar/24x24/x-colorize-packets@2x.png	\
-	image/toolbar/24x24/x-resize-columns-motion.svg	\
-	image/toolbar/24x24/x-resize-columns.png	\
-	image/toolbar/24x24/x-resize-columns.svg	\
-	image/toolbar/24x24/x-resize-columns@2x.png	\
-	image/toolbar/24x24/x-stay-last.png		\
-	image/toolbar/24x24/x-stay-last.svg		\
-	image/toolbar/24x24/x-stay-last@2x.png		\
-	image/toolbar/24x24/zoom-in.png			\
-	image/toolbar/24x24/zoom-in.svg			\
-	image/toolbar/24x24/zoom-in@2x.png		\
-	image/toolbar/24x24/zoom-original.png		\
-	image/toolbar/24x24/zoom-original.svg		\
-	image/toolbar/24x24/zoom-original@2x.png	\
-	image/toolbar/24x24/zoom-out.png		\
-	image/toolbar/24x24/zoom-out.svg		\
-	image/toolbar/24x24/zoom-out@2x.png		\
-	image/toolbar.qrc			\
-	image/toolbar/analyze_24.xpm 		\
-	image/toolbar/audio_player_24.xpm	\
-	image/toolbar/autoscroll_24.xpm		\
-	image/toolbar/capture_airpcap_16.xpm	\
-	image/toolbar/capture_capture_16.xpm	\
-	image/toolbar/capture_details_16.xpm	\
-	image/toolbar/capture_details_24.xpm	\
-	image/toolbar/capture_ethernet_16.xpm	\
-	image/toolbar/capture_filter_24.xpm	\
-	image/toolbar/capture_interfaces_16.png	\
-	image/toolbar/capture_interfaces_16.svg \
-	image/toolbar/capture_interfaces_24.png	\
-	image/toolbar/capture_interfaces_24.svg \
-	image/toolbar/capture_pause_16.png	\
-	image/toolbar/capture_pause_16.svg	\
-	image/toolbar/capture_pause_24.png	\
-	image/toolbar/capture_pause_24.svg	\
-	image/toolbar/capture_prepare_16.xpm	\
-	image/toolbar/checkbox_16.xpm		\
-	image/toolbar/colorize_24.xpm		\
-	image/toolbar/conversations_16.xpm	\
-	image/toolbar/decode_24.xpm		\
-	image/toolbar/decode_as_16.xpm		\
-	image/toolbar/display_filter_24.xpm	\
-	image/toolbar/endpoints_16.xpm		\
-	image/toolbar/expert_info_16.xpm	\
-	image/toolbar/file_set_list_16.xpm	\
-	image/toolbar/file_set_next_16.xpm	\
-	image/toolbar/file_set_previous_16.xpm	\
-	image/toolbar/flow_graph_16.xpm	\
-	image/toolbar/gnome_emblem_web_16.png	\
-	image/toolbar/gnome_emblem_web_24.png	\
-	image/toolbar/graphs_16.xpm	\
-	image/toolbar/icon_color_0.xpm	\
-	image/toolbar/icon_color_1.xpm	\
-	image/toolbar/icon_color_2.xpm	\
-	image/toolbar/icon_color_3.xpm	\
-	image/toolbar/icon_color_4.xpm	\
-	image/toolbar/icon_color_5.xpm	\
-	image/toolbar/icon_color_6.xpm	\
-	image/toolbar/icon_color_7.xpm	\
-	image/toolbar/icon_color_8.xpm	\
-	image/toolbar/icon_color_9.xpm	\
-	image/toolbar/internet_24.xpm	\
-	image/toolbar/modem_16.png	\
-	image/toolbar/modem_16.xpm	\
-	image/toolbar/network_bluetooth_16.png	\
-	image/toolbar/network_usb.svg		\
-	image/toolbar/network_usb_16.png	\
-	image/toolbar/network_virtual_16.xpm	\
-	image/toolbar/network_wired_16.png	\
-	image/toolbar/network_wireless_16.png	\
-	image/toolbar/pipe_16.png	\
-	image/toolbar/remote_arrow_16.png	\
-	image/toolbar/remote_globe_16.png	\
-	image/toolbar/remote_sat_16.png	\
-	image/toolbar/resize_columns_24.xpm	\
-	image/toolbar/svg-to-png.sh	\
-	image/toolbar/svg/x-filter-apply.svg	\
-	image/toolbar/svg/x-filter-bookmark.svg	\
-	image/toolbar/svg/x-filter-clear.svg	\
-	image/toolbar/telephone_16.xpm	\
-	image/toolbar/telephony_16.xpm	\
-	image/toolbar/time_24.xpm	\
-	image/toolbar/voip_flow_24.xpm	\
-	image/toolbar/web_support_24.xpm	\
-	image/toolbar/wep_closed_24.xpm	\
-	image/tshark.rc.in	\
-	image/voip_select.xpm	\
-	image/wireshark.exe.manifest.in \
-	image/wireshark.ico	\
-	image/wireshark.rc.in	\
-	image/wiresharkdoc.ico	\
-	image/wiresharkinst.ico	\
-	image/WiresharkDoc-16.png	\
-	image/WiresharkDoc-24.png	\
-	image/WiresharkDoc-32.png	\
-	image/WiresharkDoc-48.png	\
-	image/WiresharkDoc-64.png	\
-	image/WiresharkDoc-128.png	\
-	image/WiresharkDoc-256.png	\
-	image/wiretap.rc.in	\
-	image/wsicon.qrc	\
-	image/wsicon.svg	\
-	image/wsicon16.png	\
-	image/wsicon24.png	\
-	image/wsicon32.png	\
-	image/wsicon48.png	\
-	image/wsicon64.png	\
-	image/wsicon128.png	\
-	image/wsicon256.png	\
-	image/wsicon512.png	\
-	image/wsicon1024.png	\
-	image/wsicon-ask.png	\
-	image/wsicon-ask.svg	\
-	image/wsiconcap.svg	\
-	image/wsiconcap16.png	\
-	image/wsiconcap24.png	\
-	image/wsiconcap32.png	\
-	image/wsiconcap48.png	\
-	image/wsiconcap64.png	\
-	image/wsiconcap128.png	\
-	image/wsiconcap256.png	\
-	image/wsiconcap512.png	\
-	image/wsiconcap1024.png	\
-	image/wsiconinst.svg	\
-	image/wsiconinst256.png	\
-	image/wslogo-dev.svg	\
-	image/wslogo.eps	\
-	image/wslogo.svg	\
-	image/wssplash_dev.png	\
-	image/wssplash.png	\
+	fix			\
+	idl			\
+	image			\
 	ipmap.html		\
+	m4			\
 	macosx-setup.sh		\
-	macosx-support-lib-patches/glib-gconvert.c.patch \
-	macosx-support-lib-patches/glib-pkgconfig.patch \
-	macosx-support-lib-patches/gnutls-pkgconfig.patch \
-	macosx-support-lib-patches/portaudio-pa_mac_core.h.patch \
-	macosx-support-lib-patches/portaudio-pa_mac_core.c.patch \
-	macosx-support-lib-patches/qt-fix-pc-file \
-	macosx-support-lib-patches/qt-fix-pc-files \
+	macosx-support-lib-patches	\
 	make-version.pl		\
 	manuf			\
 	manuf.tmpl		\
-	mergecap.c		\
 	pdml2html.xsl		\
-	reordercap.c		\
 	smi_modules		\
 	text2pcap-scanner.l	\
 	text2pcap.h		\
 	services		\
 	wireshark.desktop	\
 	wireshark-gtk.desktop	\
-	wireshark-mime-package.xml \
+	wireshark-mime-package.xml	\
 	wireshark.appdata.xml	\
 	wireshark.pc.in		\
 	wka.tmpl		\
 	CMakeLists.txt		\
-	CMakeListsCustom.txt.example		\
+	CMakeListsCustom.txt.example	\
 	cmakeconfig.h.in	\
-	wsutil/CMakeLists.txt	\
 	CMakeOptions.txt	\
-	wiretap/CMakeLists.txt	\
 	README.cmake		\
 	ConfigureChecks.cmake	\
-	cmake/modules/CheckCCompilerFlag.cmake	\
-	cmake/modules/CheckCLinkerFlag.cmake	\
-	cmake/modules/CMakeInstallDirs.cmake	\
-	cmake/modules/COPYING-CMAKE-SCRIPTS	\
-	cmake/modules/FindAIRPCAP.cmake		\
-	cmake/modules/FindASCIIDOC.cmake	\
-	cmake/modules/FindCAP.cmake		\
-	cmake/modules/FindCARES.cmake		\
-	cmake/modules/FindChocolatey.cmake	\
-	cmake/modules/FindDOXYGEN.cmake		\
-	cmake/modules/FindFOP.cmake		\
-	cmake/modules/FindFreetype.cmake	\
-	cmake/modules/FindGCRYPT.cmake		\
-	cmake/modules/FindGEOIP.cmake		\
-	cmake/modules/FindGLIB2.cmake		\
-	cmake/modules/FindGMODULE2.cmake	\
-	cmake/modules/FindGNUTLS.cmake		\
-	cmake/modules/FindGTHREAD2.cmake	\
-	cmake/modules/FindGTK2.cmake		\
-	cmake/modules/FindGTK3.cmake		\
-	cmake/modules/FindHtmlViewer.cmake	\
-	cmake/modules/FindKERBEROS.cmake	\
-	cmake/modules/FindLEX.cmake		\
-	cmake/modules/FindLUA.cmake		\
-	cmake/modules/FindLYNX.cmake		\
-	cmake/modules/FindM.cmake		\
-	cmake/modules/FindMSVC_REDIST.cmake	\
-	cmake/modules/FindNL.cmake		\
-	cmake/modules/FindNSIS.cmake		\
-	cmake/modules/FindOS_X_FRAMEWORKS.cmake	\
-	cmake/modules/FindPCAP.cmake		\
-	cmake/modules/FindPOD.cmake		\
-	cmake/modules/FindPortableApps.cmake	\
-	cmake/modules/FindPORTAUDIO.cmake	\
-	cmake/modules/FindPowerShell.cmake	\
-	cmake/modules/FindSBC.cmake		\
-	cmake/modules/FindSED.cmake		\
-	cmake/modules/FindSETCAP.cmake		\
-	cmake/modules/FindSH.cmake		\
-	cmake/modules/FindSMI.cmake		\
-	cmake/modules/FindLIBSSH.cmake	\
-	cmake/modules/FindWinSparkle.cmake	\
-	cmake/modules/FindWireshark.cmake	\
-	cmake/modules/FindWSWinLibs.cmake	\
-	cmake/modules/FindXSLTPROC.cmake	\
-	cmake/modules/FindYACC.cmake		\
-	cmake/modules/FindYAPP.cmake		\
-	cmake/modules/FindZLIB.cmake		\
-	cmake/modules/GenerateTestSh.cmake	\
-	cmake/modules/gmxTestLargeFiles.cmake	\
-	cmake/modules/hhc.cmake	\
-	cmake/modules/LICENSE.txt		\
-	cmake/modules/LocatePythonExecutable.cmake	\
-	cmake/modules/LocatePythonModule.cmake	\
-	cmake/modules/readme.txt		\
-	cmake/modules/UseABICheck.cmake		\
-	cmake/modules/UseAsn2Wrs.cmake		\
-	cmake/modules/UseCheckAPI.cmake		\
-	cmake/modules/UseCustomIncludes.cmake		\
-	cmake/modules/UseLemon.cmake		\
-	cmake/modules/UseMakeDissectorReg.cmake	\
-	cmake/modules/UseMakeTapReg.cmake	\
-	cmake/modules/UseWinLibs.cmake		\
-	cmake/modules/WiresharkConfig.cmake.in	\
-	cmake/modules/WiresharkConfigVersion.cmake.in \
-	cmake/modules/WiresharkPlugin.cmake	\
-	cmake/TestFileOffsetBits.c	\
-	cmake/TestLargeFiles.c.cmakein	\
-	cmake/TestWindowsFSeek.c	\
-	ui/win32/.editorconfig			\
-	ui/win32/Makefile.nmake			\
-	ui/win32/console_win32.c		\
-	ui/win32/console_win32.h		\
-	ui/win32/file_dlg_win32.c		\
-	ui/win32/file_dlg_win32.h		\
-	ui/win32/print_win32.c			\
-	ui/win32/print_win32.h			\
-	ui/win32/settings.ini			\
-	version.h.in				\
+	cmake			\
+	version.h.in		\
 	CPackConfig.txt
 
 install-exec-hook:
diff --git a/epan/Makefile.am b/epan/Makefile.am
index dca5fa619e..da8d143b1d 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -92,7 +92,8 @@ EXTRA_DIST = \
 	exntest.c		\
 	oids_test.c		\
 	doxygen.cfg.in		\
-	CMakeLists.txt
+	CMakeLists.txt		\
+	print.ps
 
 CLEANFILES = \
 	doxygen-epan.tag		\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c70b7f4f6c..22beddcd27 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,72 +23,7 @@ include $(top_srcdir)/Makefile.am.inc
 
 SUBDIRS = lemon
 
-PIDL_FILES= \
-	pidl/MANIFEST					\
-	pidl/META.yml					\
-	pidl/Makefile.PL				\
-	pidl/README					\
-	pidl/TODO					\
-	pidl/expr.yp					\
-	pidl/idl.yp					\
-	pidl/lib/Parse/Pidl.pm				\
-	pidl/lib/Parse/Pidl/CUtil.pm			\
-	pidl/lib/Parse/Pidl/Compat.pm			\
-	pidl/lib/Parse/Pidl/Dump.pm			\
-	pidl/lib/Parse/Pidl/Expr.pm			\
-	pidl/lib/Parse/Pidl/IDL.pm			\
-	pidl/lib/Parse/Pidl/NDR.pm			\
-	pidl/lib/Parse/Pidl/ODL.pm			\
-	pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm		\
-	pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm		\
-	pidl/lib/Parse/Pidl/Samba4.pm			\
-	pidl/lib/Parse/Pidl/Samba4/COM/Header.pm	\
-	pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm		\
-	pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm		\
-	pidl/lib/Parse/Pidl/Samba4/Header.pm		\
-	pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm	\
-	pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	\
-	pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm	\
-	pidl/lib/Parse/Pidl/Samba4/Python.pm		\
-	pidl/lib/Parse/Pidl/Samba4/TDR.pm		\
-	pidl/lib/Parse/Pidl/Samba4/Template.pm		\
-	pidl/lib/Parse/Pidl/Typelist.pm			\
-	pidl/lib/Parse/Pidl/Util.pm			\
-	pidl/lib/Parse/Pidl/Wireshark/Conformance.pm	\
-	pidl/lib/Parse/Pidl/Wireshark/NDR.pm		\
-	pidl/lib/Parse/Yapp/Driver.pm			\
-	pidl/lib/wscript_build				\
-	pidl/pidl					\
-	pidl/tests/Util.pm				\
-	pidl/tests/cutil.pl				\
-	pidl/tests/dump.pl				\
-	pidl/tests/header.pl				\
-	pidl/tests/ndr.pl				\
-	pidl/tests/ndr_align.pl				\
-	pidl/tests/ndr_alloc.pl				\
-	pidl/tests/ndr_array.pl				\
-	pidl/tests/ndr_compat.pl			\
-	pidl/tests/ndr_deprecations.pl			\
-	pidl/tests/ndr_fullptr.pl			\
-	pidl/tests/ndr_refptr.pl			\
-	pidl/tests/ndr_represent.pl			\
-	pidl/tests/ndr_simple.pl			\
-	pidl/tests/ndr_string.pl			\
-	pidl/tests/ndr_tagtype.pl			\
-	pidl/tests/parse_idl.pl				\
-	pidl/tests/samba-ndr.pl				\
-	pidl/tests/samba3-cli.pl			\
-	pidl/tests/samba3-srv.pl			\
-	pidl/tests/tdr.pl				\
-	pidl/tests/test_util.pl				\
-	pidl/tests/typelist.pl				\
-	pidl/tests/util.pl				\
-	pidl/tests/wireshark-conf.pl			\
-	pidl/tests/wireshark-ndr.pl			\
-	pidl/wscript
-
 EXTRA_DIST = \
-	$(PIDL_FILES)					\
 	asn2deb						\
 	asn2wrs.py					\
 	checkfiltername.pl				\
@@ -101,36 +36,11 @@ EXTRA_DIST = \
 	convert-proto-tree-new.awk			\
 	convert_expert_add_info_format.pl		\
 	convert_proto_tree_add_text.pl			\
-	cppcheck/cppcheck.sh				\
-	cppcheck/includes				\
-	cppcheck/suppressions				\
+	cppcheck					\
 	debian-setup.sh					\
 	dfilter-test.py					\
-	dftestfiles/arp.pcap				\
-	dftestfiles/http.pcap				\
-	dftestfiles/ipv6.pcap				\
-	dftestfiles/ipx_rip.pcap			\
-	dftestfiles/nfs.pcap				\
-	dftestfiles/ntp.pcap				\
-	dftestfiles/tftp.pcap				\
-	dftestlib/__init__.py				\
-	dftestlib/bytes_ether.py			\
-	dftestlib/bytes_ipv6.py				\
-	dftestlib/bytes_type.py				\
-	dftestlib/dftest.py				\
-	dftestlib/double.py				\
-	dftestlib/integer.py				\
-	dftestlib/integer_1byte.py			\
-	dftestlib/ipv4.py				\
-	dftestlib/range_method.py			\
-	dftestlib/scanner.py				\
-	dftestlib/string_type.py			\
-	dftestlib/stringz.py				\
-	dftestlib/time_relative.py			\
-	dftestlib/time_type.py				\
-	dftestlib/tvb.py				\
-	dftestlib/uint64.py				\
-	dftestlib/util.py				\
+	dftestfiles					\
+	dftestlib					\
 	extract_asn1_from_spec.pl			\
 	fix-encoding-args.pl				\
 	fixhf.pl					\
@@ -162,11 +72,9 @@ EXTRA_DIST = \
 	native-nmake.cmd				\
 	ncp2222.py					\
 	netscreen2dump.py				\
-	npl/ast.h					\
-	npl/npl.c					\
-	npl/parser.l					\
-	npl/xmem.h					\
+	npl						\
 	parse_xml2skinny_dissector.py			\
+	pidl						\
 	pkt-from-core.py				\
 	pre-commit					\
 	pre-commit-ignore.conf				\
@@ -181,11 +89,7 @@ EXTRA_DIST = \
 	test-common.sh					\
 	test-captures.sh				\
 	textify.ps1					\
-	tpg/Makefile.am					\
-	tpg/Makefile.nmake				\
-	tpg/V2P.pm					\
-	tpg/tpg.pl					\
-	tpg/tpg.yp					\
+	tpg						\
 	usb-ptp-extract-models.pl			\
 	usb-ptp-extract-models.txt			\
 	valgrind-wireshark.sh				\
diff --git a/ui/Makefile.am b/ui/Makefile.am
index bd7a7334f7..61446b5cd7 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -84,4 +84,5 @@ EXTRA_DIST = \
 	CMakeLists.txt			\
 	doxygen.cfg.in			\
 	Makefile.common			\
-	Makefile.nmake
+	Makefile.nmake			\
+	win32
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 3e420aa377..e30efcfbbe 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -59,6 +59,7 @@ EXTRA_DIST = \
 	README.developer	\
 	Makefile.common		\
 	Makefile.nmake		\
+	CMakeLists.txt		\
 	$(GENERATOR_FILES) 	\
 	$(GENERATED_FILES)