diff options
| author | Роман Донченко <dpb@corrigendum.ru> | 2014-08-03 23:47:42 +0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-08-09 20:23:39 +0000 |
| commit | dc748b1e7f1fc5c8e84966844a5185dd3ac5a0f2 (patch) | |
| tree | 080ac7bbabbf6ebb09f38efe690ac334999c0eb5 /ui/gtk/Makefile.nmake | |
| parent | a4a94af0f7c223c95eb1601054b62ecd0e16c61a (diff) | |
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 <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui/gtk/Makefile.nmake')
| -rw-r--r-- | ui/gtk/Makefile.nmake | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index d74f35b1ab..ace0823080 100644 --- a/ui/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake @@ -84,25 +84,14 @@ wsiconcap.h: for %n in (16 24 32 48 64) do \ gdk-pixbuf-csource --raw --name=wsiconcap_%n_pb_data ../../image/wsiconcap%n.png >> $@ -# The shell script runs slowly, as multiple greps and seds are run -# for each input file; this is especially slow on Windows. Therefore, -# if Python is present (as indicated by PYTHON being defined), we run -# a faster Python script to do that work instead. -# # 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 wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../../tools/make-tap-reg.py - @echo Making wireshark-tap-register.c (using python) - @$(PYTHON) "../../tools/make-tap-reg.py" . taps $(WIRESHARK_TAP_SRC) -!ELSE -wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../../tools/make-tapreg-dotc Makefile.common @echo Making wireshark-tap-register.c - @$(SH) ../../tools/make-tapreg-dotc wireshark-tap-register.c . $(WIRESHARK_TAP_SRC) -!ENDIF + @$(PYTHON) "../../tools/make-tap-reg.py" . taps $(WIRESHARK_TAP_SRC) !IF "$(PORTAUDIO_VERSION)" == "18" pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c |