From Clemens Auer:

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

diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index 7ca91b243854b61abf64c96700644bf6ce9ba908..76e320e10780757597521c488a9075249c693a2c 100644 (file)
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -21,13 +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
-
-
-
-all: generate_dissector
-
 generate_dissector: $(DISSECTOR_FILES)
 
 generate_export: $(EXPORT_FILES)
@@ -36,13 +29,14 @@ generate_export: $(EXPORT_FILES)
 PROTO_OPT = -p $(PROTOCOL_NAME)
 !ENDIF
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF)
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
 !IFDEF PYTHON
        $(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
@@ -50,12 +44,13 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CN
 !ENDIF
 
 !IFDEF EXPORT_FILES
-$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
+$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
 !IFDEF PYTHON
        $(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
@@ -81,18 +76,17 @@ maintainer-clean: distclean
 # the generated stuff has "\n".
 
 fix_eol: generate_dissector
-       move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp
-       $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
-       del /f packet-$(PROTOCOL_NAME).c.tmp 
-!IFDEF NEED_PACKET_PROTO_H
-       move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp
-       $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h
-       del /f packet-$(PROTOCOL_NAME).h.tmp
-!ENDIF
+       u2d $(DISSECTOR_FILES)
 
 copy_files: generate_dissector
-       xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
-!IFDEF NEED_PACKET_PROTO_H
-       xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
-!ENDIF
-
+   @<<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
+<<