Corrected "old-style function definition".

[obnox/wireshark/wip.git] / asn1 / Makefile.inc.nmake

diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index a091dc9a78fb65451838200921f0467a57ddb122..76e320e10780757597521c488a9075249c693a2c 100644 (file)
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -21,10 +21,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
-UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
-
-
 generate_dissector: $(DISSECTOR_FILES)
 
 generate_export: $(EXPORT_FILES)
@@ -38,8 +34,9 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
        $(PYTHON) "../../tools/asn2wrs.py" \
                $(A2W_FLAGS) \
                $(PROTO_OPT) \
-               -c $(PROTOCOL_NAME).cnf \
-               -s packet-$(PROTOCOL_NAME)-template \
+               -c ./$(PROTOCOL_NAME).cnf \
+               -s ./packet-$(PROTOCOL_NAME)-template \
+               -D . \
                $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
 !ELSE
        @echo Error: You need Python to use asn2wrs.py
@@ -52,7 +49,8 @@ $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
        $(PYTHON) "../../tools/asn2wrs.py" \
                -E $(A2W_FLAGS) \
                $(PROTO_OPT) \
-               -c $(PROTOCOL_NAME).cnf \
+               -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
@@ -78,17 +76,17 @@ maintainer-clean: distclean
 # the generated stuff has "\n".
 
 fix_eol: generate_dissector
-   <<fix_file.bat
-IF "%1"=="" EXIT
-move %1 %1.tmp
-$(UNIX2DOS) < %1.tmp > %1
-       del /f %1.tmp 
-<<
-   <<fix_eol.bat
-FOR %%A IN ($(DISSECTOR_FILES)) DO CALL fix_file.bat %%A
-<<
+       u2d $(DISSECTOR_FILES)
 
 copy_files: generate_dissector
-   <<copy_files.bat
-FOR %%A IN ($(DISSECTOR_FILES)) DO xcopy %%A ..\..\epan\dissectors/d /y
+   @<<copy_files.bat
+@FOR %%A IN ($(DISSECTOR_FILES)) DO xcopy %%A ..\..\epan\dissectors /d /y
+<<
+
+compare_files: generate_dissector
+   @<<compare_files.bat
+@setlocal
+@set CYGWIN=%CYGWIN% nodosfilewarning
+@FOR %%A IN ($(DISSECTOR_FILES)) DO @diff -U 0 -I '\^#line' -I '[[:blank:]]\*[[:blank:]]\^$Id:[[:blank:]]' ..\..\epan\dissectors\%%A %%A
+@exit /b 0
 <<