diff options
author | Joerg Mayer <jmayer@loplof.de> | 2014-08-12 23:30:16 +0200 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2014-08-12 21:31:34 +0000 |
commit | 65ac652a07bf4c1cd0748e3f19c5215c9f1341bd (patch) | |
tree | 446da214ba0026aa3201439ab00465832f83ba26 /plugins/m2m | |
parent | 433eeda109bdd5e4ed3860d13ea67e357befae6b (diff) |
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>
Diffstat (limited to 'plugins/m2m')
-rw-r--r-- | plugins/m2m/Makefile.am | 16 |
1 files changed, 4 insertions, 12 deletions
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 |