Fix make distcheck

Change-Id: I0c5a31d423d19071dc6ed0a42b064271e5f63fd2
Reviewed-on: https://code.wireshark.org/review/24769
Reviewed-by: João Valverde <j@v6e.pt>

diff --git a/ui/Makefile.am b/ui/Makefile.am
index abbaafeaa26f0f5ec435f8216a501db94c6472b5..9f64a2e2a42f4622537b727e991171a74aebc448 100644 (file)
--- 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 0f6c0708b9544a8ae2ceb3be5dfd11abbb8a4967..b628d09e82ed0fd832ea138be0ffcdef441e5003 100644 (file)
--- 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 035a00f29a660610f69edeb66b5be7eea628931f..391a47763c12288e291b176d9a77ccd1aeca5f57 100644 (file)
--- 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 17648862f39b2c4d847eabe849b10608a10dec57..b7396547ebc7272c7c6bd6025eb0ed928dada3c7 100644 (file)
--- 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                       \