Don't generate the conformance file for exported types when building the

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

diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index 39d7b193b51aaa8c7faac15af653371a8287903a..e5159e680d6bc7171a03d3d26ee4139e6e7f7961 100644 (file)
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -66,7 +66,7 @@ $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
 
 # Don't clean these up until/unless we start building them...
 #              $(DISSECTOR) \
-#              $(DISSECTOR_HEADER) \
+#              $(DISSECTOR_HEADER)
 clean:
        rm -f parsetab.py \
                parsetab.pyc \
@@ -83,18 +83,6 @@ maintainer-clean: distclean
 # Stuff included from template and "cnf" files has "\r\n" on windows, while
 # the generated stuff has "\n".
 
-fix_eol: generate_dissector
-       u2d $(DISSECTOR_FILES)
+fix_eol: $(DISSECTOR)
+       u2d $(DISSECTOR) $(DISSECTOR_HEADER)
 
-copy_files: generate_dissector
-   @<<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
-<<