Remove Makefile.common files

Now that nmake build system has been removed they are not needed anymore.

Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
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>

8 files changed, 1105 insertions, 1208 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index befc051784..91f189bd05 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -20,7 +20,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DDOC_DIR=\"$(docdir)\" \
@@ -28,35 +27,151 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DDOC_DIR=\"$(docdir)\" \
 
 noinst_LIBRARIES = libui.a libui_dirty.a
 
-BUILT_SOURCES = $(GENERATED_HEADER_FILES)
+# Generated header files that we want in the distribution.
+GENERATED_HEADER_FILES = \
+	text_import_scanner_lex.h
 
-CLEANFILES = \
-	doxygen-ui.tag	\
-	libui.a		\
-	libui_dirty.a	\
-	*~
+# Generated C source files that we want in the distribution.
+GENERATED_C_FILES =
 
-MAINTAINERCLEANFILES = \
-	$(GENERATED_FILES)	\
-	Makefile.in
+DIRTY_GENERATED_C_FILES = \
+	text_import_scanner.c
 
-text_import_scanner_lex.h: text_import_scanner.c
+# All the generated files we want in the distribution.
+GENERATED_FILES = \
+	$(GENERATED_HEADER_FILES) \
+	$(GENERATED_C_FILES) \
+	$(DIRTY_GENERATED_C_FILES)
+
+# Files that generate compileable files
+GENERATOR_FILES = \
+	text_import_scanner.l
+
+WIRESHARK_UI_SRC = \
+	alert_box.c		\
+	capture.c		\
+	capture_ui_utils.c	\
+	commandline.c		\
+	console.c		\
+	decode_as_utils.c	\
+	export_object.c		\
+	export_object_dicom.c	\
+	export_object_http.c	\
+	export_object_smb.c	\
+	export_object_tftp.c	\
+	export_pdu_ui_utils.c	\
+	firewall_rules.c	\
+	iface_lists.c		\
+	io_graph_item.c		\
+	language.c		\
+	help_url.c		\
+	mcast_stream.c		\
+	packet_list_utils.c	\
+	persfilepath_opt.c	\
+	preference_utils.c	\
+	profile.c		\
+	proto_hier_stats.c	\
+	recent.c		\
+	rtp_media.c		\
+	rtp_stream.c		\
+	service_response_time.c	\
+	software_update.c	\
+	ssl_key_export.c	\
+	tap_export_pdu.c	\
+	tap-iax2-analysis.c	\
+	tap-rlc-graph.c		\
+	tap-rtp-common.c	\
+	tap-sctp-analysis.c	\
+	tap-sequence-analysis.c	\
+	tap-tcp-stream.c	\
+	text_import.c		\
+	time_shift.c		\
+	traffic_table_ui.c	\
+	util.c			\
+	voip_calls.c
+
+WIRESHARK_UI_INCLUDES = \
+	alert_box.h		\
+	all_files_wildcard.h	\
+	capture.h		\
+	capture_globals.h	\
+	capture_ui_utils.h	\
+	commandline.h		\
+	console.h		\
+	decode_as_utils.h	\
+	export_object.h		\
+	export_pdu_ui_utils.h	\
+	last_open_dir.h		\
+	file_dialog.h		\
+	help_url.h		\
+	packet_list_utils.h	\
+	firewall_rules.h	\
+	iface_lists.h		\
+	io_graph_item.h		\
+	language.h		\
+	mcast_stream.h		\
+	main_statusbar.h	\
+	persfilepath_opt.h	\
+	preference_utils.h	\
+	profile.h		\
+	progress_dlg.h		\
+	proto_hier_stats.h	\
+	recent.h		\
+	recent_utils.h		\
+	rtp_media.h		\
+	rtp_stream.h		\
+	service_response_time.h	\
+	simple_dialog.h		\
+	software_update.h	\
+	ssl_key_export.h	\
+	tap_export_pdu.h	\
+	tap-iax2-analysis.h	\
+	tap-rlc-graph.h		\
+	tap-rtp-analysis.h	\
+	tap-rtp-common.h	\
+	tap-sctp-analysis.h	\
+	tap-sequence-analysis.h	\
+	tap-tcp-stream.h	\
+	text_import.h		\
+	text_import_scanner.h	\
+	time_shift.h		\
+	traffic_table_ui.h	\
+	ui_util.h		\
+	util.h			\
+	voip_calls.h
 
 # All sources that should be put in the source distribution tarball
 libui_a_SOURCES = \
 	$(WIRESHARK_UI_SRC) \
-	$(noinst_HEADERS) \
+	$(WIRESHARK_UI_INCLUDES) \
 	$(GENERATED_HEADER_FILES) \
 	$(GENERATED_C_FILES)
 
-libui_a_DEPENDENCIES =
-
 libui_dirty_a_SOURCES = \
 	$(DIRTY_GENERATED_C_FILES)
 
 libui_dirty_a_CFLAGS = $(GENERATED_CFLAGS)
 
-libui_dirty_a_DEPENDENCIES =
+EXTRA_DIST = \
+	.editorconfig			\
+	$(GENERATOR_FILES)		\
+	CMakeLists.txt			\
+	doxygen.cfg.in			\
+	win32
+
+BUILT_SOURCES = $(GENERATED_HEADER_FILES)
+
+CLEANFILES = \
+	doxygen-ui.tag	\
+	libui.a		\
+	libui_dirty.a	\
+	*~
+
+MAINTAINERCLEANFILES = \
+	$(GENERATED_FILES)	\
+	Makefile.in
+
+text_import_scanner_lex.h: text_import_scanner.c
 
 doxygen:
 if HAVE_DOXYGEN
@@ -79,11 +194,3 @@ checkapi-todo:
 	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
 	-sourcedir=$(srcdir) \
 	$(WIRESHARK_UI_SRC)
-
-EXTRA_DIST = \
-	.editorconfig			\
-	$(GENERATOR_FILES)		\
-	CMakeLists.txt			\
-	doxygen.cfg.in			\
-	Makefile.common			\
-	win32
diff --git a/ui/Makefile.common b/ui/Makefile.common
deleted file mode 100644
index 2156fd2659..0000000000
--- a/ui/Makefile.common
+++ /dev/null
@@ -1,135 +0,0 @@
-# Makefile.common
-#     Contains the stuff from Makefile.am and Makefile.nmake that is
-#     a) common to both files and
-#     b) portable between both files
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Generated header files that we want in the distribution.
-GENERATED_HEADER_FILES = \
-	text_import_scanner_lex.h
-
-# Generated C source files that we want in the distribution.
-GENERATED_C_FILES =
-
-DIRTY_GENERATED_C_FILES = \
-	text_import_scanner.c
-
-# All the generated files we want in the distribution.
-GENERATED_FILES = \
-	$(GENERATED_HEADER_FILES) \
-	$(GENERATED_C_FILES) \
-	$(DIRTY_GENERATED_C_FILES)
-
-# Files that generate compileable files
-GENERATOR_FILES = \
-	text_import_scanner.l
-
-WIRESHARK_UI_SRC = \
-	alert_box.c		\
-	capture.c		\
-	capture_ui_utils.c	\
-	commandline.c	\
-	console.c		\
-	decode_as_utils.c	\
-	export_object.c		\
-	export_object_dicom.c	\
-	export_object_http.c	\
-	export_object_smb.c	\
-	export_object_tftp.c	\
-	export_pdu_ui_utils.c	\
-	firewall_rules.c	\
-	iface_lists.c		\
-	io_graph_item.c		\
-	language.c		\
-	help_url.c		\
-	mcast_stream.c		\
-	packet_list_utils.c	\
-	persfilepath_opt.c	\
-	preference_utils.c	\
-	profile.c		\
-	proto_hier_stats.c	\
-	recent.c		\
-	rtp_media.c		\
-	rtp_stream.c		\
-	service_response_time.c	\
-	software_update.c	\
-	ssl_key_export.c	\
-	tap_export_pdu.c	\
-	tap-iax2-analysis.c	\
-	tap-rlc-graph.c	\
-	tap-rtp-common.c	\
-	tap-sctp-analysis.c \
-	tap-sequence-analysis.c	\
-	tap-tcp-stream.c	\
-	text_import.c		\
-	time_shift.c		\
-	traffic_table_ui.c	\
-	util.c			\
-	voip_calls.c
-
-noinst_HEADERS = \
-	alert_box.h		\
-	all_files_wildcard.h	\
-	capture.h		\
-	capture_globals.h	\
-	capture_ui_utils.h	\
-	commandline.h	\
-	console.h		\
-	decode_as_utils.h	\
-	export_object.h		\
-	export_pdu_ui_utils.h	\
-	last_open_dir.h		\
-	file_dialog.h		\
-	help_url.h		\
-	packet_list_utils.h	\
-	firewall_rules.h	\
-	iface_lists.h		\
-	io_graph_item.h		\
-	language.h		\
-	mcast_stream.h		\
-	main_statusbar.h	\
-	persfilepath_opt.h	\
-	preference_utils.h	\
-	profile.h		\
-	progress_dlg.h		\
-	proto_hier_stats.h	\
-	recent.h		\
-	recent_utils.h		\
-	rtp_media.h		\
-	rtp_stream.h		\
-	service_response_time.h	\
-	simple_dialog.h		\
-	software_update.h	\
-	ssl_key_export.h	\
-	tap_export_pdu.h	\
-	tap-iax2-analysis.h	\
-	tap-rlc-graph.h	\
-	tap-rtp-analysis.h	\
-	tap-rtp-common.h	\
-	tap-sctp-analysis.h  \
-	tap-sequence-analysis.h	\
-	tap-tcp-stream.h	\
-	text_import.h		\
-	text_import_scanner.h	\
-	time_shift.h		\
-	traffic_table_ui.h	\
-	ui_util.h		\
-	util.h			\
-	voip_calls.h
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index 8140d3850b..e5414985e4 100644
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -19,7 +19,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) \
@@ -27,6 +26,70 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) \
 
 noinst_LIBRARIES = libcliui.a
 
+# Generated header files that we want in the distribution.
+GENERATED_HEADER_FILES =
+
+# Generated C source files that we want in the distribution.
+GENERATED_C_FILES = \
+	tshark-tap-register.c
+
+# All the generated files.
+GENERATED_FILES = \
+	$(GENERATED_HEADER_FILES) \
+	$(GENERATED_C_FILES)
+
+# Files that generate compileable files
+GENERATOR_FILES =
+
+# sources for TShark taps
+TSHARK_TAP_SRC = \
+	tap-camelsrt.c		\
+	tap-comparestat.c	\
+	tap-diameter-avp.c	\
+	tap-endpoints.c		\
+	tap-expert.c		\
+	tap-follow.c		\
+	tap-funnel.c		\
+	tap-gsm_astat.c		\
+	tap-hosts.c		\
+	tap-httpstat.c		\
+	tap-icmpstat.c		\
+	tap-icmpv6stat.c	\
+	tap-iostat.c		\
+	tap-iousers.c		\
+	tap-macltestat.c	\
+	tap-protocolinfo.c	\
+	tap-protohierstat.c	\
+	tap-rlcltestat.c	\
+	tap-rpcprogs.c		\
+	tap-rtd.c		\
+	tap-rtp.c		\
+	tap-rtspstat.c		\
+	tap-sctpchunkstat.c	\
+	tap-simple_stattable.c	\
+	tap-sipstat.c		\
+	tap-smbsids.c		\
+	tap-srt.c		\
+	tap-stats_tree.c	\
+	tap-sv.c		\
+	tap-wspstat.c
+
+noinst_HEADERS = \
+	tshark-tap.h
+
+# All sources that should be put in the source distribution tarball
+libcliui_a_SOURCES = \
+	$(TSHARK_TAP_SRC) \
+	$(noinst_HEADERS) \
+	$(GENERATED_HEADER_FILES) \
+	$(GENERATED_C_FILES)
+
+libcliui_a_DEPENDENCIES =
+
+EXTRA_DIST = \
+	.editorconfig		\
+	$(GENERATOR_FILES)
+
 CLEANFILES = \
 	libcliui.a			\
 	tshark-tap-register.c-tmp	\
@@ -51,19 +114,10 @@ MAINTAINERCLEANFILES = \
 # The first argument is the directory in which the source files live.
 # All subsequent arguments are the files to scan.
 #
-tshark-tap-register.c: $(TSHARK_TAP_SRC) Makefile.common $(top_srcdir)/tools/make-tap-reg.py
+tshark-tap-register.c: $(TSHARK_TAP_SRC) $(top_srcdir)/tools/make-tap-reg.py
 	@echo Making tshark-tap-register.c
 	@$(PYTHON) $(top_srcdir)/tools/make-tap-reg.py $(srcdir) tshark-taps $(TSHARK_TAP_SRC)
 
-# All sources that should be put in the source distribution tarball
-libcliui_a_SOURCES = \
-	$(TSHARK_TAP_SRC) \
-	$(noinst_HEADERS) \
-	$(GENERATED_HEADER_FILES) \
-	$(GENERATED_C_FILES)
-
-libcliui_a_DEPENDENCIES =
-
 doxygen:
 if HAVE_DOXYGEN
 	$(DOXYGEN) doxygen.cfg
@@ -72,8 +126,3 @@ endif		# HAVE_DOXYGEN
 checkapi:
 	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -build \
 	-sourcedir=$(srcdir) $(TSHARK_TAP_SRC)
-
-EXTRA_DIST = \
-	.editorconfig		\
-	$(GENERATOR_FILES)	\
-	Makefile.common
diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common
deleted file mode 100644
index cdaa354f1e..0000000000
--- a/ui/cli/Makefile.common
+++ /dev/null
@@ -1,73 +0,0 @@
-# Makefile.common
-#     Contains the stuff from Makefile.am and Makefile.nmake that is
-#     a) common to both files and
-#     b) portable between both files
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Generated header files that we want in the distribution.
-GENERATED_HEADER_FILES =
-
-# Generated C source files that we want in the distribution.
-GENERATED_C_FILES = \
-	tshark-tap-register.c
-
-# All the generated files.
-GENERATED_FILES = \
-	$(GENERATED_HEADER_FILES) \
-	$(GENERATED_C_FILES)
-
-# Files that generate compileable files
-GENERATOR_FILES =
-
-# sources for TShark taps
-TSHARK_TAP_SRC = \
-	tap-camelsrt.c		\
-	tap-comparestat.c	\
-	tap-diameter-avp.c	\
-	tap-endpoints.c		\
-	tap-expert.c		\
-	tap-follow.c		\
-	tap-funnel.c		\
-	tap-gsm_astat.c		\
-	tap-hosts.c		\
-	tap-httpstat.c		\
-	tap-icmpstat.c		\
-	tap-icmpv6stat.c	\
-	tap-iostat.c		\
-	tap-iousers.c		\
-	tap-macltestat.c	\
-	tap-protocolinfo.c	\
-	tap-protohierstat.c	\
-	tap-rlcltestat.c	\
-	tap-rpcprogs.c		\
-	tap-rtd.c			\
-	tap-rtp.c		\
-	tap-rtspstat.c		\
-	tap-sctpchunkstat.c	\
-	tap-simple_stattable.c		\
-	tap-sipstat.c		\
-	tap-smbsids.c		\
-	tap-srt.c			\
-	tap-stats_tree.c	\
-	tap-sv.c		\
-	tap-wspstat.c
-
-noinst_HEADERS = \
-	tshark-tap.h
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index c9c8b071e6..e194342ab8 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -19,8 +19,241 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
+include Makefile_custom.common
+
+# Generated C source files that we want in the distribution.
+GENERATED_FILES = \
+	wireshark-tap-register.c
+
+# Generated C source files that we don't want in the distribution.
+NODIST_GENERATED_FILES =
+
+# Files that generate compileable files
+GENERATOR_FILES = \
+	main.gresources.xml
+
+WIRESHARK_COMMON_GTK_SRC = \
+	about_dlg.c		\
+	addr_resolution_dlg.c	\
+	bytes_view.c		\
+	capture_dlg.c		\
+	capture_file_dlg.c	\
+	capture_if_dlg.c	\
+	capture_info_dlg.c	\
+	color_dlg.c		\
+	color_edit_dlg.c	\
+	color_utils.c		\
+	conversation_hastables_dlg.c \
+	conversations_table.c	\
+	decode_as_dlg.c		\
+	dfilter_expr_dlg.c	\
+	dissector_tables_dlg.c	\
+	dlg_utils.c		\
+	drag_and_drop.c 	\
+	edit_packet_comment_dlg.c \
+	expert_comp_table.c	\
+	export_object_dlg.c	\
+	export_sslkeys.c	\
+	filter_autocomplete.c	\
+	file_dlg.c		\
+	file_import_dlg.c	\
+	fileset_dlg.c		\
+	filter_dlg.c		\
+	filter_expression_save_dlg.c \
+	filter_utils.c		\
+	find_dlg.c		\
+	firewall_dlg.c		\
+	follow_stream.c		\
+	font_utils.c		\
+	goto_dlg.c		\
+	graph_analysis.c 	\
+	gtk_iface_monitor.c	\
+	gui_stat_util.c		\
+	gui_utils.c		\
+	help_dlg.c		\
+	hostlist_table.c	\
+	macros_dlg.c		\
+	main.c			\
+	main_80211_toolbar.c	\
+	main_filter_toolbar.c	\
+	main_menubar.c		\
+	manual_addr_resolv.c	\
+	packet_panes.c		\
+	main_statusbar.c	\
+	main_titlebar.c		\
+	main_toolbar.c		\
+	main_welcome.c		\
+	packet_history.c	\
+	packet_list_store.c	\
+	packet_list.c		\
+	packet_win.c		\
+	pixmap_save.c		\
+	plugins_dlg.c		\
+	prefs_capture.c		\
+	prefs_column.c		\
+	prefs_dlg.c		\
+	prefs_filter_expressions.c \
+	prefs_gui.c		\
+	prefs_layout.c		\
+	prefs_font_color.c	\
+	print_dlg.c		\
+	profile_dlg.c		\
+	progress_dlg.c		\
+	proto_dlg.c		\
+	proto_help.c		\
+	proto_hier_stats_dlg.c	\
+	proto_hier_tree_model.c	\
+	proto_tree_model.c	\
+	range_utils.c		\
+	response_time_delay_table.c \
+	rtp_player.c		\
+	sctp_byte_graph_dlg.c	\
+	sctp_error_dlg.c	\
+	sctp_graph_dlg.c	\
+	service_response_time_table.c \
+	simple_dialog.c		\
+	simple_stattable.c	\
+	stock_icons.c		\
+	summary_dlg.c		\
+	supported_protos_dlg.c	\
+	tap_param_dlg.c		\
+	text_page_utils.c	\
+	time_shift_dlg.c	\
+	uat_gui.c		\
+	webbrowser.c		\
+	$(WIRESHARK_CUSTOM_GTK_SRC)
+
+WIRESHARK_TAP_SRC = \
+	compare_stat.c		\
+	dcerpc_stat.c		\
+	expert_comp_dlg.c	\
+	export_pdu_dlg.c	\
+	flow_graph.c		\
+	funnel_stat.c		\
+	gsm_map_summary.c	\
+	iax2_analysis.c		\
+	io_stat.c		\
+	lbm_stream_dlg.c	\
+	lbm_uimflow_dlg.c	\
+	mac_lte_stat_dlg.c	\
+	mcast_stream_dlg.c	\
+	mtp3_summary.c		\
+	rlc_lte_graph.c		\
+	rlc_lte_stat_dlg.c	\
+	rpc_stat.c		\
+	rtp_analysis.c		\
+	rtp_stream_dlg.c	\
+	sctp_assoc_analyse.c	\
+	sctp_chunk_stat.c	\
+	sctp_chunk_stat_dlg.c	\
+	sctp_stat_dlg.c		\
+	stats_tree_stat.c	\
+	tcp_graph.c		\
+	voip_calls_dlg.c	\
+	wlan_stat_dlg.c		\
+	$(WIRESHARK_CUSTOM_TAP_SRC)
+
+WIRESHARK_COMMON_GTK_HDRS = \
+	about_dlg.h		\
+	addr_resolution_dlg.h	\
+	bytes_view.h		\
+	capture_dlg.h		\
+	capture_file_dlg.h	\
+	capture_if_dlg.h	\
+	cfilter_combo_utils.h	\
+	color_dlg.h		\
+	color_edit_dlg.h	\
+	color_utils.h		\
+	conversation_hastables_dlg.h \
+	conversations_table.h	\
+	decode_as_dlg.h		\
+	dfilter_expr_dlg.h	\
+	dissector_tables_dlg.h	\
+	dlg_utils.h		\
+	drag_and_drop.h		\
+	edit_packet_comment_dlg.h \
+	expert_comp_dlg.h	\
+	expert_comp_table.h	\
+	export_object_dlg.h	\
+	export_pdu_dlg.h	\
+	export_sslkeys.h	\
+	file_dlg.h		\
+	file_import_dlg.h	\
+	fileset_dlg.h		\
+	filter_autocomplete.h	\
+	filter_dlg.h		\
+	filter_expression_save_dlg.h \
+	filter_utils.h		\
+	find_dlg.h		\
+	firewall_dlg.h		\
+	follow_stream.h		\
+	font_utils.h		\
+	goto_dlg.h		\
+	graph_analysis.h	\
+	gtk_iface_monitor.h	\
+	gtkglobals.h		\
+	gui_stat_menu.h		\
+	gui_stat_util.h		\
+	gui_utils.h		\
+	help_dlg.h		\
+	hostlist_table.h	\
+	keys.h			\
+	lbm_stream_dlg.h	\
+	lbm_uimflow_dlg.h	\
+	macros_dlg.h		\
+	main.h			\
+	main_filter_toolbar.h	\
+	main_menubar_private.h	\
+	main_80211_toolbar.h	\
+	menus.h			\
+	packet_panes.h		\
+	main_statusbar_private.h \
+	main_titlebar.h		\
+	main_toolbar.h		\
+	main_toolbar_private.h	\
+	main_welcome.h		\
+	main_welcome_private.h	\
+	manual_addr_resolv.h	\
+	mcast_stream_dlg.h	\
+	old-gtk-compat.h	\
+	packet_history.h	\
+	packet_list_store.h	\
+	packet_list.h		\
+	packet_win.h		\
+	pixmap_save.h		\
+	plugins_dlg.h		\
+	prefs_capture.h		\
+	prefs_column.h		\
+	prefs_dlg.h		\
+	prefs_filter_expressions.h \
+	prefs_gui.h		\
+	prefs_layout.h		\
+	prefs_font_color.h	\
+	profile_dlg.h		\
+	proto_dlg.h		\
+	proto_help.h		\
+	proto_hier_stats_dlg.h	\
+	proto_hier_tree_model.h	\
+	proto_tree_model.h	\
+	range_utils.h		\
+	response_time_delay_table.h \
+	rtp_player.h		\
+	rtp_stream_dlg.h	\
+	sctp_stat_gtk.h		\
+	service_response_time_table.h \
+	simple_stattable.h	\
+	time_shift_dlg.h	\
+	simple_dialog.h		\
+	stock_icons.h		\
+	summary_dlg.h		\
+	supported_protos_dlg.h	\
+	tap_param_dlg.h		\
+	text_page_utils.h	\
+	uat_gui.h		\
+	voip_calls_dlg.h	\
+	webbrowser.h		\
+	$(WIRESHARK_CUSTOM_HDRS)
 
 if HAVE_GRESOURCE_PIXBUF
 NODIST_GENERATED_FILES += \
@@ -66,7 +299,6 @@ EXTRA_DIST = \
 	doxygen.cfg.in			\
 	main_airpcap_toolbar.c		\
 	main_airpcap_toolbar.h		\
-	Makefile.common			\
 	Makefile_custom.common		\
 	pixbuf-csource.c		\
 	pixbuf-csource.h
@@ -103,7 +335,7 @@ libgtkui_a_DEPENDENCIES =
 # The first argument is the directory in which the source files live.
 # All subsequent arguments are the files to scan.
 #
-wireshark-tap-register.c:  $(WIRESHARK_TAP_SRC) Makefile.common Makefile_custom.common $(top_srcdir)/tools/make-tap-reg.py
+wireshark-tap-register.c:  $(WIRESHARK_TAP_SRC) Makefile_custom.common $(top_srcdir)/tools/make-tap-reg.py
 	@echo Making wireshark-tap-register.c
 	@$(PYTHON) $(top_srcdir)/tools/make-tap-reg.py $(srcdir) taps $(WIRESHARK_TAP_SRC)
 
@@ -115,6 +347,109 @@ wireshark-gresources.h: main.gresources.xml
 	@echo Making $@
 	@glib-compile-resources --sourcedir=$(top_srcdir) --target=$@ --generate --manual-register $<
 
+imagedir = $(top_srcdir)/image
+
+pixbuf_csource_data = \
+	expert_chat_pb_data				\
+	$(imagedir)/toolbar/14x14/x-expert-chat.png	\
+	expert_error_pb_data				\
+	$(imagedir)/toolbar/14x14/x-expert-error.png	\
+	expert_none_pb_data				\
+	$(imagedir)/toolbar/14x14/x-expert-none.png	\
+	expert_note_pb_data				\
+	$(imagedir)/toolbar/14x14/x-expert-note.png	\
+	expert_warn_pb_data				\
+	$(imagedir)/toolbar/14x14/x-expert-warn.png	\
+	expert_ok_pb_data				\
+	$(imagedir)/expert_ok.png			\
+	capture_comment_add_pb_data			\
+	$(imagedir)/capture_comment_add.png		\
+	capture_comment_update_pb_data			\
+	$(imagedir)/capture_comment_update.png		\
+	capture_comment_disabled_pb_data		\
+	$(imagedir)/capture_comment_disabled.png	\
+	network_bluetooth_pb_data			\
+	$(imagedir)/toolbar/network_bluetooth_16.png	\
+	network_usb_pb_data				\
+	$(imagedir)/toolbar/network_usb_16.png		\
+	network_wired_pb_data				\
+	$(imagedir)/toolbar/network_wired_16.png	\
+	network_wireless_pb_data			\
+	$(imagedir)/toolbar/network_wireless_16.png	\
+	remote_arrow_pb_data				\
+	$(imagedir)/toolbar/remote_arrow_16.png		\
+	remote_globe_pb_data				\
+	$(imagedir)/toolbar/remote_globe_16.png		\
+	remote_sat_pb_data				\
+	$(imagedir)/toolbar/remote_sat_16.png		\
+	pipe_pb_data					\
+	$(imagedir)/toolbar/pipe_16.png			\
+	capture_interfaces_16_pb_data			\
+	$(imagedir)/toolbar/capture_interfaces_16.png	\
+	capture_interfaces_24_pb_data			\
+	$(imagedir)/toolbar/capture_interfaces_24.png	\
+	gnome_emblem_web_16_pb_data			\
+	$(imagedir)/toolbar/gnome_emblem_web_16.png	\
+	gnome_emblem_web_24_pb_data			\
+	$(imagedir)/toolbar/gnome_emblem_web_24.png	\
+	toolbar_wireshark_file_16_pb_data		\
+	$(imagedir)/toolbar/16x16/x-capture-file-save.png \
+	toolbar_wireshark_file_24_pb_data		\
+	$(imagedir)/toolbar/24x24/x-capture-file-save.png \
+	capture_options_alt1_16_pb_data			\
+	$(imagedir)/toolbar/16x16/x-capture-options.png \
+	capture_options_alt1_24_pb_data			\
+	$(imagedir)/toolbar/24x24/x-capture-options.png \
+	capture_restart_16_pb_data			\
+	$(imagedir)/toolbar/16x16/x-capture-restart.png \
+	capture_restart_24_pb_data			\
+	$(imagedir)/toolbar/24x24/x-capture-restart.png \
+	capture_start_16_pb_data			\
+	$(imagedir)/toolbar/16x16/x-capture-start.png	\
+	capture_start_24_pb_data			\
+	$(imagedir)/toolbar/24x24/x-capture-start.png	\
+	capture_stop_16_pb_data				\
+	$(imagedir)/toolbar/16x16/x-capture-stop.png	\
+	capture_stop_24_pb_data				\
+	$(imagedir)/toolbar/24x24/x-capture-stop.png	\
+	layout_1_pb_data 				\
+	$(imagedir)/layout_1.png			\
+	layout_2_pb_data				\
+	$(imagedir)/layout_2.png			\
+	layout_3_pb_data				\
+	$(imagedir)/layout_3.png			\
+	layout_4_pb_data				\
+	$(imagedir)/layout_4.png			\
+	layout_5_pb_data				\
+	$(imagedir)/layout_5.png			\
+	layout_6_pb_data				\
+	$(imagedir)/layout_6.png			\
+	wsicon_16_pb_data				\
+	$(imagedir)/wsicon16.png			\
+	wsicon_24_pb_data				\
+	$(imagedir)/wsicon24.png			\
+	wsicon_32_pb_data				\
+	$(imagedir)/wsicon32.png			\
+	wsicon_48_pb_data				\
+	$(imagedir)/wsicon48.png			\
+	wsicon_64_pb_data				\
+	$(imagedir)/wsicon64.png			\
+	wsiconcap_16_pb_data				\
+	$(imagedir)/wsiconcap16.png			\
+	wsiconcap_24_pb_data				\
+	$(imagedir)/wsiconcap24.png			\
+	wsiconcap_32_pb_data				\
+	$(imagedir)/wsiconcap32.png			\
+	wsiconcap_48_pb_data				\
+	$(imagedir)/wsiconcap48.png			\
+	wsiconcap_64_pb_data				\
+	$(imagedir)/wsiconcap64.png			\
+	wssplash_pb_data				\
+	$(imagedir)/wssplash_dev.png
+
+pixbuf-csource:
+	$(PERL) $(top_srcdir)/tools/make-pixbuf-csource.pl $@ $(pixbuf_csource_data)
+
 doxygen:
 if HAVE_DOXYGEN
 	$(DOXYGEN) doxygen.cfg
diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
deleted file mode 100644
index 248b249f3e..0000000000
--- a/ui/gtk/Makefile.common
+++ /dev/null
@@ -1,361 +0,0 @@
-# Makefile.common
-#     Contains the stuff from Makefile.am and Makefile.nmake that is
-#     a) common to both files and
-#     b) portable between both files
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-include Makefile_custom.common
-
-# Generated C source files that we want in the distribution.
-GENERATED_FILES = \
-	wireshark-tap-register.c
-
-# Generated C source files that we don't want in the distribution.
-NODIST_GENERATED_FILES =
-
-# Files that generate compileable files
-GENERATOR_FILES = \
-	main.gresources.xml
-
-WIRESHARK_COMMON_GTK_SRC = \
-	about_dlg.c		\
-	addr_resolution_dlg.c	\
-	bytes_view.c		\
-	capture_dlg.c		\
-	capture_file_dlg.c	\
-	capture_if_dlg.c	\
-	capture_info_dlg.c	\
-	color_dlg.c		\
-	color_edit_dlg.c	\
-	color_utils.c		\
-	conversation_hastables_dlg.c \
-	conversations_table.c	\
-	decode_as_dlg.c		\
-	dfilter_expr_dlg.c	\
-	dissector_tables_dlg.c	\
-	dlg_utils.c		\
-	drag_and_drop.c 	\
-	edit_packet_comment_dlg.c \
-	expert_comp_table.c	\
-	export_object_dlg.c	\
-	export_sslkeys.c	\
-	filter_autocomplete.c	\
-	file_dlg.c		\
-	file_import_dlg.c	\
-	fileset_dlg.c		\
-	filter_dlg.c		\
-	filter_expression_save_dlg.c \
-	filter_utils.c		\
-	find_dlg.c		\
-	firewall_dlg.c		\
-	follow_stream.c		\
-	font_utils.c		\
-	goto_dlg.c		\
-	graph_analysis.c 	\
-	gtk_iface_monitor.c	\
-	gui_stat_util.c		\
-	gui_utils.c		\
-	help_dlg.c		\
-	hostlist_table.c	\
-	macros_dlg.c		\
-	main.c			\
-	main_80211_toolbar.c	\
-	main_filter_toolbar.c	\
-	main_menubar.c		\
-	manual_addr_resolv.c	\
-	packet_panes.c		\
-	main_statusbar.c	\
-	main_titlebar.c		\
-	main_toolbar.c		\
-	main_welcome.c		\
-	packet_history.c	\
-	packet_list_store.c	\
-	packet_list.c		\
-	packet_win.c		\
-	pixmap_save.c		\
-	plugins_dlg.c		\
-	prefs_capture.c		\
-	prefs_column.c		\
-	prefs_dlg.c		\
-	prefs_filter_expressions.c \
-	prefs_gui.c		\
-	prefs_layout.c		\
-	prefs_font_color.c	\
-	print_dlg.c		\
-	profile_dlg.c		\
-	progress_dlg.c		\
-	proto_dlg.c		\
-	proto_help.c		\
-	proto_hier_stats_dlg.c	\
-	proto_hier_tree_model.c	\
-	proto_tree_model.c	\
-	range_utils.c		\
-	response_time_delay_table.c \
-	rtp_player.c		\
-	sctp_byte_graph_dlg.c	\
-	sctp_error_dlg.c	\
-	sctp_graph_dlg.c	\
-	service_response_time_table.c \
-	simple_dialog.c		\
-	simple_stattable.c	\
-	stock_icons.c		\
-	summary_dlg.c		\
-	supported_protos_dlg.c	\
-	tap_param_dlg.c		\
-	text_page_utils.c	\
-	time_shift_dlg.c	\
-	uat_gui.c		\
-	webbrowser.c		\
-	$(WIRESHARK_CUSTOM_GTK_SRC)
-
-WIRESHARK_TAP_SRC = \
-	compare_stat.c		\
-	dcerpc_stat.c		\
-	expert_comp_dlg.c	\
-	export_pdu_dlg.c	\
-	flow_graph.c		\
-	funnel_stat.c		\
-	gsm_map_summary.c	\
-	iax2_analysis.c		\
-	io_stat.c		\
-	lbm_stream_dlg.c	\
-	lbm_uimflow_dlg.c	\
-	mac_lte_stat_dlg.c	\
-	mcast_stream_dlg.c	\
-	mtp3_summary.c		\
-	rlc_lte_graph.c		\
-	rlc_lte_stat_dlg.c	\
-	rpc_stat.c		\
-	rtp_analysis.c		\
-	rtp_stream_dlg.c	\
-	sctp_assoc_analyse.c	\
-	sctp_chunk_stat.c	\
-	sctp_chunk_stat_dlg.c	\
-	sctp_stat_dlg.c		\
-	stats_tree_stat.c	\
-	tcp_graph.c		\
-	voip_calls_dlg.c	\
-	wlan_stat_dlg.c		\
-	$(WIRESHARK_CUSTOM_TAP_SRC)
-
-WIRESHARK_COMMON_GTK_HDRS = \
-	about_dlg.h		\
-	addr_resolution_dlg.h	\
-	bytes_view.h		\
-	capture_dlg.h		\
-	capture_file_dlg.h	\
-	capture_if_dlg.h	\
-	cfilter_combo_utils.h	\
-	color_dlg.h		\
-	color_edit_dlg.h	\
-	color_utils.h		\
-	conversation_hastables_dlg.h \
-	conversations_table.h	\
-	decode_as_dlg.h		\
-	dfilter_expr_dlg.h	\
-	dissector_tables_dlg.h	\
-	dlg_utils.h		\
-	drag_and_drop.h		\
-	edit_packet_comment_dlg.h \
-	expert_comp_dlg.h	\
-	expert_comp_table.h	\
-	export_object_dlg.h	\
-	export_pdu_dlg.h	\
-	export_sslkeys.h	\
-	file_dlg.h		\
-	file_import_dlg.h	\
-	fileset_dlg.h		\
-	filter_autocomplete.h	\
-	filter_dlg.h		\
-	filter_expression_save_dlg.h \
-	filter_utils.h		\
-	find_dlg.h		\
-	firewall_dlg.h		\
-	follow_stream.h		\
-	font_utils.h		\
-	goto_dlg.h		\
-	graph_analysis.h	\
-	gtk_iface_monitor.h	\
-	gtkglobals.h		\
-	gui_stat_menu.h		\
-	gui_stat_util.h		\
-	gui_utils.h		\
-	help_dlg.h		\
-	hostlist_table.h	\
-	keys.h			\
-	lbm_stream_dlg.h	\
-	lbm_uimflow_dlg.h	\
-	macros_dlg.h		\
-	main.h			\
-	main_filter_toolbar.h	\
-	main_menubar_private.h	\
-	main_80211_toolbar.h	\
-	menus.h			\
-	packet_panes.h		\
-	main_statusbar_private.h \
-	main_titlebar.h		\
-	main_toolbar.h		\
-	main_toolbar_private.h	\
-	main_welcome.h		\
-	main_welcome_private.h	\
-	manual_addr_resolv.h	\
-	mcast_stream_dlg.h	\
-	old-gtk-compat.h	\
-	packet_history.h	\
-	packet_list_store.h	\
-	packet_list.h		\
-	packet_win.h		\
-	pixmap_save.h		\
-	plugins_dlg.h		\
-	prefs_capture.h		\
-	prefs_column.h		\
-	prefs_dlg.h		\
-	prefs_filter_expressions.h \
-	prefs_gui.h		\
-	prefs_layout.h		\
-	prefs_font_color.h	\
-	profile_dlg.h		\
-	proto_dlg.h		\
-	proto_help.h		\
-	proto_hier_stats_dlg.h	\
-	proto_hier_tree_model.h	\
-	proto_tree_model.h	\
-	range_utils.h		\
-	response_time_delay_table.h \
-	rtp_player.h		\
-	rtp_stream_dlg.h	\
-	sctp_stat_gtk.h		\
-	service_response_time_table.h \
-	simple_stattable.h	\
-	time_shift_dlg.h	\
-	simple_dialog.h		\
-	stock_icons.h		\
-	summary_dlg.h		\
-	supported_protos_dlg.h	\
-	tap_param_dlg.h		\
-	text_page_utils.h	\
-	uat_gui.h		\
-	voip_calls_dlg.h	\
-	webbrowser.h		\
-	$(WIRESHARK_CUSTOM_HDRS)
-
-imagedir = $(top_srcdir)/image
-
-pixbuf_csource_data = \
-	expert_chat_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-chat.png	\
-	expert_error_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-error.png	\
-	expert_none_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-none.png	\
-	expert_note_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-note.png	\
-	expert_warn_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-warn.png	\
-	expert_ok_pb_data				\
-	$(imagedir)/expert_ok.png			\
-	capture_comment_add_pb_data			\
-	$(imagedir)/capture_comment_add.png		\
-	capture_comment_update_pb_data			\
-	$(imagedir)/capture_comment_update.png		\
-	capture_comment_disabled_pb_data		\
-	$(imagedir)/capture_comment_disabled.png	\
-	network_bluetooth_pb_data			\
-	$(imagedir)/toolbar/network_bluetooth_16.png	\
-	network_usb_pb_data				\
-	$(imagedir)/toolbar/network_usb_16.png		\
-	network_wired_pb_data				\
-	$(imagedir)/toolbar/network_wired_16.png	\
-	network_wireless_pb_data			\
-	$(imagedir)/toolbar/network_wireless_16.png	\
-	remote_arrow_pb_data				\
-	$(imagedir)/toolbar/remote_arrow_16.png		\
-	remote_globe_pb_data				\
-	$(imagedir)/toolbar/remote_globe_16.png		\
-	remote_sat_pb_data				\
-	$(imagedir)/toolbar/remote_sat_16.png		\
-	pipe_pb_data					\
-	$(imagedir)/toolbar/pipe_16.png			\
-	capture_interfaces_16_pb_data			\
-	$(imagedir)/toolbar/capture_interfaces_16.png	\
-	capture_interfaces_24_pb_data			\
-	$(imagedir)/toolbar/capture_interfaces_24.png	\
-	gnome_emblem_web_16_pb_data			\
-	$(imagedir)/toolbar/gnome_emblem_web_16.png	\
-	gnome_emblem_web_24_pb_data			\
-	$(imagedir)/toolbar/gnome_emblem_web_24.png	\
-	toolbar_wireshark_file_16_pb_data		\
-	$(imagedir)/toolbar/16x16/x-capture-file-save.png \
-	toolbar_wireshark_file_24_pb_data		\
-	$(imagedir)/toolbar/24x24/x-capture-file-save.png \
-	capture_options_alt1_16_pb_data			\
-	$(imagedir)/toolbar/16x16/x-capture-options.png \
-	capture_options_alt1_24_pb_data			\
-	$(imagedir)/toolbar/24x24/x-capture-options.png \
-	capture_restart_16_pb_data			\
-	$(imagedir)/toolbar/16x16/x-capture-restart.png \
-	capture_restart_24_pb_data			\
-	$(imagedir)/toolbar/24x24/x-capture-restart.png \
-	capture_start_16_pb_data			\
-	$(imagedir)/toolbar/16x16/x-capture-start.png	\
-	capture_start_24_pb_data			\
-	$(imagedir)/toolbar/24x24/x-capture-start.png	\
-	capture_stop_16_pb_data				\
-	$(imagedir)/toolbar/16x16/x-capture-stop.png	\
-	capture_stop_24_pb_data				\
-	$(imagedir)/toolbar/24x24/x-capture-stop.png	\
-	layout_1_pb_data 				\
-	$(imagedir)/layout_1.png			\
-	layout_2_pb_data				\
-	$(imagedir)/layout_2.png			\
-	layout_3_pb_data				\
-	$(imagedir)/layout_3.png			\
-	layout_4_pb_data				\
-	$(imagedir)/layout_4.png			\
-	layout_5_pb_data				\
-	$(imagedir)/layout_5.png			\
-	layout_6_pb_data				\
-	$(imagedir)/layout_6.png			\
-	wsicon_16_pb_data				\
-	$(imagedir)/wsicon16.png			\
-	wsicon_24_pb_data				\
-	$(imagedir)/wsicon24.png			\
-	wsicon_32_pb_data				\
-	$(imagedir)/wsicon32.png			\
-	wsicon_48_pb_data				\
-	$(imagedir)/wsicon48.png			\
-	wsicon_64_pb_data				\
-	$(imagedir)/wsicon64.png			\
-	wsiconcap_16_pb_data				\
-	$(imagedir)/wsiconcap16.png			\
-	wsiconcap_24_pb_data				\
-	$(imagedir)/wsiconcap24.png			\
-	wsiconcap_32_pb_data				\
-	$(imagedir)/wsiconcap32.png			\
-	wsiconcap_48_pb_data				\
-	$(imagedir)/wsiconcap48.png			\
-	wsiconcap_64_pb_data				\
-	$(imagedir)/wsiconcap64.png			\
-	wssplash_pb_data				\
-	$(imagedir)/wssplash_dev.png
-
-pixbuf-csource:
-	$(PERL) $(top_srcdir)/tools/make-pixbuf-csource.pl $@ $(pixbuf_csource_data)
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index ca8b0fd737..9b62903a6d 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -19,7 +19,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) $(Qt_CFLAGS)
@@ -30,32 +29,560 @@ endif
 
 noinst_LIBRARIES = libqtui.a
 
-CLEANFILES = \
-	libqtui.a \
-	wireshark-tap-register.c-tmp \
-	wireshark-tap-register-cache.pkl \
-	*.moc.cpp \
-	qrc_*.cpp \
-	ui_*.h
-	*~
+include Makefile_custom.common
+
+# Generated header files that we want in the distribution.
+GENERATED_HEADER_FILES =
+
+# Generated header files that we don't want in the distribution.
+NODIST_GENERATED_HEADER_FILES = \
+	ui_about_dialog.h				\
+	ui_address_editor_frame.h			\
+	ui_bluetooth_att_server_attributes_dialog.h	\
+	ui_bluetooth_device_dialog.h			\
+	ui_bluetooth_devices_dialog.h			\
+	ui_bluetooth_hci_summary_dialog.h		\
+	ui_capture_file_properties_dialog.h		\
+	ui_capture_interfaces_dialog.h			\
+	ui_capture_preferences_frame.h			\
+	ui_coloring_rules_dialog.h			\
+	ui_column_preferences_frame.h			\
+	ui_column_editor_frame.h			\
+	ui_compiled_filter_output.h			\
+	ui_conversation_hash_tables_dialog.h		\
+	ui_decode_as_dialog.h				\
+	ui_display_filter_expression_dialog.h		\
+	ui_dissector_tables_dialog.h			\
+	ui_enabled_protocols_dialog.h			\
+	ui_expert_info_dialog.h				\
+	ui_export_object_dialog.h			\
+	ui_export_pdu_dialog.h				\
+	ui_file_set_dialog.h				\
+	ui_filter_dialog.h				\
+	ui_filter_expression_frame.h			\
+	ui_filter_expressions_preferences_frame.h	\
+	ui_firewall_rules_dialog.h			\
+	ui_follow_stream_dialog.h			\
+	ui_font_color_preferences_frame.h		\
+	ui_funnel_string_dialog.h			\
+	ui_funnel_text_dialog.h				\
+	ui_gsm_map_summary_dialog.h			\
+	ui_iax2_analysis_dialog.h			\
+	ui_import_text_dialog.h				\
+	ui_io_graph_dialog.h				\
+	ui_layout_preferences_frame.h			\
+	ui_lbm_lbtrm_transport_dialog.h			\
+	ui_lbm_lbtru_transport_dialog.h			\
+	ui_lbm_stream_dialog.h				\
+	ui_lbm_uimflow_dialog.h				\
+	ui_lte_rlc_graph_dialog.h			\
+	ui_main_welcome.h				\
+	ui_main_window.h				\
+	ui_main_window_preferences_frame.h		\
+	ui_manage_interfaces_dialog.h			\
+	ui_module_preferences_scroll_area.h		\
+	ui_mtp3_summary_dialog.h			\
+	ui_overlay_scroll_bar.h				\
+	ui_packet_comment_dialog.h			\
+	ui_packet_dialog.h				\
+	ui_packet_format_group_box.h			\
+	ui_packet_range_group_box.h			\
+	ui_preference_editor_frame.h			\
+	ui_preferences_dialog.h				\
+	ui_print_dialog.h				\
+	ui_profile_dialog.h				\
+	ui_progress_frame.h				\
+	ui_protocol_hierarchy_dialog.h			\
+	ui_remote_capture_dialog.h			\
+	ui_remote_settings_dialog.h			\
+	ui_resolved_addresses_dialog.h			\
+	ui_rtp_analysis_dialog.h			\
+	ui_rtp_player_dialog.h				\
+	ui_rtp_stream_dialog.h				\
+	ui_sctp_all_assocs_dialog.h			\
+	ui_sctp_assoc_analyse_dialog.h			\
+	ui_sctp_chunk_statistics_dialog.h		\
+	ui_sctp_graph_dialog.h				\
+	ui_sctp_graph_arwnd_dialog.h			\
+	ui_sctp_graph_byte_dialog.h			\
+	ui_search_frame.h				\
+	ui_sequence_dialog.h				\
+	ui_show_packet_bytes_dialog.h			\
+	ui_splash_overlay.h				\
+	ui_supported_protocols_dialog.h			\
+	ui_tap_parameter_dialog.h			\
+	ui_tcp_stream_dialog.h				\
+	ui_time_shift_dialog.h				\
+	ui_traffic_table_dialog.h			\
+	ui_uat_dialog.h					\
+	ui_voip_calls_dialog.h				\
+	ui_wireless_frame.h
+
+# Generated C source files that we want in the distribution.
+GENERATED_C_FILES = \
+	wireshark-tap-register.c
+
+# Generated C source files that we don't want in the distribution.
+NODIST_GENERATED_C_FILES =
+
+# Generated C++ source files that we want in the distribution.
+GENERATED_CPP_FILES =
+
+# Generated C++ source files that we don't want in the distribution.
+NODIST_GENERATED_CPP_FILES = \
+	$(MOC_SRC)	\
+	$(QRC_SRC)
+
+# All the generated files we want in the distribution.
+GENERATED_FILES = \
+	$(GENERATED_HEADER_FILES)	\
+	$(GENERATED_C_FILES)		\
+	$(GENERATED_CPP_FILES)
+
+# All the generated files we don't want in the distribution.
+NODIST_GENERATED_FILES = \
+	$(NODIST_GENERATED_HEADER_FILES)	\
+	$(NODIST_GENERATED_C_FILES)		\
+	$(NODIST_GENERATED_CPP_FILES)
+
+# Files that generate compileable files
+GENERATOR_FILES =
 
-DISTCLEANFILES = \
-	$(NODIST_GENERATED_FILES)	\
-	$(QM_FILES)		\
+#
+# Headers that have to be run through moc.
+#
+MOC_HDRS = \
+	about_dialog.h					\
+	accordion_frame.h				\
+	address_editor_frame.h				\
+	bluetooth_att_server_attributes_dialog.h	\
+	bluetooth_device_dialog.h			\
+	bluetooth_devices_dialog.h			\
+	bluetooth_hci_summary_dialog.h			\
+	byte_view_tab.h					\
+	byte_view_text.h				\
+	capture_file.h					\
+	capture_file_dialog.h				\
+	capture_file_properties_dialog.h		\
+	capture_filter_combo.h				\
+	capture_filter_edit.h				\
+	capture_filter_syntax_worker.h			\
+	capture_info_dialog.h				\
+	capture_interfaces_dialog.h			\
+	capture_preferences_frame.h			\
+	coloring_rules_dialog.h				\
+	color_utils.h					\
+	column_preferences_frame.h			\
+	column_editor_frame.h				\
+	compiled_filter_output.h			\
+	conversation_colorize_action.h			\
+	conversation_dialog.h				\
+	conversation_hash_tables_dialog.h		\
+	decode_as_dialog.h				\
+	display_filter_combo.h				\
+	display_filter_edit.h				\
+	display_filter_expression_dialog.h		\
+	dissector_tables_dialog.h			\
+	elided_label.h					\
+	enabled_protocols_dialog.h			\
+	endpoint_dialog.h				\
+	expert_info_dialog.h				\
+	export_dissection_dialog.h			\
+	export_object_dialog.h				\
+	export_pdu_dialog.h				\
+	field_filter_edit.h				\
+	file_set_dialog.h				\
+	filter_action.h					\
+	filter_dialog.h					\
+	filter_expression_frame.h			\
+	filter_expressions_preferences_frame.h		\
+	find_line_edit.h				\
+	firewall_rules_dialog.h				\
+	follow_stream_dialog.h				\
+	follow_stream_text.h				\
+	font_color_preferences_frame.h			\
+	funnel_string_dialog.h				\
+	funnel_text_dialog.h				\
+	funnel_statistics.h				\
+	geometry_state_dialog.h				\
+	gsm_map_summary_dialog.h			\
+	iax2_analysis_dialog.h				\
+	import_text_dialog.h				\
+	interface_tree.h				\
+	io_graph_dialog.h				\
+	label_stack.h					\
+	layout_preferences_frame.h			\
+	lbm_lbtrm_transport_dialog.h			\
+	lbm_lbtru_transport_dialog.h			\
+	lbm_stream_dialog.h				\
+	lbm_uimflow_dialog.h				\
+	lte_mac_statistics_dialog.h			\
+	lte_rlc_graph_dialog.h				\
+	lte_rlc_statistics_dialog.h			\
+	main_status_bar.h				\
+	main_welcome.h					\
+	main_window.h					\
+	main_window_preferences_frame.h			\
+	manage_interfaces_dialog.h			\
+	module_preferences_scroll_area.h		\
+	multicast_statistics_dialog.h			\
+	mtp3_summary_dialog.h				\
+	overlay_scroll_bar.h				\
+	packet_comment_dialog.h				\
+	packet_dialog.h					\
+	packet_format_group_box.h			\
+	packet_list.h					\
+	packet_list_model.h				\
+	packet_range_group_box.h			\
+	percent_bar_delegate.h				\
+	preference_editor_frame.h			\
+	preferences_dialog.h				\
+	print_dialog.h					\
+	profile_dialog.h				\
+	progress_frame.h				\
+	proto_tree.h					\
+	protocol_hierarchy_dialog.h			\
+	protocol_preferences_menu.h			\
+	qcustomplot.h					\
+	recent_file_status.h				\
+	related_packet_delegate.h			\
+	remote_capture_dialog.h				\
+	remote_settings_dialog.h			\
+	resolved_addresses_dialog.h			\
+	response_time_delay_dialog.h			\
+	rpc_service_response_time_dialog.h		\
+	rtp_analysis_dialog.h				\
+	rtp_audio_stream.h				\
+	rtp_player_dialog.h				\
+	rtp_stream_dialog.h				\
+	sctp_all_assocs_dialog.h			\
+	sctp_assoc_analyse_dialog.h			\
+	search_frame.h					\
+	sctp_chunk_statistics_dialog.h			\
+	sctp_graph_dialog.h				\
+	sctp_graph_arwnd_dialog.h			\
+	sctp_graph_byte_dialog.h			\
+	search_frame.h					\
+	sequence_diagram.h				\
+	sequence_dialog.h				\
+	service_response_time_dialog.h			\
+	show_packet_bytes_dialog.h			\
+	simple_dialog.h					\
+	simple_statistics_dialog.h			\
+	sparkline_delegate.h				\
+	splash_overlay.h				\
+	stats_tree_dialog.h				\
+	stock_icon_tool_button.h			\
+	supported_protocols_dialog.h			\
+	syntax_line_edit.h				\
+	tap_parameter_dialog.h				\
+	tcp_stream_dialog.h				\
+	time_shift_dialog.h				\
+	traffic_table_dialog.h				\
+	uat_dialog.h					\
+	voip_calls_dialog.h				\
+	wireless_frame.h				\
+	wireshark_application.h				\
+	wireshark_dialog.h				\
+	wlan_statistics_dialog.h
+
+#
+# .ui files.
+#
+UI_FILES = \
+	about_dialog.ui					\
+	address_editor_frame.ui				\
+	bluetooth_att_server_attributes_dialog.ui	\
+	bluetooth_device_dialog.ui			\
+	bluetooth_devices_dialog.ui			\
+	bluetooth_hci_summary_dialog.ui			\
+	capture_file_properties_dialog.ui 		\
+	capture_interfaces_dialog.ui 			\
+	capture_preferences_frame.ui			\
+	coloring_rules_dialog.ui			\
+	column_preferences_frame.ui			\
+	column_editor_frame.ui				\
+	compiled_filter_output.ui 			\
+	conversation_hash_tables_dialog.ui		\
+	decode_as_dialog.ui				\
+	display_filter_expression_dialog.ui		\
+	dissector_tables_dialog.ui			\
+	enabled_protocols_dialog.ui			\
+	expert_info_dialog.ui				\
+	export_object_dialog.ui				\
+	export_pdu_dialog.ui				\
+	file_set_dialog.ui				\
+	filter_dialog.ui				\
+	filter_expression_frame.ui			\
+	filter_expressions_preferences_frame.ui		\
+	firewall_rules_dialog.ui			\
+	follow_stream_dialog.ui				\
+	font_color_preferences_frame.ui			\
+	funnel_string_dialog.ui				\
+	funnel_text_dialog.ui				\
+	gsm_map_summary_dialog.ui			\
+	iax2_analysis_dialog.ui				\
+	import_text_dialog.ui				\
+	io_graph_dialog.ui				\
+	layout_preferences_frame.ui			\
+	lbm_lbtrm_transport_dialog.ui			\
+	lbm_lbtru_transport_dialog.ui			\
+	lbm_stream_dialog.ui				\
+	lbm_uimflow_dialog.ui				\
+	lte_rlc_graph_dialog.ui				\
+	main_welcome.ui					\
+	main_window.ui					\
+	main_window_preferences_frame.ui		\
+	manage_interfaces_dialog.ui			\
+	module_preferences_scroll_area.ui		\
+	mtp3_summary_dialog.ui				\
+	packet_format_group_box.ui			\
+	packet_range_group_box.ui			\
+	packet_comment_dialog.ui			\
+	packet_dialog.ui				\
+	preference_editor_frame.ui			\
+	preferences_dialog.ui				\
+	print_dialog.ui					\
+	profile_dialog.ui				\
+	progress_frame.ui				\
+	protocol_hierarchy_dialog.ui			\
+	remote_capture_dialog.ui			\
+	remote_settings_dialog.ui			\
+	resolved_addresses_dialog.ui			\
+	rtp_analysis_dialog.ui				\
+	rtp_player_dialog.ui				\
+	rtp_stream_dialog.ui				\
+	sctp_all_assocs_dialog.ui			\
+	sctp_assoc_analyse_dialog.ui			\
+	sctp_chunk_statistics_dialog.ui			\
+	sctp_graph_dialog.ui				\
+	sctp_graph_arwnd_dialog.ui			\
+	sctp_graph_byte_dialog.ui			\
+	search_frame.ui					\
+	sequence_dialog.ui				\
+	show_packet_bytes_dialog.ui			\
+	splash_overlay.ui				\
+	supported_protocols_dialog.ui			\
+	tap_parameter_dialog.ui				\
+	tcp_stream_dialog.ui				\
+	time_shift_dialog.ui				\
+	traffic_table_dialog.ui				\
+	uat_dialog.ui					\
+	voip_calls_dialog.ui				\
+	wireless_frame.ui
+
+#
+# The .moc.cpp files generated from them.
+# We do *not* include these in the distribution; if you have the Qt SDK
+# installed, so that you can build Qt-based applications, you have moc
+# installed.
+#
+MOC_SRC = $(MOC_HDRS:.h=.moc.cpp)
+
+#
+# .qrc files.
+#
+# Should QRC_FILES or QRC_SRC depend on QRC_IMAGES?
+QRC_FILES = \
+	../../image/about.qrc			\
+	../../image/languages/languages.qrc	\
+	../../image/layout.qrc			\
+	../../image/toolbar.qrc			\
+	../../image/wsicon.qrc			\
 	i18n.qrc
 
-MAINTAINERCLEANFILES = \
-	$(GENERATED_FILES)		\
-	$(NODIST_GENERATED_FILES)	\
-	Makefile.in
+#
+# The .cpp files generated from them.
+# We do *not* include these in the distribution; if you have the Qt SDK
+# installed, so that you can build Qt-based applications, you have rcc
+# installed.
+#
+QRC_SRC = \
+	qrc_about.cpp		\
+	qrc_languages.cpp	\
+	qrc_layout.cpp		\
+	qrc_toolbar.cpp		\
+	qrc_wsicon.cpp		\
+	qrc_i18n.cpp
+
+#
+# .ts files.
+# wireshark_en should be pluralonly.
+#
+TS_FILES = \
+	wireshark_de.ts		\
+	wireshark_en.ts		\
+	wireshark_fr.ts		\
+	wireshark_it.ts 	\
+	wireshark_ja_JP.ts	\
+	wireshark_pl.ts		\
+	wireshark_zh_CN.ts
+
+#
+# .qm files.
+#
+QM_FILES = $(TS_FILES:.ts=.qm)
+
+WIRESHARK_QT_SRC = \
+	about_dialog.cpp				\
+	accordion_frame.cpp				\
+	address_editor_frame.cpp			\
+	bluetooth_att_server_attributes_dialog.cpp	\
+	bluetooth_device_dialog.cpp			\
+	bluetooth_devices_dialog.cpp			\
+	bluetooth_hci_summary_dialog.cpp		\
+	byte_view_tab.cpp				\
+	byte_view_text.cpp				\
+	capture_file.cpp				\
+	capture_file_dialog.cpp				\
+	capture_file_properties_dialog.cpp		\
+	capture_filter_combo.cpp			\
+	capture_filter_edit.cpp				\
+	capture_filter_syntax_worker.cpp		\
+	capture_info_dialog.cpp				\
+	capture_interfaces_dialog.cpp			\
+	capture_preferences_frame.cpp			\
+	color_utils.cpp					\
+	coloring_rules_dialog.cpp			\
+	column_preferences_frame.cpp			\
+	column_editor_frame.cpp				\
+	compiled_filter_output.cpp			\
+	conversation_colorize_action.cpp		\
+	conversation_dialog.cpp				\
+	conversation_hash_tables_dialog.cpp		\
+	decode_as_dialog.cpp				\
+	display_filter_combo.cpp			\
+	display_filter_edit.cpp				\
+	display_filter_expression_dialog.cpp		\
+	dissector_tables_dialog.cpp			\
+	elided_label.cpp				\
+	enabled_protocols_dialog.cpp			\
+	endpoint_dialog.cpp				\
+	export_dissection_dialog.cpp			\
+	export_object_dialog.cpp			\
+	export_pdu_dialog.cpp				\
+	field_filter_edit.cpp				\
+	file_set_dialog.cpp				\
+	filter_action.cpp				\
+	filter_dialog.cpp				\
+	filter_expression_frame.cpp			\
+	filter_expressions_preferences_frame.cpp	\
+	find_line_edit.cpp				\
+	firewall_rules_dialog.cpp			\
+	follow_stream_dialog.cpp			\
+	follow_stream_text.cpp				\
+	font_color_preferences_frame.cpp		\
+	funnel_string_dialog.cpp			\
+	funnel_text_dialog.cpp				\
+	geometry_state_dialog.cpp			\
+	iax2_analysis_dialog.cpp			\
+	import_text_dialog.cpp				\
+	interface_tree.cpp				\
+	label_stack.cpp					\
+	layout_preferences_frame.cpp			\
+	lbm_lbtrm_transport_dialog.cpp			\
+	lbm_lbtru_transport_dialog.cpp			\
+	lbm_stream_dialog.cpp				\
+	lbm_uimflow_dialog.cpp				\
+	lte_mac_statistics_dialog.cpp			\
+	lte_rlc_graph_dialog.cpp			\
+	lte_rlc_statistics_dialog.cpp			\
+	main_status_bar.cpp				\
+	main_welcome.cpp				\
+	main_window.cpp					\
+	main_window_preferences_frame.cpp		\
+	main_window_slots.cpp				\
+	manage_interfaces_dialog.cpp			\
+	module_preferences_scroll_area.cpp		\
+	overlay_scroll_bar.cpp				\
+	packet_comment_dialog.cpp			\
+	packet_dialog.cpp				\
+	packet_format_group_box.cpp			\
+	packet_list.cpp					\
+	packet_list_model.cpp				\
+	packet_list_record.cpp				\
+	packet_range_group_box.cpp			\
+	percent_bar_delegate.cpp			\
+	preference_editor_frame.cpp			\
+	preferences_dialog.cpp				\
+	print_dialog.cpp				\
+	profile_dialog.cpp				\
+	progress_frame.cpp				\
+	proto_tree.cpp					\
+	protocol_hierarchy_dialog.cpp			\
+	protocol_preferences_menu.cpp			\
+	qcustomplot.cpp					\
+	qt_ui_utils.cpp					\
+	recent_file_status.cpp				\
+	related_packet_delegate.cpp			\
+	remote_capture_dialog.cpp			\
+	remote_settings_dialog.cpp			\
+	resolved_addresses_dialog.cpp			\
+	response_time_delay_dialog.cpp			\
+	rpc_service_response_time_dialog.cpp		\
+	rtp_analysis_dialog.cpp				\
+	rtp_audio_stream.cpp				\
+	rtp_player_dialog.cpp				\
+	rtp_stream_dialog.cpp				\
+	sctp_all_assocs_dialog.cpp			\
+	sctp_assoc_analyse_dialog.cpp			\
+	sctp_chunk_statistics_dialog.cpp		\
+	sctp_graph_dialog.cpp				\
+	sctp_graph_arwnd_dialog.cpp			\
+	sctp_graph_byte_dialog.cpp			\
+	search_frame.cpp				\
+	sequence_diagram.cpp				\
+	sequence_dialog.cpp				\
+	service_response_time_dialog.cpp		\
+	show_packet_bytes_dialog.cpp			\
+	simple_dialog.cpp				\
+	simple_statistics_dialog.cpp			\
+	sparkline_delegate.cpp				\
+	splash_overlay.cpp				\
+	stock_icon.cpp					\
+	stock_icon_tool_button.cpp			\
+	supported_protocols_dialog.cpp			\
+	syntax_line_edit.cpp				\
+	tap_parameter_dialog.cpp			\
+	tcp_stream_dialog.cpp				\
+	time_shift_dialog.cpp				\
+	traffic_table_dialog.cpp			\
+	uat_dialog.cpp					\
+	voip_calls_dialog.cpp				\
+	wireless_frame.cpp				\
+	wireshark_application.cpp			\
+	wireshark_dialog.cpp
+
+WIRESHARK_QT_TAP_SRC = \
+	expert_info_dialog.cpp			\
+	funnel_statistics.cpp			\
+	gsm_map_summary_dialog.cpp		\
+	io_graph_dialog.cpp			\
+	lte_mac_statistics_dialog.cpp		\
+	lte_rlc_statistics_dialog.cpp		\
+	mtp3_summary_dialog.cpp			\
+	multicast_statistics_dialog.cpp		\
+	rtp_stream_dialog.cpp			\
+	sctp_all_assocs_dialog.cpp		\
+	sctp_assoc_analyse_dialog.cpp		\
+	stats_tree_dialog.cpp			\
+	wlan_statistics_dialog.cpp
+
+noinst_HEADERS = \
+	$(MOC_HDRS)		\
+	packet_list_record.h	\
+	qcustomplot.h		\
+	qt_ui_utils.h		\
+	stock_icon.h		\
+	tango_colors.h
 
 if HAVE_EXTCAP
 NODIST_GENERATED_HEADER_FILES += \
 	ui_extcap_options_dialog.h
 
 MOC_HDRS += \
-	extcap_argument.h	\
-	extcap_argument_file.h	\
+	extcap_argument.h		\
+	extcap_argument_file.h		\
 	extcap_argument_multiselect.h	\
 	extcap_options_dialog.h
 
@@ -63,7 +590,7 @@ UI_FILES += \
 	extcap_options_dialog.ui
 
 WIRESHARK_QT_SRC += \
-	extcap_argument.cpp	\
+	extcap_argument.cpp		\
 	extcap_argument_file.cpp	\
 	extcap_argument_multiselect.cpp	\
 	extcap_options_dialog.cpp
@@ -88,20 +615,39 @@ wireshark-tap-register.c: $(WIRESHARK_QT_TAP_SRC) $(top_srcdir)/tools/make-tap-r
 	@$(PYTHON) $(top_srcdir)/tools/make-tap-reg.py $(srcdir) taps $(WIRESHARK_QT_TAP_SRC)
 
 libqtui_a_SOURCES = \
-	$(WIRESHARK_QT_SRC) \
-	$(WIRESHARK_QT_TAP_SRC) \
-	$(GENERATED_C_FILES) \
-	$(GENERATED_CPP_FILES) \
-	$(noinst_HEADERS) \
+	$(WIRESHARK_QT_SRC)		\
+	$(WIRESHARK_QT_TAP_SRC)		\
+	$(GENERATED_C_FILES)		\
+	$(GENERATED_CPP_FILES)		\
+	$(noinst_HEADERS)		\
 	$(GENERATED_HEADER_FILES)
 
 nodist_libqtui_a_SOURCES = \
-	$(NODIST_GENERATED_C_FILES) \
-	$(NODIST_GENERATED_CPP_FILES) \
+	$(NODIST_GENERATED_C_FILES)	\
+	$(NODIST_GENERATED_CPP_FILES)	\
 	$(NODIST_GENERATED_HEADER_FILES)
 
 libqtui_a_DEPENDENCIES =
 
+CLEANFILES = \
+	libqtui.a			\
+	wireshark-tap-register.c-tmp	\
+	wireshark-tap-register-cache.pkl \
+	*.moc.cpp			\
+	qrc_*.cpp			\
+	ui_*.h				\
+	*~
+
+DISTCLEANFILES = \
+	$(NODIST_GENERATED_FILES)	\
+	$(QM_FILES)		\
+	i18n.qrc
+
+MAINTAINERCLEANFILES = \
+	$(GENERATED_FILES)		\
+	$(NODIST_GENERATED_FILES)	\
+	Makefile.in
+
 AM_V_MOC = $(am__v_MOC_@AM_V@)
 am__v_MOC_ = $(am__v_MOC_@AM_DEFAULT_V@)
 am__v_MOC_0 = @echo "  MOC     " $@;
@@ -351,6 +897,5 @@ EXTRA_DIST = \
 	CMakeLists.txt			\
 	doxygen.cfg.in			\
 	i18n.qrc.in			\
-	Makefile.common			\
 	Makefile_custom.common		\
 	gpl-template.txt
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
deleted file mode 100644
index 286c74d3cf..0000000000
--- a/ui/qt/Makefile.common
+++ /dev/null
@@ -1,570 +0,0 @@
-# Makefile.common
-#     Contains the stuff from Makefile.am and Makefile.nmake that is
-#     a) common to both files and
-#     b) portable between both files
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#
-include Makefile_custom.common
-
-# Generated header files that we want in the distribution.
-GENERATED_HEADER_FILES =
-
-# Generated header files that we don't want in the distribution.
-NODIST_GENERATED_HEADER_FILES =	\
-	ui_about_dialog.h	\
-	ui_address_editor_frame.h	\
-	ui_bluetooth_att_server_attributes_dialog.h	\
-	ui_bluetooth_device_dialog.h	\
-	ui_bluetooth_devices_dialog.h	\
-	ui_bluetooth_hci_summary_dialog.h	\
-	ui_capture_file_properties_dialog.h	\
-	ui_capture_interfaces_dialog.h	\
-	ui_capture_preferences_frame.h	\
-	ui_coloring_rules_dialog.h	\
-	ui_column_preferences_frame.h	\
-	ui_column_editor_frame.h	\
-	ui_compiled_filter_output.h		\
-	ui_conversation_hash_tables_dialog.h	\
-	ui_decode_as_dialog.h	\
-	ui_display_filter_expression_dialog.h	\
-	ui_dissector_tables_dialog.h	\
-	ui_enabled_protocols_dialog.h	\
-	ui_expert_info_dialog.h	\
-	ui_export_object_dialog.h	\
-	ui_export_pdu_dialog.h	\
-	ui_file_set_dialog.h	\
-	ui_filter_dialog.h	\
-	ui_filter_expression_frame.h	\
-	ui_filter_expressions_preferences_frame.h	\
-	ui_firewall_rules_dialog.h	\
-	ui_follow_stream_dialog.h	\
-	ui_font_color_preferences_frame.h	\
-	ui_funnel_string_dialog.h	\
-	ui_funnel_text_dialog.h	\
-	ui_gsm_map_summary_dialog.h	\
-	ui_iax2_analysis_dialog.h	\
-	ui_import_text_dialog.h	\
-	ui_io_graph_dialog.h	\
-	ui_layout_preferences_frame.h	\
-	ui_lbm_lbtrm_transport_dialog.h \
-	ui_lbm_lbtru_transport_dialog.h \
-	ui_lbm_stream_dialog.h \
-	ui_lbm_uimflow_dialog.h \
-	ui_lte_rlc_graph_dialog.h	\
-	ui_main_welcome.h	\
-	ui_main_window.h	\
-	ui_main_window_preferences_frame.h	\
-	ui_manage_interfaces_dialog.h	\
-	ui_module_preferences_scroll_area.h	\
-	ui_mtp3_summary_dialog.h	\
-	ui_overlay_scroll_bar.h	\
-	ui_packet_comment_dialog.h	\
-	ui_packet_dialog.h	\
-	ui_packet_format_group_box.h	\
-	ui_packet_range_group_box.h	\
-	ui_preference_editor_frame.h	\
-	ui_preferences_dialog.h	\
-	ui_print_dialog.h	\
-	ui_profile_dialog.h	\
-	ui_progress_frame.h \
-	ui_protocol_hierarchy_dialog.h	\
-	ui_remote_capture_dialog.h	\
-	ui_remote_settings_dialog.h	\
-	ui_resolved_addresses_dialog.h	\
-	ui_rtp_analysis_dialog.h	\
-	ui_rtp_player_dialog.h	\
-	ui_rtp_stream_dialog.h	\
-	ui_sctp_all_assocs_dialog.h	\
-	ui_sctp_assoc_analyse_dialog.h	\
-	ui_sctp_chunk_statistics_dialog.h	\
-	ui_sctp_graph_dialog.h	\
-	ui_sctp_graph_arwnd_dialog.h	\
-	ui_sctp_graph_byte_dialog.h	\
-	ui_search_frame.h	\
-	ui_sequence_dialog.h	\
-	ui_show_packet_bytes_dialog.h	\
-	ui_splash_overlay.h	\
-	ui_supported_protocols_dialog.h	\
-	ui_tap_parameter_dialog.h	\
-	ui_tcp_stream_dialog.h	\
-	ui_time_shift_dialog.h	\
-	ui_traffic_table_dialog.h	\
-	ui_uat_dialog.h		\
-	ui_voip_calls_dialog.h	\
-	ui_wireless_frame.h
-
-# Generated C source files that we want in the distribution.
-GENERATED_C_FILES =	\
-	wireshark-tap-register.c
-
-# Generated C source files that we don't want in the distribution.
-NODIST_GENERATED_C_FILES =
-
-# Generated C++ source files that we want in the distribution.
-GENERATED_CPP_FILES =
-
-# Generated C++ source files that we don't want in the distribution.
-NODIST_GENERATED_CPP_FILES =	\
-	$(MOC_SRC)	\
-	$(QRC_SRC)
-
-# All the generated files we want in the distribution.
-GENERATED_FILES =	\
-	$(GENERATED_HEADER_FILES)	\
-	$(GENERATED_C_FILES)	\
-	$(GENERATED_CPP_FILES)
-
-# All the generated files we don't want in the distribution.
-NODIST_GENERATED_FILES =	\
-	$(NODIST_GENERATED_HEADER_FILES)	\
-	$(NODIST_GENERATED_C_FILES)	\
-	$(NODIST_GENERATED_CPP_FILES)
-
-# Files that generate compileable files
-GENERATOR_FILES =
-
-#
-# Headers that have to be run through moc.
-#
-MOC_HDRS =	\
-	about_dialog.h	\
-	accordion_frame.h	\
-	address_editor_frame.h	\
-	bluetooth_att_server_attributes_dialog.h	\
-	bluetooth_device_dialog.h	\
-	bluetooth_devices_dialog.h	\
-	bluetooth_hci_summary_dialog.h	\
-	byte_view_tab.h	\
-	byte_view_text.h	\
-	capture_file.h	\
-	capture_file_dialog.h	\
-	capture_file_properties_dialog.h	\
-	capture_filter_combo.h	\
-	capture_filter_edit.h	\
-	capture_filter_syntax_worker.h	\
-	capture_info_dialog.h	\
-	capture_interfaces_dialog.h	\
-	capture_preferences_frame.h	\
-	coloring_rules_dialog.h	\
-	color_utils.h	\
-	column_preferences_frame.h	\
-	column_editor_frame.h	\
-	compiled_filter_output.h	\
-	conversation_colorize_action.h	\
-	conversation_dialog.h	\
-	conversation_hash_tables_dialog.h	\
-	decode_as_dialog.h	\
-	display_filter_combo.h	\
-	display_filter_edit.h	\
-	display_filter_expression_dialog.h	\
-	dissector_tables_dialog.h	\
-	elided_label.h	\
-	enabled_protocols_dialog.h	\
-	endpoint_dialog.h	\
-	expert_info_dialog.h	\
-	export_dissection_dialog.h	\
-	export_object_dialog.h	\
-	export_pdu_dialog.h	\
-	field_filter_edit.h	\
-	file_set_dialog.h	\
-	filter_action.h	\
-	filter_dialog.h	\
-	filter_expression_frame.h	\
-	filter_expressions_preferences_frame.h	\
-	find_line_edit.h	\
-	firewall_rules_dialog.h	\
-	follow_stream_dialog.h	\
-	follow_stream_text.h	\
-	font_color_preferences_frame.h	\
-	funnel_string_dialog.h	\
-	funnel_text_dialog.h	\
-	funnel_statistics.h	\
-	geometry_state_dialog.h	\
-	gsm_map_summary_dialog.h	\
-	iax2_analysis_dialog.h	\
-	import_text_dialog.h	\
-	interface_tree.h	\
-	io_graph_dialog.h	\
-	label_stack.h	\
-	layout_preferences_frame.h	\
-	lbm_lbtrm_transport_dialog.h	\
-	lbm_lbtru_transport_dialog.h	\
-	lbm_stream_dialog.h	\
-	lbm_uimflow_dialog.h	\
-	lte_mac_statistics_dialog.h	\
-	lte_rlc_graph_dialog.h	\
-	lte_rlc_statistics_dialog.h	\
-	main_status_bar.h	\
-	main_welcome.h	\
-	main_window.h	\
-	main_window_preferences_frame.h	\
-	manage_interfaces_dialog.h	\
-	module_preferences_scroll_area.h	\
-	multicast_statistics_dialog.h	\
-	mtp3_summary_dialog.h	\
-	overlay_scroll_bar.h	\
-	packet_comment_dialog.h	\
-	packet_dialog.h	\
-	packet_format_group_box.h	\
-	packet_list.h	\
-	packet_list_model.h	\
-	packet_range_group_box.h	\
-	percent_bar_delegate.h	\
-	preference_editor_frame.h	\
-	preferences_dialog.h	\
-	print_dialog.h	\
-	profile_dialog.h	\
-	progress_frame.h	\
-	proto_tree.h	\
-	protocol_hierarchy_dialog.h	\
-	protocol_preferences_menu.h	\
-	qcustomplot.h	\
-	recent_file_status.h	\
-	related_packet_delegate.h	\
-	remote_capture_dialog.h	\
-	remote_settings_dialog.h	\
-	resolved_addresses_dialog.h	\
-	response_time_delay_dialog.h	\
-	rpc_service_response_time_dialog.h	\
-	rtp_analysis_dialog.h	\
-	rtp_audio_stream.h	\
-	rtp_player_dialog.h	\
-	rtp_stream_dialog.h	\
-	sctp_all_assocs_dialog.h	\
-	sctp_assoc_analyse_dialog.h	\
-	search_frame.h	\
-	sctp_chunk_statistics_dialog.h	\
-	sctp_graph_dialog.h	\
-	sctp_graph_arwnd_dialog.h	\
-	sctp_graph_byte_dialog.h	\
-	search_frame.h	\
-	sequence_diagram.h	\
-	sequence_dialog.h	\
-	service_response_time_dialog.h	\
-	show_packet_bytes_dialog.h	\
-	simple_dialog.h	\
-	simple_statistics_dialog.h	\
-	sparkline_delegate.h	\
-	splash_overlay.h	\
-	stats_tree_dialog.h	\
-	stock_icon_tool_button.h	\
-	supported_protocols_dialog.h	\
-	syntax_line_edit.h	\
-	tap_parameter_dialog.h	\
-	tcp_stream_dialog.h	\
-	time_shift_dialog.h	\
-	traffic_table_dialog.h	\
-	uat_dialog.h	\
-	voip_calls_dialog.h	\
-	wireless_frame.h	\
-	wireshark_application.h	\
-	wireshark_dialog.h	\
-	wlan_statistics_dialog.h
-
-#
-# .ui files.
-#
-UI_FILES =	\
-	about_dialog.ui	\
-	address_editor_frame.ui	\
-	bluetooth_att_server_attributes_dialog.ui	\
-	bluetooth_device_dialog.ui	\
-	bluetooth_devices_dialog.ui	\
-	bluetooth_hci_summary_dialog.ui	\
-	capture_file_properties_dialog.ui 	\
-	capture_interfaces_dialog.ui 	\
-	capture_preferences_frame.ui	\
-	coloring_rules_dialog.ui	\
-	column_preferences_frame.ui	\
-	column_editor_frame.ui	\
-	compiled_filter_output.ui \
-	conversation_hash_tables_dialog.ui	\
-	decode_as_dialog.ui	\
-	display_filter_expression_dialog.ui	\
-	dissector_tables_dialog.ui	\
-	enabled_protocols_dialog.ui	\
-	expert_info_dialog.ui	\
-	export_object_dialog.ui	\
-	export_pdu_dialog.ui	\
-	file_set_dialog.ui	\
-	filter_dialog.ui	\
-	filter_expression_frame.ui	\
-	filter_expressions_preferences_frame.ui	\
-	firewall_rules_dialog.ui	\
-	follow_stream_dialog.ui	\
-	font_color_preferences_frame.ui	\
-	funnel_string_dialog.ui	\
-	funnel_text_dialog.ui	\
-	gsm_map_summary_dialog.ui	\
-	iax2_analysis_dialog.ui	\
-	import_text_dialog.ui	\
-	io_graph_dialog.ui	\
-	layout_preferences_frame.ui	\
-	lbm_lbtrm_transport_dialog.ui	\
-	lbm_lbtru_transport_dialog.ui	\
-	lbm_stream_dialog.ui	\
-	lbm_uimflow_dialog.ui	\
-	lte_rlc_graph_dialog.ui	\
-	main_welcome.ui	\
-	main_window.ui	\
-	main_window_preferences_frame.ui	\
-	manage_interfaces_dialog.ui		\
-	module_preferences_scroll_area.ui	\
-	mtp3_summary_dialog.ui	\
-	packet_format_group_box.ui	\
-	packet_range_group_box.ui	\
-	packet_comment_dialog.ui	\
-	packet_dialog.ui	\
-	preference_editor_frame.ui	\
-	preferences_dialog.ui	\
-	print_dialog.ui	\
-	profile_dialog.ui	\
-	progress_frame.ui	\
-	protocol_hierarchy_dialog.ui	\
-	remote_capture_dialog.ui	\
-	remote_settings_dialog.ui	\
-	resolved_addresses_dialog.ui	\
-	rtp_analysis_dialog.ui	\
-	rtp_player_dialog.ui	\
-	rtp_stream_dialog.ui	\
-	sctp_all_assocs_dialog.ui	\
-	sctp_assoc_analyse_dialog.ui	\
-	sctp_chunk_statistics_dialog.ui	\
-	sctp_graph_dialog.ui	\
-	sctp_graph_arwnd_dialog.ui	\
-	sctp_graph_byte_dialog.ui	\
-	search_frame.ui	\
-	sequence_dialog.ui	\
-	show_packet_bytes_dialog.ui	\
-	splash_overlay.ui	\
-	supported_protocols_dialog.ui	\
-	tap_parameter_dialog.ui	\
-	tcp_stream_dialog.ui	\
-	time_shift_dialog.ui	\
-	traffic_table_dialog.ui	\
-	uat_dialog.ui		\
-	voip_calls_dialog.ui	\
-	wireless_frame.ui
-
-#
-# The .moc.cpp files generated from them.
-# We do *not* include these in the distribution; if you have the Qt SDK
-# installed, so that you can build Qt-based applications, you have moc
-# installed.
-#
-MOC_SRC = $(MOC_HDRS:.h=.moc.cpp)
-
-#
-# .qrc files.
-#
-# Should QRC_FILES or QRC_SRC depend on QRC_IMAGES?
-QRC_FILES =	\
-	../../image/about.qrc	\
-	../../image/languages/languages.qrc	\
-	../../image/layout.qrc	\
-	../../image/toolbar.qrc	\
-	../../image/wsicon.qrc	\
-	i18n.qrc
-
-#
-# The .cpp files generated from them.
-# We do *not* include these in the distribution; if you have the Qt SDK
-# installed, so that you can build Qt-based applications, you have rcc
-# installed.
-#
-QRC_SRC = 	\
-	qrc_about.cpp	\
-	qrc_languages.cpp	\
-	qrc_layout.cpp	\
-	qrc_toolbar.cpp	\
-	qrc_wsicon.cpp	\
-	qrc_i18n.cpp
-
-#
-# .ts files.
-# wireshark_en should be pluralonly.
-#
-TS_FILES =	\
-	wireshark_de.ts	\
-	wireshark_en.ts	\
-	wireshark_fr.ts	\
-	wireshark_it.ts \
-	wireshark_ja_JP.ts	\
-	wireshark_pl.ts	\
-	wireshark_zh_CN.ts
-
-#
-# .qm files.
-#
-QM_FILES = $(TS_FILES:.ts=.qm)
-
-WIRESHARK_QT_SRC =	\
-	about_dialog.cpp	\
-	accordion_frame.cpp	\
-	address_editor_frame.cpp	\
-	bluetooth_att_server_attributes_dialog.cpp	\
-	bluetooth_device_dialog.cpp	\
-	bluetooth_devices_dialog.cpp	\
-	bluetooth_hci_summary_dialog.cpp	\
-	byte_view_tab.cpp	\
-	byte_view_text.cpp	\
-	capture_file.cpp	\
-	capture_file_dialog.cpp	\
-	capture_file_properties_dialog.cpp	\
-	capture_filter_combo.cpp	\
-	capture_filter_edit.cpp	\
-	capture_filter_syntax_worker.cpp	\
-	capture_info_dialog.cpp	\
-	capture_interfaces_dialog.cpp	\
-	capture_preferences_frame.cpp	\
-	color_utils.cpp	\
-	coloring_rules_dialog.cpp	\
-	column_preferences_frame.cpp	\
-	column_editor_frame.cpp	\
-	compiled_filter_output.cpp \
-	conversation_colorize_action.cpp	\
-	conversation_dialog.cpp	\
-	conversation_hash_tables_dialog.cpp	\
-	decode_as_dialog.cpp	\
-	display_filter_combo.cpp	\
-	display_filter_edit.cpp	\
-	display_filter_expression_dialog.cpp	\
-	dissector_tables_dialog.cpp	\
-	elided_label.cpp	\
-	enabled_protocols_dialog.cpp	\
-	endpoint_dialog.cpp	\
-	export_dissection_dialog.cpp	\
-	export_object_dialog.cpp	\
-	export_pdu_dialog.cpp	\
-	field_filter_edit.cpp	\
-	file_set_dialog.cpp	\
-	filter_action.cpp	\
-	filter_dialog.cpp	\
-	filter_expression_frame.cpp	\
-	filter_expressions_preferences_frame.cpp	\
-	find_line_edit.cpp	\
-	firewall_rules_dialog.cpp	\
-	follow_stream_dialog.cpp	\
-	follow_stream_text.cpp	\
-	font_color_preferences_frame.cpp	\
-	funnel_string_dialog.cpp	\
-	funnel_text_dialog.cpp	\
-	geometry_state_dialog.cpp	\
-	iax2_analysis_dialog.cpp	\
-	import_text_dialog.cpp	\
-	interface_tree.cpp	\
-	label_stack.cpp	\
-	layout_preferences_frame.cpp	\
-	lbm_lbtrm_transport_dialog.cpp	\
-	lbm_lbtru_transport_dialog.cpp	\
-	lbm_stream_dialog.cpp	\
-	lbm_uimflow_dialog.cpp	\
-	lte_mac_statistics_dialog.cpp	\
-	lte_rlc_graph_dialog.cpp	\
-	lte_rlc_statistics_dialog.cpp	\
-	main_status_bar.cpp	\
-	main_welcome.cpp	\
-	main_window.cpp	\
-	main_window_preferences_frame.cpp	\
-	main_window_slots.cpp	\
-	manage_interfaces_dialog.cpp	\
-	module_preferences_scroll_area.cpp	\
-	overlay_scroll_bar.cpp	\
-	packet_comment_dialog.cpp	\
-	packet_dialog.cpp	\
-	packet_format_group_box.cpp	\
-	packet_list.cpp	\
-	packet_list_model.cpp	\
-	packet_list_record.cpp	\
-	packet_range_group_box.cpp	\
-	percent_bar_delegate.cpp	\
-	preference_editor_frame.cpp	\
-	preferences_dialog.cpp	\
-	print_dialog.cpp	\
-	profile_dialog.cpp	\
-	progress_frame.cpp	\
-	proto_tree.cpp	\
-	protocol_hierarchy_dialog.cpp	\
-	protocol_preferences_menu.cpp	\
-	qcustomplot.cpp	\
-	qt_ui_utils.cpp	\
-	recent_file_status.cpp	\
-	related_packet_delegate.cpp	\
-	remote_capture_dialog.cpp	\
-	remote_settings_dialog.cpp	\
-	resolved_addresses_dialog.cpp	\
-	response_time_delay_dialog.cpp	\
-	rpc_service_response_time_dialog.cpp	\
-	rtp_analysis_dialog.cpp	\
-	rtp_audio_stream.cpp	\
-	rtp_player_dialog.cpp	\
-	rtp_stream_dialog.cpp	\
-	sctp_all_assocs_dialog.cpp	\
-	sctp_assoc_analyse_dialog.cpp	\
-	sctp_chunk_statistics_dialog.cpp	\
-	sctp_graph_dialog.cpp	\
-	sctp_graph_arwnd_dialog.cpp	\
-	sctp_graph_byte_dialog.cpp	\
-	search_frame.cpp	\
-	sequence_diagram.cpp	\
-	sequence_dialog.cpp	\
-	service_response_time_dialog.cpp	\
-	show_packet_bytes_dialog.cpp	\
-	simple_dialog.cpp	\
-	simple_statistics_dialog.cpp	\
-	sparkline_delegate.cpp	\
-	splash_overlay.cpp	\
-	stock_icon.cpp		\
-	stock_icon_tool_button.cpp	\
-	supported_protocols_dialog.cpp	\
-	syntax_line_edit.cpp	\
-	tap_parameter_dialog.cpp	\
-	tcp_stream_dialog.cpp	\
-	time_shift_dialog.cpp	\
-	traffic_table_dialog.cpp	\
-	uat_dialog.cpp	\
-	voip_calls_dialog.cpp	\
-	wireless_frame.cpp	\
-	wireshark_application.cpp	\
-	wireshark_dialog.cpp
-
-WIRESHARK_QT_TAP_SRC =	\
-	expert_info_dialog.cpp	\
-	funnel_statistics.cpp	\
-	gsm_map_summary_dialog.cpp	\
-	io_graph_dialog.cpp	\
-	lte_mac_statistics_dialog.cpp	\
-	lte_rlc_statistics_dialog.cpp	\
-	mtp3_summary_dialog.cpp	\
-	multicast_statistics_dialog.cpp	\
-	rtp_stream_dialog.cpp	\
-	sctp_all_assocs_dialog.cpp	\
-	sctp_assoc_analyse_dialog.cpp	\
-	stats_tree_dialog.cpp	\
-	wlan_statistics_dialog.cpp
-
-noinst_HEADERS =	\
-	$(MOC_HDRS)	\
-	packet_list_record.h	\
-	qcustomplot.h	\
-	qt_ui_utils.h	\
-	stock_icon.h	\
-	tango_colors.h