From dc748b1e7f1fc5c8e84966844a5185dd3ac5a0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=94=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Sun, 3 Aug 2014 23:47:42 +0400 Subject: Now that Python is mandatory on Windows, remove checks for it from nmakefiles Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus --- plugins/wimaxmacphy/Makefile.nmake | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'plugins/wimaxmacphy') diff --git a/plugins/wimaxmacphy/Makefile.nmake b/plugins/wimaxmacphy/Makefile.nmake index 0b4139a4ce..194d54337c 100644 --- a/plugins/wimaxmacphy/Makefile.nmake +++ b/plugins/wimaxmacphy/Makefile.nmake @@ -65,25 +65,14 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU # reason. # # Therefore, we use a script to generate the register.c file. -# There are two versions of the script, a shell and a Python version. -# The Python script runs faster, since it uses caching to speed up -# repeated runs and doesn't invoke external processes, so we prefer -# that if Python is available. -# # The first argument is the directory in which the source files live. # The second argument is "plugin", to indicate that we should build # a plugin.c file for a plugin. # All subsequent arguments are the files to scan. # -!IFDEF PYTHON plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c (using python) + @echo Making plugin.c @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) -!ELSE -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg - @echo Making plugin.c (using sh) - @$(SH) ../../tools/make-dissector-reg . plugin $(REGISTER_SRC_FILES) -!ENDIF !ENDIF -- cgit v1.2.1