Move the list of headers to "Makefile.am" (it's not used by

"Makefile.nmake"), and rename it to "noinst_HEADERS", as that's what
automake requires.

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3c1910c3ea4e73bea045e5329b44e654a414778a..e32df807c0468671fae796be88ff41412c26c559 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for the GTK interface routines for Ethereal
 #
-# $Id: Makefile.am,v 1.88 2004/01/22 18:08:58 ulfl Exp $
+# $Id: Makefile.am,v 1.89 2004/01/22 20:31:44 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -33,17 +33,64 @@ ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) $(top_srcdir)/make-tapreg-dotc
        @echo Making ethereal-tap-register.c
        @$(top_srcdir)/make-tapreg-dotc ethereal-tap-register.c $(srcdir) $(ETHEREAL_TAP_SRC)
 
+noinst_HEADERS = \
+       capture_combo_utils.h \
+       capture_dlg.h   \
+       capture_prefs.h \
+       color_dlg.h     \
+       color_filters.h \
+       color_utils.h   \
+       colors.h        \
+       column_prefs.h  \
+       compat_macros.h \
+       decode_as_dlg.h \
+       dfilter_expr_dlg.h \
+       dlg_utils.h     \
+       endpoint_talkers_table.h \
+       file_dlg.h      \
+       filter_prefs.h  \
+       find_dlg.h      \
+       follow_dlg.h    \
+       goto_dlg.h      \
+       gtkglobals.h    \
+       gtk_stat_util.h \
+       gui_prefs.h     \
+       help_dlg.h      \
+       keys.h          \
+       main.h          \
+       menu.h          \
+       nameres_prefs.h \
+       packet_list.h   \
+       packet_win.h    \
+       prefs_dlg.h     \
+       print_prefs.h   \
+       proto_dlg.h     \
+       proto_draw.h    \
+       proto_hier_stats_dlg.h  \
+       recent.h        \
+       rtp_analysis.h  \
+       rtp_stream.h    \
+       rtp_stream_dlg.h \
+       service_response_time_table.h   \
+       stream_prefs.h  \
+       summary_dlg.h   \
+       supported_protos_dlg.h   \
+       tap_dfilter_dlg.h \
+       tcp_graph.h     \
+       toolbar.h       \
+       ui_util.h
+
 if USE_GTK2
 libui_a_SOURCES = \
        $(ETHEREAL_GTK_SRC) \
-       $(noinst_GTK_HEADERS) \
+       $(noinst_HEADERS) \
        $(ETHEREAL_TAP_SRC)
 else
 libui_a_SOURCES = \
        ethclist.c      \
        ethclist.h      \
        $(ETHEREAL_GTK_SRC) \
-       $(noinst_GTK_HEADERS) \
+       $(noinst_HEADERS) \
        $(ETHEREAL_TAP_SRC)
 endif
 

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index d9025e93465a1ad9e2549f7d859bca535bea9585..b3919706f142c4c7d8a8d3fb468ba580db61cd07 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -105,52 +105,3 @@ ETHEREAL_TAP_SRC = \
        rtp_analysis.c  \
        rtp_stream_dlg.c \
        wsp_stat.c
-
-
-noinst_GTK_HEADERS = \
-       capture_combo_utils.h \
-       capture_dlg.h   \
-       capture_prefs.h \
-       color_dlg.h     \
-       color_filters.h \
-       color_utils.h   \
-       colors.h        \
-       column_prefs.h  \
-       compat_macros.h \
-       decode_as_dlg.h \
-       dfilter_expr_dlg.h \
-       dlg_utils.h     \
-       endpoint_talkers_table.h \
-       file_dlg.h      \
-       filter_prefs.h  \
-       follow_dlg.h    \
-       find_dlg.h      \
-       gtkglobals.h    \
-       goto_dlg.h      \
-       gtk_stat_util.h \
-       gui_prefs.h     \
-       help_dlg.h      \
-       keys.h          \
-       main.h          \
-       menu.h          \
-       nameres_prefs.h \
-       packet_list.h   \
-       packet_win.h    \
-       prefs_dlg.h     \
-       print_prefs.h   \
-       proto_dlg.h     \
-       proto_draw.h    \
-       proto_hier_stats_dlg.h  \
-       recent.h        \
-       rtp_analysis.h  \
-       rtp_stream.h    \
-       rtp_stream_dlg.h \
-       service_response_time_table.h   \
-       stream_prefs.h  \
-       summary_dlg.h   \
-       supported_protos_dlg.h   \
-       tap_dfilter_dlg.h \
-       tcp_graph.h     \
-       toolbar.h       \
-       ui_util.h
-