summaryrefslogtreecommitdiff
path: root/asn1
diff options
context:
space:
mode:
authorРоман Донченко <dpb@corrigendum.ru>2014-08-03 23:47:42 +0400
committerEvan Huus <eapache@gmail.com>2014-08-09 20:23:39 +0000
commitdc748b1e7f1fc5c8e84966844a5185dd3ac5a0f2 (patch)
tree080ac7bbabbf6ebb09f38efe690ac334999c0eb5 /asn1
parenta4a94af0f7c223c95eb1601054b62ecd0e16c61a (diff)
downloadwireshark-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 'asn1')
-rw-r--r--asn1/Makefile.inc.nmake10
1 files changed, 0 insertions, 10 deletions
diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index e47c81a8fc..7e0ae10a80 100644
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -32,7 +32,6 @@ PROTO_OPT = -p $(PROTOCOL_NAME)
!ENDIF
$(DISSECTOR): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
-!IFDEF PYTHON
$(PYTHON) "../../tools/asn2wrs.py" \
$(A2W_FLAGS) \
$(PROTO_OPT) \
@@ -41,24 +40,15 @@ $(DISSECTOR): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
-D . \
-O ../../epan/dissectors \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
-!ELSE
- @echo Error: You need Python to use asn2wrs.py
- @exit 1
-!ENDIF
!IFDEF EXPORT_FILES
$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXPORT_DEPENDS)
-!IFDEF PYTHON
$(PYTHON) "../../tools/asn2wrs.py" \
-E $(A2W_FLAGS) \
$(PROTO_OPT) \
-c ./$(PROTOCOL_NAME).cnf \
-D . \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
-!ELSE
- @echo Error: You need Python to use asn2wrs.py
- @exit 1
-!ENDIF
!ENDIF
# Don't clean these up until/unless we start building them...