diff options
Diffstat (limited to 'asn1/ess/Makefile.nmake')
-rw-r--r-- | asn1/ess/Makefile.nmake | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/asn1/ess/Makefile.nmake b/asn1/ess/Makefile.nmake index c4b08582a4..acc6e626bf 100644 --- a/asn1/ess/Makefile.nmake +++ b/asn1/ess/Makefile.nmake @@ -4,15 +4,21 @@ include ../../config.nmake -DISSECTOR_FILES=packet-ess.c packet-ess.h +UNIX2DOS=$(PERL) ../../tools/unix2dos.pl + +PROTOCOL_NAME=ess +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ExtendedSecurityServices.asn packet-ess-template.c packet-ess-template.h ess.cnf +$(DISSECTOR_FILES): ../../tools/asn2eth.py ExtendedSecurityServices.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn + $(PYTHON) ../../tools/asn2eth.py -X -b -k -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ExtendedSecurityServices.asn +!ELSE + @echo Error: You need Python to use asn2eth.py + @exit 1 !ENDIF clean: @@ -24,6 +30,19 @@ clean: packet-ess-ett.c \ packet-ess-hf.c -copy_files: generate_dissector - xcopy packet-ess.c ..\..\epan\dissectors /d /y - xcopy packet-ess.h ..\..\epan\dissectors /d /y +# Fix EOL in generated dissectors. Cygwin's python generates files with +# mixed EOL styles, which can't be commited to the SVN repository. +# Stuff included from template and "cnf" files has "\r\n" on windows, while +# the generated stuff has "\n". + +fix_eol: generate_dissector + move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp + move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp + $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c + $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h + del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp + +copy_files: generate_dissector fix_eol + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y + |