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/cli/Makefile.nmake | |
| parent | a4a94af0f7c223c95eb1601054b62ecd0e16c61a (diff) | |
| download | wireshark-dc748b1e7f1fc5c8e84966844a5185dd3ac5a0f2.tar.gz | |
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/cli/Makefile.nmake')
| -rw-r--r-- | ui/cli/Makefile.nmake | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake index 2fe092f7a8..b0b9c95646 100644 --- a/ui/cli/Makefile.nmake +++ b/ui/cli/Makefile.nmake @@ -40,27 +40,13 @@ libcliui.lib : ..\..\config.h $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj # # We do this by grepping through sources. # -# 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. -# # Formatting conventions: The name of the tap_listener_register_* # routines must start in column zero, or must be preceded only by # "void " starting in column zero, and must not be inside #if. # -!IFDEF PYTHON tshark-tap-register.c: $(TSHARK_TAP_SRC) ..\..\tools\make-tap-reg.py - @echo Making tshark-tap-register.c using python - @$(PYTHON) ..\..\tools\make-tap-reg.py . tshark-taps $(TSHARK_TAP_SRC) -!ELSE -# The first argument is the name of the file to write. -# The second argument is the directory in which the source files live. -# All subsequent arguments are the files to scan. -tshark-tap-register.c: $(TSHARK_TAP_SRC) ..\..\tools\make-tapreg-dotc @echo Making tshark-tap-register.c - @$(SH) ../../tools/make-tapreg-dotc tshark-tap-register.c . $(TSHARK_TAP_SRC) -!ENDIF + @$(PYTHON) ..\..\tools\make-tap-reg.py . tshark-taps $(TSHARK_TAP_SRC) clean: rm -f $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj libcliui.lib *.pdb \ |