diff options
32 files changed, 9 insertions, 130 deletions
diff --git a/Makefile.am b/Makefile.am index 7e54f517cf..6b9bfc5ba9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -771,7 +771,6 @@ services: $(PYTHON) $(srcdir)/tools/make-services.py CLEANFILES = \ - *~ \ doxygen-core.tag \ vgcore.* diff --git a/capchild/Makefile.am b/capchild/Makefile.am index 7bc18b3c9f..981c797e05 100644 --- a/capchild/Makefile.am +++ b/capchild/Makefile.am @@ -39,9 +39,7 @@ EXTRA_DIST = \ doxygen.cfg.in CLEANFILES = \ - doxygen-capchild.tag \ - libcapchild.a \ - *~ + doxygen-capchild.tag doxygen: if HAVE_DOXYGEN diff --git a/caputils/Makefile.am b/caputils/Makefile.am index 20e5614705..c1ab82f1ce 100644 --- a/caputils/Makefile.am +++ b/caputils/Makefile.am @@ -51,9 +51,7 @@ libcaputils_a_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS) libcaputils_a_DEPENDENCIES = CLEANFILES = \ - doxygen-caputils.tag \ - libcaputils.a \ - *~ + doxygen-caputils.tag EXTRA_DIST = \ .editorconfig \ diff --git a/codecs/Makefile.am b/codecs/Makefile.am index e3eb95adc0..afb6e53d02 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -78,10 +78,6 @@ EXTRA_DIST = \ CMakeLists.txt \ speex/README.txt -CLEANFILES = \ - libwscodec.la \ - *~ - checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ -sourcedir=$(srcdir) \ diff --git a/epan/Makefile.am b/epan/Makefile.am index eef075df03..2632cb9a8c 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -370,12 +370,7 @@ EXTRA_DIST = \ print.ps CLEANFILES = \ - doxygen-epan.tag \ - libwireshark.a \ - libwireshark.la \ - libwireshark_generated.a \ - libwireshark_generated.la \ - *~ + doxygen-epan.tag DISTCLEANFILES = \ $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \ diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index 5603d09585..25df09d72a 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -54,11 +54,6 @@ EXTRA_DIST = \ CMakeLists.txt \ CMakeListsCustom.txt.example -CLEANFILES = \ - libairpdcap.a \ - libairpdcap.la \ - *~ - checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ -sourcedir=$(srcdir) \ diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 413dac7c0d..b3880f3f3b 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -131,13 +131,6 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ CMakeLists.txt -CLEANFILES = \ - libdfilter.a \ - libdfilter.la \ - libdfilter_generated.a \ - libdfilter_generated.la \ - *~ - DISTCLEANFILES = \ grammar.out \ $(NODIST_GENERATED_FILES) diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index cbfe2bbb05..8f618c3cc7 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -1953,12 +1953,7 @@ dissectors.c: $(plugin_src) $(ALL_DISSECTORS_SRC) Custom.common \ dissectors $(ALL_DISSECTORS_SRC) ; CLEANFILES = \ - libdissectors.a \ - libdissectors.la \ - libdirtydissectors.a \ - libdirtydissectors.la \ - dissectors-cache.pkl \ - *~ + dissectors-cache.pkl DISTCLEANFILES = \ $(NODIST_GENERATED_FILES) diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index 5359c0dfe7..fa35c12581 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -50,11 +50,6 @@ EXTRA_DIST = \ .editorconfig \ CMakeLists.txt -CLEANFILES = \ - libftypes.a \ - libftypes.la \ - *~ - checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ -sourcedir=$(srcdir) \ diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index 8228707b13..4c9192b895 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -81,11 +81,6 @@ wmem_test_LDADD = \ test-programs: wmem_test -CLEANFILES = \ - libwmem.a \ - libwmem.la \ - *~ - EXTRA_DIST = \ CMakeLists.txt diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 0c473f7668..609a43f50b 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -80,9 +80,6 @@ dist_pkgdata_DATA = \ nodist_pkgdata_DATA = \ init.lua -CLEANFILES = \ - *~ - DISTCLEANFILES = \ $(BUILT_SOURCES) \ taps.txt \ diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 84c966a008..30462edb11 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -62,10 +62,6 @@ docsis_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) docsis_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - docsis \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index 3605caffdc..d05cb72b11 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -69,10 +69,6 @@ ethercat_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) ethercat_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - ethercat \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 0cc60840ae..b114653f40 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -58,10 +58,6 @@ gryphon_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) gryphon_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - gryphon \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index a477f539aa..0435845931 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -60,10 +60,6 @@ irda_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) irda_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - irda \ - *~ - DISTCLEANFILES = \ $(NODIST_SRC_FILES) \ $(NODIST_HEADER_FILES) \ diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 63cf870735..f894233d8b 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -92,10 +92,6 @@ mate_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) mate_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - mate \ - *~ - DISTCLEANFILES = \ mate_grammar.out \ $(NODIST_SRC_FILES) \ diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index af3ab23435..bc2d383486 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -82,10 +82,6 @@ opcua_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) opcua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - opcua \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/pluginifdemo/Makefile.am index 020dad7aff..efe26b8642 100644 --- a/plugins/pluginifdemo/Makefile.am +++ b/plugins/pluginifdemo/Makefile.am @@ -58,10 +58,6 @@ pluginifdemo_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) pluginifdemo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - pluginifdemo \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index 7bbfe6c618..ef59001ca8 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -68,10 +68,6 @@ profinet_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) profinet_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - profinet \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 6ead2f4393..91f4bd7bc7 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -49,10 +49,6 @@ stats_tree_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) stats_tree_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - stats_tree \ - *~ - EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/transum/Makefile.am b/plugins/transum/Makefile.am index 05b3dfcdd3..c058b98467 100644 --- a/plugins/transum/Makefile.am +++ b/plugins/transum/Makefile.am @@ -63,10 +63,6 @@ transum_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) transum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - transum \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 783277cfc2..13f6655b52 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -67,10 +67,6 @@ unistim_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) unistim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - unistim \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index 748c76b4ec..0dc0d90d02 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -107,10 +107,6 @@ wimax_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) wimax_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - wimax \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index ccc20edc89..001fd4b86f 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -77,10 +77,6 @@ wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - wimaxasncp \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index 7a7d2751ea..b145943dc4 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -58,10 +58,6 @@ wimaxmacphy_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) wimaxmacphy_la_LDFLAGS = $(PLUGIN_LDFLAGS) -CLEANFILES = \ - wimaxmacphy \ - *~ - DISTCLEANFILES = \ plugin.c diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am index 6ae2864acb..29f2d033f3 100644 --- a/tools/lemon/Makefile.am +++ b/tools/lemon/Makefile.am @@ -36,9 +36,6 @@ AM_CFLAGS = $(WS_CFLAGS_FOR_BUILD) noinst_PROGRAMS = lemon -CLEANFILES = \ - *~ - EXTRA_DIST = \ cppmagic.h \ lemon.html \ diff --git a/ui/Makefile.am b/ui/Makefile.am index 1235c47e62..8f278d42d2 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -168,10 +168,7 @@ BUILT_SOURCES = $(GENERATED_HEADER_FILES) libui_a_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS) CLEANFILES = \ - doxygen-ui.tag \ - libui.a \ - libui_generated.a \ - *~ + doxygen-ui.tag MAINTAINERCLEANFILES = \ $(GENERATED_FILES) diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index 1172399a76..02b1ffbd2c 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -95,10 +95,8 @@ EXTRA_DIST = \ $(GENERATOR_FILES) CLEANFILES = \ - libcliui.a \ tshark-tap-register.c-tmp \ - tshark-tap-register-cache.pkl \ - *~ + tshark-tap-register-cache.pkl MAINTAINERCLEANFILES = \ $(GENERATED_FILES) diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index 04698e4d8e..14e375df3c 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -270,10 +270,8 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GTK_CFLAGS) \ $(PORTAUDIO_INCLUDES) CLEANFILES = \ - libgtkui.a \ wireshark-tap-register.c-tmp \ - wireshark-tap-register-cache.pkl \ - *~ + wireshark-tap-register-cache.pkl DISTCLEANFILES = \ $(NODIST_GENERATED_FILES) diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index eca7868386..3d071657c1 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -717,13 +717,11 @@ nodist_libqtui_a_SOURCES = \ libqtui_a_DEPENDENCIES = CLEANFILES = \ - libqtui.a \ wireshark-tap-register.c-tmp \ wireshark-tap-register-cache.pkl \ *.moc.cpp \ qrc_*.cpp \ - ui_*.h \ - *~ + ui_*.h DISTCLEANFILES = \ $(NODIST_GENERATED_FILES) \ diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 9e117c75a3..71be63a3f8 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -207,13 +207,6 @@ subpkgincludedir = $(pkgincludedir)/wiretap subpkginclude_HEADERS = $(PUBLIC_HEADER_FILES) -CLEANFILES = \ - libwiretap.a \ - libwiretap.la \ - libwiretap_generated.a \ - libwiretap_generated.la \ - *~ - DISTCLEANFILES = \ version_info.c diff --git a/writecap/Makefile.am b/writecap/Makefile.am index 75e7dc8f87..b3e5cf6122 100644 --- a/writecap/Makefile.am +++ b/writecap/Makefile.am @@ -26,9 +26,7 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) noinst_LIBRARIES = libwritecap.a CLEANFILES = \ - doxygen-writecap.tag \ - libwritecap.a \ - *~ + doxygen-writecap.tag EXTRA_DIST = \ .editorconfig \ |