From 581db4c2b82601a93023fb3ce214b4171d7e14d9 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 16 Apr 2017 01:23:16 -0700 Subject: Get rid of some generated files with "make distclean". register.c, and the plugin.c for various plugins, are generated by tools that must be available to do a build, and aren't distributed as part of the source tarball. That means "make distclean" should remove them. Do so. Change-Id: I9e37abdafb50234cf1ebb5fb828446e45e605d78 Reviewed-on: https://code.wireshark.org/review/21125 Reviewed-by: Guy Harris --- plugins/docsis/Makefile.am | 6 ++++-- plugins/ethercat/Makefile.am | 6 ++++-- plugins/gryphon/Makefile.am | 6 ++++-- plugins/irda/Makefile.am | 6 +++--- plugins/m2m/Makefile.am | 6 ++++-- plugins/mate/Makefile.am | 6 +++--- plugins/opcua/Makefile.am | 6 ++++-- plugins/pluginifdemo/Makefile.am | 6 ++++-- plugins/profinet/Makefile.am | 6 ++++-- plugins/transum/Makefile.am | 6 ++++-- plugins/unistim/Makefile.am | 6 ++++-- plugins/wimax/Makefile.am | 6 ++++-- plugins/wimaxasncp/Makefile.am | 6 ++++-- plugins/wimaxmacphy/Makefile.am | 6 ++++-- 14 files changed, 54 insertions(+), 30 deletions(-) (limited to 'plugins') diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index eb2267c54f..5415c6800f 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -105,10 +105,12 @@ CLEANFILES = \ docsis \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ README \ diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index c1bedc99e8..ba9c1a128f 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -68,10 +68,12 @@ CLEANFILES = \ ethercat \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index f1896282c6..ceae1785f2 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -57,10 +57,12 @@ CLEANFILES = \ gryphon \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index afbec5f504..e393065c9e 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -61,13 +61,13 @@ CLEANFILES = \ DISTCLEANFILES = \ $(NODIST_SRC_FILES) \ - $(NODIST_HEADER_FILES) + $(NODIST_HEADER_FILES) \ + plugin.c MAINTAINERCLEANFILES = \ Makefile.in \ $(GENERATED_SRC_FILES) \ - $(GENERATED_HEADER_FILES) \ - plugin.c + $(GENERATED_HEADER_FILES) EXTRA_DIST = \ plugin.rc.in \ diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index e1aa3e88ed..de249f93a1 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -52,10 +52,12 @@ CLEANFILES = \ m2m \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index a3fa4c6042..c791e4e703 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -98,13 +98,13 @@ CLEANFILES = \ DISTCLEANFILES = \ mate_grammar.out \ $(NODIST_SRC_FILES) \ - $(NODIST_HEADER_FILES) + $(NODIST_HEADER_FILES) \ + plugin.c MAINTAINERCLEANFILES = \ Makefile.in \ $(GENERATED_SRC_FILES) \ - $(GENERATED_HEADER_FILES) \ - plugin.c + $(GENERATED_HEADER_FILES) EXTRA_DIST = \ mate_grammar.lemon \ diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 391635319c..2a17cf9dd1 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -81,10 +81,12 @@ CLEANFILES = \ opcua \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ README \ diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/pluginifdemo/Makefile.am index f2311806a2..23aaaabff7 100644 --- a/plugins/pluginifdemo/Makefile.am +++ b/plugins/pluginifdemo/Makefile.am @@ -57,10 +57,12 @@ CLEANFILES = \ pluginifdemo \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index b48d696bb5..f1befd5338 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -67,10 +67,12 @@ CLEANFILES = \ profinet \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/transum/Makefile.am b/plugins/transum/Makefile.am index 9cc6afb30b..da2bb2dabd 100644 --- a/plugins/transum/Makefile.am +++ b/plugins/transum/Makefile.am @@ -62,10 +62,12 @@ CLEANFILES = \ transum \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index df5f4d7e36..a3d1d90ee2 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -66,10 +66,12 @@ CLEANFILES = \ unistim \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index 5cfaa06276..6cdba866ad 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -104,10 +104,12 @@ CLEANFILES = \ wimax \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt \ diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index d86ca72aa8..664f79b43f 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -78,11 +78,13 @@ CLEANFILES = \ wimaxasncp \ *~ +DISTCLEANFILES = \ + plugin.c + MAINTAINERCLEANFILES = \ Makefile.in \ $(GENERATED_SRC_FILES) \ - $(GENERATED_HEADER_FILES) \ - plugin.c + $(GENERATED_HEADER_FILES) EXTRA_DIST = \ plugin.rc.in \ diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index c4d79a08ce..357685db7f 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -57,10 +57,12 @@ CLEANFILES = \ wimaxmacphy \ *~ -MAINTAINERCLEANFILES = \ - Makefile.in \ +DISTCLEANFILES = \ plugin.c +MAINTAINERCLEANFILES = \ + Makefile.in + EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt -- cgit v1.2.1