diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-09-07 13:26:23 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-09-07 13:26:23 +0000 |
| commit | adce5ed6a569f05aaaed535cee5e224623349269 (patch) | |
| tree | 3e17edb0ddf81333b090ab63698fcb64517847a0 | |
| parent | cd88fb82d8389c2128334c9747113b509c993541 (diff) | |
Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT. This should fix bug 403.
The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'". They appear to work under XP, but if anything
broke I blame Larry Wall.
svn path=/trunk/; revision=15710
45 files changed, 140 insertions, 135 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 863690ab27..65709d1477 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -360,9 +360,9 @@ gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen gtk2:: help config.h svnversion.h AUTHORS-SHORT if not exist gtk2.tmp mkdir gtk2.tmp cd gtk - xcopy Makefile.* ..\gtk2.tmp /d /y - xcopy *.c ..\gtk2.tmp /d /y - xcopy *.h ..\gtk2.tmp /d /y + xcopy Makefile.* ..\gtk2.tmp /d + xcopy *.c ..\gtk2.tmp /d + xcopy *.h ..\gtk2.tmp /d cd ..\gtk2.tmp $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib cd .. @@ -532,12 +532,12 @@ install-deps: clean-deps install-gtk1-deps install-gtk2-deps install-gtk2-deps: install-required-deps !IFDEF GTK2_DIR - xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll . /d /y - xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll . /d /y - xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll . /d /y - xcopy $(GTK2_DIR)\bin\libatk-1.0-0.dll . /d /y - xcopy $(GTK2_DIR)\bin\libpango-1.0-0.dll . /d /y - xcopy $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll . /d /y + xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll . /d + xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll . /d + xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll . /d + xcopy $(GTK2_DIR)\bin\libatk-1.0-0.dll . /d + xcopy $(GTK2_DIR)\bin\libpango-1.0-0.dll . /d + xcopy $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll . /d mkdir etc mkdir etc\gtk-2.0 mkdir etc\pango @@ -549,37 +549,37 @@ install-gtk2-deps: install-required-deps mkdir lib\pango mkdir lib\pango\$(PANGO_INST_VERSION).0 mkdir lib\pango\$(PANGO_INST_VERSION).0\modules - xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* etc\gtk-2.0 /d /y - xcopy $(GTK2_DIR)\etc\pango\pango.* etc\pango /d /y - xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders\libpixbufloader-*.dll lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders /d /y - xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules\im-*.dll lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules /d /y - xcopy $(GTK2_DIR)\lib\pango\$(PANGO_INST_VERSION).0\modules\pango-*.dll lib\pango\$(PANGO_INST_VERSION).0\modules /d /y + xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* etc\gtk-2.0 /d + xcopy $(GTK2_DIR)\etc\pango\pango.* etc\pango /d + xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders\libpixbufloader-*.dll lib\gtk-2.0\$(GTK2_INST_VERSION).0\loaders /d + xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules\im-*.dll lib\gtk-2.0\$(GTK2_INST_VERSION).0\immodules /d + xcopy $(GTK2_DIR)\lib\pango\$(PANGO_INST_VERSION).0\modules\pango-*.dll lib\pango\$(PANGO_INST_VERSION).0\modules /d !ENDIF install-gtk1-deps: install-required-deps !IFDEF GTK1_DIR - xcopy $(GTK1_DIR)\lib\libgtk-0.dll . /d /y - xcopy $(GTK1_DIR)\lib\libgdk-0.dll . /d /y + xcopy $(GTK1_DIR)\lib\libgtk-0.dll . /d + xcopy $(GTK1_DIR)\lib\libgdk-0.dll . /d !ENDIF install-required-deps: - xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d /y + xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d !IFDEF ENABLE_LIBETHEREAL - xcopy epan\libethereal.dll . /d /y + xcopy epan\libethereal.dll . /d !ENDIF - xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll . /d /y - xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll . /d /y - xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll . /d /y - xcopy $(ICONV_DIR)\bin\iconv.dll . /d /y - xcopy $(GETTEXT_DIR)\bin\intl.dll . /d /y + xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll . /d + xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll . /d + xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll . /d + xcopy $(ICONV_DIR)\bin\iconv.dll . /d + xcopy $(GETTEXT_DIR)\bin\intl.dll . /d !IFDEF ZLIB_DIR - xcopy $(ZLIB_DIR)\zlib1.dll . /d /y + xcopy $(ZLIB_DIR)\zlib1.dll . /d !ENDIF !IFDEF ADNS_DIR - xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll . /d /y + xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll . /d !ENDIF !IFDEF PCRE_DIR - xcopy $(PCRE_DIR)\bin\pcre.dll . /d /y + xcopy $(PCRE_DIR)\bin\pcre.dll . /d !ENDIF clean-deps: diff --git a/asn1/MAP_Dialogue/Makefile.nmake b/asn1/MAP_Dialogue/Makefile.nmake index 7dae1f3337..845388c522 100644 --- a/asn1/MAP_Dialogue/Makefile.nmake +++ b/asn1/MAP_Dialogue/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/acse/Makefile.nmake b/asn1/acse/Makefile.nmake index 9c5b15df58..72b766eeba 100644 --- a/asn1/acse/Makefile.nmake +++ b/asn1/acse/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/camel/Makefile.nmake b/asn1/camel/Makefile.nmake index edcceffe16..312b450ce1 100644 --- a/asn1/camel/Makefile.nmake +++ b/asn1/camel/Makefile.nmake @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 13077 2005-01-16 23:26:02Z lroland $ +# $Id$ include ../../config.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake index a1a7cef509..dacf6333b7 100644 --- a/asn1/cmip/Makefile.nmake +++ b/asn1/cmip/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/cms/Makefile.nmake b/asn1/cms/Makefile.nmake index 4bbaef8195..21948a74a3 100644 --- a/asn1/cms/Makefile.nmake +++ b/asn1/cms/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/ess/Makefile.nmake b/asn1/ess/Makefile.nmake index acc6e626bf..3fd2af8b37 100644 --- a/asn1/ess/Makefile.nmake +++ b/asn1/ess/Makefile.nmake @@ -43,6 +43,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/ftam/Makefile.nmake b/asn1/ftam/Makefile.nmake index 3c7b6ac9fc..a2c5924bc5 100644 --- a/asn1/ftam/Makefile.nmake +++ b/asn1/ftam/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/gnm/Makefile.nmake b/asn1/gnm/Makefile.nmake index d13d63c48c..e4fbd3d110 100644 --- a/asn1/gnm/Makefile.nmake +++ b/asn1/gnm/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/gsm_ss/Makefile.nmake b/asn1/gsm_ss/Makefile.nmake index 265fe10bc1..1ac1f30834 100644 --- a/asn1/gsm_ss/Makefile.nmake +++ b/asn1/gsm_ss/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/gsmmap/Makefile.nmake b/asn1/gsmmap/Makefile.nmake index bb8acd22e9..c346dd826a 100644 --- a/asn1/gsmmap/Makefile.nmake +++ b/asn1/gsmmap/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 1e114438da..7d0f5b4f55 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake index 502d9b59c0..bef5e209ce 100644 --- a/asn1/h235/Makefile.nmake +++ b/asn1/h235/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/h245/Makefile.nmake b/asn1/h245/Makefile.nmake index 400f472d6c..70c9516ea4 100644 --- a/asn1/h245/Makefile.nmake +++ b/asn1/h245/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/h248/Makefile.nmake b/asn1/h248/Makefile.nmake index 42e34f8a68..522db38a20 100644 --- a/asn1/h248/Makefile.nmake +++ b/asn1/h248/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index af9b7780e0..3da53ee0ed 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/logotype-cert-extn/Makefile.nmake b/asn1/logotype-cert-extn/Makefile.nmake index ffc4e31a02..1bbe84959f 100644 --- a/asn1/logotype-cert-extn/Makefile.nmake +++ b/asn1/logotype-cert-extn/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/mms/Makefile.nmake b/asn1/mms/Makefile.nmake index 1090c7674c..6a4d74bc29 100644 --- a/asn1/mms/Makefile.nmake +++ b/asn1/mms/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/ns-cert-exts/Makefile.nmake b/asn1/ns-cert-exts/Makefile.nmake index ae05400ad9..ffb6a86ca5 100644 --- a/asn1/ns-cert-exts/Makefile.nmake +++ b/asn1/ns-cert-exts/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/ocsp/Makefile.nmake b/asn1/ocsp/Makefile.nmake index c50053a05e..ca405ef6d6 100644 --- a/asn1/ocsp/Makefile.nmake +++ b/asn1/ocsp/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkcs1/Makefile.nmake b/asn1/pkcs1/Makefile.nmake index d10630d878..b9d56a1077 100644 --- a/asn1/pkcs1/Makefile.nmake +++ b/asn1/pkcs1/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkinit/Makefile.nmake b/asn1/pkinit/Makefile.nmake index c3f55d8638..2189dd9ab0 100644 --- a/asn1/pkinit/Makefile.nmake +++ b/asn1/pkinit/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkix1explicit/Makefile.nmake b/asn1/pkix1explicit/Makefile.nmake index 19e15b6de2..468f378c51 100644 --- a/asn1/pkix1explicit/Makefile.nmake +++ b/asn1/pkix1explicit/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkix1implicit/Makefile.nmake b/asn1/pkix1implicit/Makefile.nmake index 9320168abe..1e981db04f 100644 --- a/asn1/pkix1implicit/Makefile.nmake +++ b/asn1/pkix1implicit/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkixcmp/Makefile.nmake b/asn1/pkixcmp/Makefile.nmake index fc5970ec6b..a9fdf4ec05 100644 --- a/asn1/pkixcmp/Makefile.nmake +++ b/asn1/pkixcmp/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkixcrmf/Makefile.nmake b/asn1/pkixcrmf/Makefile.nmake index d0b3c4b4f4..898b1e117d 100644 --- a/asn1/pkixcrmf/Makefile.nmake +++ b/asn1/pkixcrmf/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkixproxy/Makefile.nmake b/asn1/pkixproxy/Makefile.nmake index 642f8525a2..b90a2fc305 100644 --- a/asn1/pkixproxy/Makefile.nmake +++ b/asn1/pkixproxy/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkixqualified/Makefile.nmake b/asn1/pkixqualified/Makefile.nmake index c26ec28919..5b1e0fb5cd 100644 --- a/asn1/pkixqualified/Makefile.nmake +++ b/asn1/pkixqualified/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pkixtsp/Makefile.nmake b/asn1/pkixtsp/Makefile.nmake index 1f50c6edcb..f9151b5394 100644 --- a/asn1/pkixtsp/Makefile.nmake +++ b/asn1/pkixtsp/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/pres/Makefile.nmake b/asn1/pres/Makefile.nmake index 288d224f5a..82368e4b98 100644 --- a/asn1/pres/Makefile.nmake +++ b/asn1/pres/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/ros/Makefile.nmake b/asn1/ros/Makefile.nmake index 43735a3d93..ac814bcbab 100644 --- a/asn1/ros/Makefile.nmake +++ b/asn1/ros/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/rtse/Makefile.nmake b/asn1/rtse/Makefile.nmake index 740198a277..91bb36c1f9 100644 --- a/asn1/rtse/Makefile.nmake +++ b/asn1/rtse/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/s4406/Makefile.nmake b/asn1/s4406/Makefile.nmake index bc53951d7b..e7a8714826 100644 --- a/asn1/s4406/Makefile.nmake +++ b/asn1/s4406/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/smrse/Makefile.nmake b/asn1/smrse/Makefile.nmake index 6e60e65b4e..83b0400ce4 100644 --- a/asn1/smrse/Makefile.nmake +++ b/asn1/smrse/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/tcap/Makefile.nmake b/asn1/tcap/Makefile.nmake index a465d7b81d..1c5839b240 100644 --- a/asn1/tcap/Makefile.nmake +++ b/asn1/tcap/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/wlancertextn/Makefile.nmake b/asn1/wlancertextn/Makefile.nmake index fefd59b456..eb1c5aa5c0 100644 --- a/asn1/wlancertextn/Makefile.nmake +++ b/asn1/wlancertextn/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/x411/Makefile.nmake b/asn1/x411/Makefile.nmake index 0f6db775d6..4686fd8f5a 100644 --- a/asn1/x411/Makefile.nmake +++ b/asn1/x411/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/x420/Makefile.nmake b/asn1/x420/Makefile.nmake index 787c3c3ac3..7b8e686be1 100644 --- a/asn1/x420/Makefile.nmake +++ b/asn1/x420/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/x509af/Makefile.nmake b/asn1/x509af/Makefile.nmake index 1e14d4f63d..b88a7c8596 100644 --- a/asn1/x509af/Makefile.nmake +++ b/asn1/x509af/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/x509ce/Makefile.nmake b/asn1/x509ce/Makefile.nmake index 4887b45b36..64e8083e60 100644 --- a/asn1/x509ce/Makefile.nmake +++ b/asn1/x509ce/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/x509if/Makefile.nmake b/asn1/x509if/Makefile.nmake index 2d562986b4..a2daf38060 100644 --- a/asn1/x509if/Makefile.nmake +++ b/asn1/x509if/Makefile.nmake @@ -37,5 +37,5 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/asn1/x509sat/Makefile.nmake b/asn1/x509sat/Makefile.nmake index 25d633f0f1..8b6b884f5f 100644 --- a/asn1/x509sat/Makefile.nmake +++ b/asn1/x509sat/Makefile.nmake @@ -37,6 +37,6 @@ fix_eol: generate_dissector 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 + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d diff --git a/config.nmake b/config.nmake index c97593b8a4..fa1393fbb7 100644 --- a/config.nmake +++ b/config.nmake @@ -228,6 +228,11 @@ MAKENSIS_MODERN_UI=USE # #HHC="C:/Program Files/HTML Help Workshop/hhc.exe" +# According to http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=403 +# XCOPY under Windows NT doesn't support the "/Y" flag. This works +# around that bug. +COPYCMD=/Y + # If you don't want to build libethereal.dll, you should comment out the # following line. (Note: for plugin support this option must stay activated) ENABLE_LIBETHEREAL=USE diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 1463a3ef9c..a5d9e98906 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -143,10 +143,10 @@ doxygen: doxygen.cfg doxygen-run # and statically linking mkstemp.c: ..\mkstemp.c - xcopy ..\mkstemp.c . /d /y + xcopy ..\mkstemp.c . /d strptime.c: ..\strptime.c - xcopy ..\strptime.c . /d /y + xcopy ..\strptime.c . /d radius_dict.c : radius_dict.l $(LEX) radius_dict.l diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index f9d33f6d70..e78f4948a2 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -313,30 +313,30 @@ install-plugins: !IFDEF ENABLE_LIBETHEREAL rm -rf $(VERSION) mkdir $(VERSION) - xcopy acn\*.dll $(VERSION) /d /y - xcopy agentx\*.dll $(VERSION) /d /y - xcopy artnet\*.dll $(VERSION) /d /y - xcopy asn1\*.dll $(VERSION) /d /y - xcopy ciscosm\*.dll $(VERSION) /d /y - xcopy docsis\*.dll $(VERSION) /d /y - xcopy enttec\*.dll $(VERSION) /d /y - xcopy giop\*.dll $(VERSION) /d /y - xcopy gryphon\*.dll $(VERSION) /d /y - xcopy irda\*.dll $(VERSION) /d /y - xcopy lwres\*.dll $(VERSION) /d /y - xcopy mate\*.dll $(VERSION) /d /y - xcopy megaco\*.dll $(VERSION) /d /y - xcopy mgcp\*.dll $(VERSION) /d /y - xcopy opsi\*.dll $(VERSION) /d /y - xcopy pcli\*.dll $(VERSION) /d /y - xcopy profinet\*.dll $(VERSION) /d /y - xcopy rdm\*.dll $(VERSION) /d /y - xcopy rlm\*.dll $(VERSION) /d /y - xcopy rtnet\*.dll $(VERSION) /d /y - xcopy rudp\*.dll $(VERSION) /d /y - xcopy stats_tree\*.dll $(VERSION) /d /y - xcopy v5ua\*.dll $(VERSION) /d /y - xcopy xml\*.dll $(VERSION) /d /y + xcopy acn\*.dll $(VERSION) /d + xcopy agentx\*.dll $(VERSION) /d + xcopy artnet\*.dll $(VERSION) /d + xcopy asn1\*.dll $(VERSION) /d + xcopy ciscosm\*.dll $(VERSION) /d + xcopy docsis\*.dll $(VERSION) /d + xcopy enttec\*.dll $(VERSION) /d + xcopy giop\*.dll $(VERSION) /d + xcopy gryphon\*.dll $(VERSION) /d + xcopy irda\*.dll $(VERSION) /d + xcopy lwres\*.dll $(VERSION) /d + xcopy mate\*.dll $(VERSION) /d + xcopy megaco\*.dll $(VERSION) /d + xcopy mgcp\*.dll $(VERSION) /d + xcopy opsi\*.dll $(VERSION) /d + xcopy pcli\*.dll $(VERSION) /d + xcopy profinet\*.dll $(VERSION) /d + xcopy rdm\*.dll $(VERSION) /d + xcopy rlm\*.dll $(VERSION) /d + xcopy rtnet\*.dll $(VERSION) /d + xcopy rudp\*.dll $(VERSION) /d + xcopy stats_tree\*.dll $(VERSION) /d + xcopy v5ua\*.dll $(VERSION) /d + xcopy xml\*.dll $(VERSION) /d !ENDIF clean-deps: |