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 /epan/dissectors/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 'epan/dissectors/Makefile.nmake')
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 35edf09baf..5266a47da2 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -66,37 +66,19 @@ packet-rrc.obj : packet-rrc.c # 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 "dissectors", to indicate that we should build # a register.c file for libwireshark. # All subsequent arguments are the files to scan. # -register.c: $(ALL_DISSECTORS_SRC) Makefile.common ..\..\tools\make-dissector-reg.py ..\..\tools\make-dissector-reg -!IFDEF PYTHON - @echo Making register.c (using python) +register.c: $(ALL_DISSECTORS_SRC) Makefile.common ..\..\tools\make-dissector-reg.py + @echo Making register.c @$(PYTHON) "../../tools/make-dissector-reg.py" . dissectors $(ALL_DISSECTORS_SRC) -!ELSE - @echo Making register.c (using sh) - @$(SH) ../../tools/make-dissector-reg . dissectors $(ALL_DISSECTORS_SRC) -!ENDIF packet-ncp2222.c: ..\..\tools/ncp2222.py -!IFDEF PYTHON @echo Making packet-ncp2222.c $(PYTHON) "../../tools/ncp2222.py" -o packet-ncp2222.c -!ELSE - @echo Faking packet-ncp2222.c... - @echo Python is required to build the NCP disector - @echo Hiding packet-ncp.c... - mv packet-ncp.c packet-ncp.c.save - touch packet-ncp.c $@ -!ENDIF packet-ncp2222.obj: packet-ncp2222.inc |