We already have GENERATED_HEADER_FILES; use that instead of

GENERATED_H_FILES.

If we have DIRTY_GENERATED_C_FILES, use it the same way we use
GENERATED_C_FILES.

GENERATED_FILES is "everything to nuke on a "make maintainer-clean"",
not "everything to put into the distribution".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41075 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index 163c995fc8ef90bd2b022e054eb867eb250543d2..407aa90d0c287d31f023f11bcf6968b626dfad80 100644 (file)
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -38,8 +38,6 @@ MAINTAINERCLEANFILES = \
        $(GENERATED_FILES)      \
        Makefile.in
 
-RUNLEX=$(top_srcdir)/tools/runlex.sh
-
 #
 # Build "tshark-tap-register.c", which contains a function
 # "register_all_tap_listeners()"
@@ -58,11 +56,12 @@ tshark-tap-register.c: $(TSHARK_TAP_SRC) $(top_srcdir)/tools/make-tapreg-dotc
        @echo Making tshark-tap-register.c
        @$(top_srcdir)/tools/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
 
+# All sources that should be put in the source distribution tarball
 libcliui_a_SOURCES = \
-       $(GENERATED_C_FILES) \
-       $(GENERATED_H_FILES) \
+       $(TSHARK_TAP_SRC) \
        $(noinst_HEADERS) \
-       $(TSHARK_TAP_SRC)
+       $(GENERATED_HEADER_FILES) \
+       $(GENERATED_C_FILES)
 
 libcliui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
 

diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common
index 1602aa7a71968aafdff06b670d56ebb325c4bac7..0a98a5d8d5ce7636f377922c8c611bcaae900846 100644 (file)
--- a/ui/cli/Makefile.common
+++ b/ui/cli/Makefile.common
@@ -30,15 +30,12 @@ GENERATED_HEADER_FILES =
 GENERATED_C_FILES = \
        tshark-tap-register.c
 
-GENERATED_H_FILES =
-
 DIRTY_GENERATED_C_FILES =
 
-# All the generated files we want in the distribution.
+# All the generated files.
 GENERATED_FILES = \
        $(GENERATED_HEADER_FILES) \
        $(GENERATED_C_FILES) \
-       $(GENERATED_H_FILES) \
        $(DIRTY_GENERATED_C_FILES)
 
 # Files that generate compileable files

diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 1b01c736eec994b04c5cde5633382162712f4173..e11c3a5205908013a412265cd72dae9757c70133 100644 (file)
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -63,16 +63,15 @@ wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) $(top_srcdir)/tools/make-tapreg-d
 
 libgtkui_a_SOURCES = \
        $(WIRESHARK_GTK_SRC) \
-       $(GENERATED_C_FILES) \
-       $(GENERATED_H_FILES) \
+       $(WIRESHARK_TAP_SRC) \
        $(noinst_HEADERS) \
-       $(WIRESHARK_TAP_SRC)
+       $(GENERATED_HEADER_FILES) \
+       $(GENERATED_C_FILES)
 
 libgtkui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 libgtkui_a_DEPENDENCIES =
 
-
 libgtkui_dirty_a_SOURCES = \
        $(DIRTY_GENERATED_C_FILES)
 
@@ -128,7 +127,7 @@ pipe_icon.h:
        gdk-pixbuf-csource --raw --name=pipe_pb_data ../../image/toolbar/pipe_16.png >> $@
 
 EXTRA_DIST = \
-       $(GENERATOR_FILES)      \
+       $(GENERATOR_FILES)              \
        airpcap_dlg.c                   \
        airpcap_gui_utils.c             \
        capture_if_details_dlg_win32.c  \

diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index 054908bef272bc923c494904420e35a0f3fbb8c5..5d350d1be9455504f58ae999074e12599b0e5e89 100644 (file)
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -27,23 +27,20 @@
 include Makefile_custom.common
 
 # Generated header files that we want in the distribution.
-GENERATED_HEADER_FILES =
+GENERATED_HEADER_FILES = \
+       text_import_scanner_lex.h
 
 # Generated C source files that we want in the distribution.
 GENERATED_C_FILES = \
        wireshark-tap-register.c
 
-GENERATED_H_FILES = \
-       text_import_scanner_lex.h
-
 DIRTY_GENERATED_C_FILES = \
        text_import_scanner.c
 
-# All the generated files we want in the distribution.
+# All the generated files.
 GENERATED_FILES = \
        $(GENERATED_HEADER_FILES) \
        $(GENERATED_C_FILES) \
-       $(GENERATED_H_FILES) \
        $(DIRTY_GENERATED_C_FILES)
 
 # Files that generate compileable files

diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake
index f1543b2e122d22d641f6b2389a43a3d2cd841a88..8b06f5451551e303f811478e5d2f18205df4e92b 100644 (file)
--- a/ui/gtk/Makefile.nmake
+++ b/ui/gtk/Makefile.nmake
@@ -31,6 +31,7 @@ include Makefile.common
 WIRESHARK_GTK_SRC = \
        $(WIRESHARK_GTK_SRC) \
        $(GENERATED_C_FILES) \
+       $(DIRTY_GENERATED_C_FILES) \
        capture_if_details_dlg_win32.c
 
 PORT_AUDIO_SRC = \
@@ -55,14 +56,12 @@ PORT_AUDIO_SRC = \
        pa_win_wmme.c
 !ENDIF
 
-WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj)
-
-
 WIRESHARK_GTK_OBJECTS = \
        $(WIRESHARK_GTK_SRC:.c=.obj) \
-       $(DIRTY_GENERATED_C_FILES:.c=.obj) \
        $(PORT_AUDIO_SRC:.c=.obj)
 
+WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj)
+
 libgtkui.lib   : ..\..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS)
        link /lib /out:libgtkui.lib $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib