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 <guy@alum.mit.edu>

diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 996194367e9c50de9d0757ca51219416a2d06176..5c9407f553f7f36014bc4330ab5ab26d95fc2d03 100644 (file)
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -1951,6 +1951,9 @@ CLEANFILES = \
        $(GENERATED_HEADER_FILES)       \
        *~
 
+DISTCLEANFILES = \
+       register.c
+
 MAINTAINERCLEANFILES = \
        $(GENERATED_FILES)      \
        Makefile.in

diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index eb2267c54f56d01dcf2aa61efb8d0d5a96a41f78..5415c6800fba34adcbd1e9a338512db0504638b1 100644 (file)
--- 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 c1bedc99e8991359577985bbfdcb8a9b00527bbc..ba9c1a128f7f890c3dc5f505995c9545f1787a23 100644 (file)
--- 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 f1896282c6d832130c183c081a5a128443a1c73e..ceae1785f27bacc0fa344b6efd8df969649bc309 100644 (file)
--- 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 afbec5f504b635a7155468a2fa08b746b4764502..e393065c9e66e60be7921676b1f7d94ca8e1f2df 100644 (file)
--- 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 e1aa3e88edf24cae60c12ca51b9daa45dc2b20f6..de249f93a1ddff17fb807c892286feb96e9284b2 100644 (file)
--- 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 a3fa4c6042efcead5cdeb8bdef689c9f5642e852..c791e4e7031c9011a4ae5239764893a49c5843ba 100644 (file)
--- 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 391635319c7c702ef5c48d5ea4696e2a87db67e1..2a17cf9dd176d8595734a8ae51d095ebaafda491 100644 (file)
--- 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 f2311806a26a31ac01de49c9672243a68f6afda6..23aaaabff705a401651fce73b703286d5668e582 100644 (file)
--- 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 b48d696bb5d57fb44984b6a5d22aa1ce75b37ef0..f1befd5338ba77c5fd9e1ff8b8f093858eaeceee 100644 (file)
--- 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 9cc6afb30b813b7a100eedfe21a240a8572084db..da2bb2dabd54779c5117e7d579b380c9ed7ae5f5 100644 (file)
--- 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 df5f4d7e363586c91d27c9e737288ec08e2d2508..a3d1d90ee23cee2f0ec051e139917954e7f9620c 100644 (file)
--- 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 5cfaa06276b6ad174e63b148648cd6bf90bf3ade..6cdba866ad8ef5f0a6899f3dfb30f5a9854772f4 100644 (file)
--- 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 d86ca72aa8532090e2895b93a1f4c1fa3def6b96..664f79b43fe24562053cc56add2204290cdaf88f 100644 (file)
--- 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 c4d79a08ce1c9cb9ef9b5db24b88edab4354c083..357685db7f558f82b970cb82b1e4efbd1fff7eef 100644 (file)
--- 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