Remove make-dissector-reg and require python for autotool builds as well

Change-Id: I6239063a08ba37199a4e95302a3650a80544c750
Reviewed-on: https://code.wireshark.org/review/3562
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

13 files changed, 52 insertions, 156 deletions

diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index f7d4401fc1..643d08c336 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index bc2d65cc97..bb38dca2e5 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
index 2cfe58d70b..a08336841d 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/ethercat/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index 67cd086582..4526d9e4f8 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -83,18 +83,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 5af7e9cf2a..47382400af 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am
index 15b665e1ff..35e00e349b 100644
--- a/plugins/m2m/Makefile.am
+++ b/plugins/m2m/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 87e0ad8e3d..0d334114b2 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -88,18 +88,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
index 4c32a3eccd..cc156aed07 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/opcua/Makefile.am
@@ -82,18 +82,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 719ed9cf8c..31561ac1f2 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
index 929ca44251..d6dd694354 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/unistim/Makefile.am
@@ -82,18 +82,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
index 16544e089f..8b41395b9c 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/wimax/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index 49fad9d261..f8715de379 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/wimaxasncp/Makefile.am
@@ -84,18 +84,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am
index a78814bb0c..7919fcfc9e 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/wimaxmacphy/Makefile.am
@@ -81,18 +81,10 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(REGISTER_SRC_FILES) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(REGISTER_SRC_FILES) ; \
-	fi
-
+plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py
+	echo Making plugin.c with python ; \
+	$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		plugin $(REGISTER_SRC_FILES) ;
 #
 # Currently plugin.c can be included in the distribution because
 # we always build all protocol dissectors. We used to have to check