From 7617af1d8994289da23402b67ccea79e32881888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Mon, 11 Dec 2017 19:32:31 +0000
Subject: Fix make distcheck
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I0c5a31d423d19071dc6ed0a42b064271e5f63fd2
Reviewed-on: https://code.wireshark.org/review/24769
Reviewed-by: João Valverde <j@v6e.pt>
---
 ui/Makefile.am     |  1 +
 ui/cli/Makefile.am | 30 ++++++++----------------------
 ui/gtk/Makefile.am |  8 +++-----
 ui/qt/Makefile.am  |  8 +++-----
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/ui/Makefile.am b/ui/Makefile.am
index abbaafeaa2..9f64a2e2a4 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -133,6 +133,7 @@ WIRESHARK_UI_INCLUDES = \
 	tap-rtp-common.h	\
 	tap-sctp-analysis.h	\
 	tap-tcp-stream.h	\
+	taps.h			\
 	text_import.h		\
 	text_import_scanner.h	\
 	time_shift.h		\
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index 0f6c0708b9..b628d09e82 100644
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -26,21 +26,10 @@ 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 = \
+# Generated files not in the distribution.
+NODIST_GENERATED_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		\
@@ -83,19 +72,16 @@ noinst_HEADERS = \
 
 # 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)
+	$(TSHARK_TAP_SRC)
 
-libcliui_a_DEPENDENCIES =
+nodist_libcliui_a_SOURCES = \
+	$(NODIST_GENERATED_FILES)
 
 EXTRA_DIST = \
-	.editorconfig		\
-	$(GENERATOR_FILES)
+	.editorconfig
 
-MAINTAINERCLEANFILES = \
-	$(GENERATED_FILES)
+DISTCLEANFILES = \
+	$(NODIST_GENERATED_FILES)
 
 tshark-tap-register.c: $(TSHARK_TAP_SRC) ../make-taps
 	$(AM_V_GEN)../make-taps $@ $(filter %.c,$^)
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 035a00f29a..391a47763c 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -23,11 +23,11 @@ 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_FILES =
 
 # Generated C source files that we don't want in the distribution.
-NODIST_GENERATED_FILES =
+NODIST_GENERATED_FILES = \
+	wireshark-tap-register.c
 
 # Files that generate compileable files
 GENERATOR_FILES = \
@@ -308,8 +308,6 @@ nodist_libgtkui_a_SOURCES = \
 	$(NODIST_GENERATED_FILES)	\
 	$(BUILD_PIXBUF_CSOURCE)
 
-libgtkui_a_DEPENDENCIES =
-
 wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../make-taps
 	$(AM_V_GEN)../make-taps $@ $(filter %.c,$^)
 
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 17648862f3..b7396547eb 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -121,11 +121,11 @@ NODIST_GENERATED_HEADER_FILES = \
 	ui_wireless_frame.h
 
 # Generated C source files that we want in the distribution.
-GENERATED_C_FILES = \
-	wireshark-tap-register.c
+GENERATED_C_FILES =
 
 # Generated C source files that we don't want in the distribution.
-NODIST_GENERATED_C_FILES =
+NODIST_GENERATED_C_FILES = \
+	wireshark-tap-register.c
 
 # Generated C++ source files that we want in the distribution.
 GENERATED_CPP_FILES =
@@ -707,8 +707,6 @@ nodist_libqtui_a_SOURCES = \
 	$(NODIST_GENERATED_CPP_FILES)	\
 	$(NODIST_GENERATED_HEADER_FILES)
 
-libqtui_a_DEPENDENCIES =
-
 CLEANFILES = \
 	*.moc.cpp			\
 	qrc_*.cpp			\
-- 
cgit v1.2.3