Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 7 Sep 2005 13:26:23 +0000 (13:26 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 7 Sep 2005 13:26:23 +0000 (13:26 +0000)
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15710 f5534014-38df-0310-8fa8-9805f1628bb7

45 files changed:
Makefile.nmake
asn1/MAP_Dialogue/Makefile.nmake
asn1/acse/Makefile.nmake
asn1/camel/Makefile.nmake
asn1/cmip/Makefile.nmake
asn1/cms/Makefile.nmake
asn1/ess/Makefile.nmake
asn1/ftam/Makefile.nmake
asn1/gnm/Makefile.nmake
asn1/gsm_ss/Makefile.nmake
asn1/gsmmap/Makefile.nmake
asn1/h225/Makefile.nmake
asn1/h235/Makefile.nmake
asn1/h245/Makefile.nmake
asn1/h248/Makefile.nmake
asn1/h450/Makefile.nmake
asn1/logotype-cert-extn/Makefile.nmake
asn1/mms/Makefile.nmake
asn1/ns-cert-exts/Makefile.nmake
asn1/ocsp/Makefile.nmake
asn1/pkcs1/Makefile.nmake
asn1/pkinit/Makefile.nmake
asn1/pkix1explicit/Makefile.nmake
asn1/pkix1implicit/Makefile.nmake
asn1/pkixcmp/Makefile.nmake
asn1/pkixcrmf/Makefile.nmake
asn1/pkixproxy/Makefile.nmake
asn1/pkixqualified/Makefile.nmake
asn1/pkixtsp/Makefile.nmake
asn1/pres/Makefile.nmake
asn1/ros/Makefile.nmake
asn1/rtse/Makefile.nmake
asn1/s4406/Makefile.nmake
asn1/smrse/Makefile.nmake
asn1/tcap/Makefile.nmake
asn1/wlancertextn/Makefile.nmake
asn1/x411/Makefile.nmake
asn1/x420/Makefile.nmake
asn1/x509af/Makefile.nmake
asn1/x509ce/Makefile.nmake
asn1/x509if/Makefile.nmake
asn1/x509sat/Makefile.nmake
config.nmake
epan/Makefile.nmake
plugins/Makefile.nmake

index 863690ab270a9a1fef38b724400fbd1454d3bb9b..65709d1477746f4b0785061095d5e26edc889039 100644 (file)
@@ -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:
index 7dae1f33377e9d826a012cf37c391cef354f9c7b..845388c52294248dd227ed80e78b023e7f476ca8 100644 (file)
@@ -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
 
index 9c5b15df5826db29df994064a74bbf10272ab73f..72b766eeba29705356e8c50d75917248efc55fe2 100644 (file)
@@ -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
 
index edcceffe161677b51f78fee3f38f15f1154c9402..312b450ce1c8d167d35380c1dc449500f42b3d51 100644 (file)
@@ -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
index a1a7cef509910647c531987774eb916070d71726..dacf6333b77d0bb7f562ed9c154efe5e34367d30 100644 (file)
@@ -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
index 4bbaef8195a5cd059678d6256b01018068949a7c..21948a74a3f3f29e7088f5cf775769bfce4c63c0 100644 (file)
@@ -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
 
index acc6e626bfecffefe4f5fb2e57451e94cb049719..3fd2af8b3743e57ada2b4f0ad540f1240dc1d82b 100644 (file)
@@ -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
 
index 3c7b6ac9fc66f46d5ee714d60b2b55b0dca80ede..a2c5924bc524ba9b1af9bd02a28f9b26b32113e8 100644 (file)
@@ -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
 
index d13d63c48cc882bdc9d86dc021e23ecf567569dc..e4fbd3d110268885a29daea5f928a0a9eb5aa48f 100644 (file)
@@ -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
 
index 265fe10bc15aafd6476eb4cc6efd96c4b9113bed..1ac1f308344b39a980014437b955974ac6897954 100644 (file)
@@ -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
index bb8acd22e935d9a5464b6606ea819cee93ef218d..c346dd826a1ad215339e8e29e5a3ac165212c1a1 100644 (file)
@@ -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
index 1e114438dae723a7c17ac8919ce219b0f70f8ef7..7d0f5b4f5593aa20e156b50c17708801c86e2d0a 100644 (file)
@@ -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
 
index 502d9b59c04ad0e9db873fa65680990a5f2e5006..bef5e209ced5d0e04a33fa77ed5840c14ff10899 100644 (file)
@@ -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
index 400f472d6c492e3cdd85b075d3e5c1e65cabbb2c..70c9516ea48e4e83c1aca2b467c193c8d16736fa 100644 (file)
@@ -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
 
index 42e34f8a687a155fb157062eadfc90ce107309af..522db38a20d457905594aa4a75b4cc6a274c0e87 100644 (file)
@@ -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
index af9b7780e090f3b285fe24e62af37f86cb88f4e0..3da53ee0edce19b218c3f2d6f6285d062d87d87b 100644 (file)
@@ -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
index ffc4e31a024984b3057532882cb72ef72a01a832..1bbe84959fd2cd4874531102d96e182bb44dedfb 100644 (file)
@@ -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
index 1090c7674c960b539e62c1946ab9fcda5f1c2931..6a4d74bc2945d8a2e95a60c86b12893b8af37a4a 100644 (file)
@@ -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
 
index ae05400ad9817bd52062e838ccc8a05b35395736..ffb6a86ca5e02e493ad93bbee3b08d1cc6efa65a 100644 (file)
@@ -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
index c50053a05e75a3ed2f3b658d8d3385d6f48923a5..ca405ef6d65ab30479d36a2e4b5d580669cf19c1 100644 (file)
@@ -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
index d10630d8785b9d0db9d5840594ac631d9566c475..b9d56a107789ffe3933c097b88a2a92c66e666d3 100644 (file)
@@ -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
 
index c3f55d86382c490d9c76325708151659a03430ee..2189dd9ab09bd9fed9ef51e16c7e6e12ee4d3394 100644 (file)
@@ -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
index 19e15b6de2786b1d2ecaab29d49281609c7e8e98..468f378c513bfc2bb0dbdfba259af3cd7bd3919c 100644 (file)
@@ -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
index 9320168abefdd81269b1577baae34e5d8b9f8370..1e981db04f223b8c6c7d5284b7e2d9f242d7b92c 100644 (file)
@@ -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
 
index fc5970ec6b55016988e91560105601b752686f22..a9fdf4ec05498211c19e4ac82370f446dcdab5b7 100644 (file)
@@ -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
 
index d0b3c4b4f4fa3761dde499f6a2ba8e28f112fabc..898b1e117d0cccce85a1ea6f6deed233001b2a76 100644 (file)
@@ -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
 
index 642f8525a2e67acd5886e073e53e1f74963e1146..b90a2fc305d1323198da7e7e71b298d9879a85f5 100644 (file)
@@ -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
index c26ec28919d6dd4d24c502af3c9e50b682ff7b62..5b1e0fb5cd547cd167659f76a99280a9129cbc40 100644 (file)
@@ -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
index 1f50c6edcb43a94bcb06358cd835464d38e007db..f9151b539475cac405cb864bc497cdd14039416a 100644 (file)
@@ -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
index 288d224f5a765dd517e30bef7d77e3e0316b6647..82368e4b98039a5c85d7ae0182acab486ce07875 100644 (file)
@@ -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
 
index 43735a3d937359d4254d2617269cfe7349a14e0c..ac814bcbab69e28ff0ac167d109da80c5881da4a 100644 (file)
@@ -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
 
index 740198a277d6d2214e80a3df2031d22cd9b269bc..91bb36c1f9403e1f59a22eb49a889c18e5dd231f 100644 (file)
@@ -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
 
index bc53951d7bc9a6c13031a1c8b367233a0e6626c6..e7a8714826b5ed8f328c0546850eeb4be3d61a27 100644 (file)
@@ -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
 
index 6e60e65b4e666e1da46f1c6d12a6fb4d4c682783..83b0400ce4d61cbfe38e4454dcf6575fd40d6c18 100644 (file)
@@ -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
index a465d7b81dab8a130eead553f31577d98b3ae452..1c5839b240db018e019071848bb1bc06a11e5e79 100644 (file)
@@ -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
index fefd59b456df58438f506e686d6af3aed33d0772..eb1c5aa5c0ee1ff95dd06541f1519fa1860f6f58 100644 (file)
@@ -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
index 0f6db775d63e24ed9ef1e1f1c4a34e02869e8627..4686fd8f5a8a00ec06d6273311c6fa29173922d2 100644 (file)
@@ -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
 
index 787c3c3ac3e42c1d13e8f689e6cbddd0fb0c9a4f..7b8e686be15193bc9054e374dddde0dd9936513c 100644 (file)
@@ -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
 
index 1e14d4f63d54d1df5c195430dbde957d1a7d1c31..b88a7c8596cbddef38d3961473d58a4a7a191ef0 100644 (file)
@@ -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
index 4887b45b363fd85fe0f2b6ec4ba24c2e70ad9431..64e8083e6069dad30ff9e4301e7cad11efd88ea6 100644 (file)
@@ -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
 
index 2d562986b4c2f9c7947c2b52fb3a9e7f5c41e2b2..a2daf38060d7d79ade65a349ab38dc191a4c7481 100644 (file)
@@ -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
index 25d633f0f147e1175bd6b8d6ab8fccd695fc9c2e..8b6b884f5f82150311fd46dc69a321176d9859df 100644 (file)
@@ -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
 
index c97593b8a4092bb86f30bfd88017c14e65efc7b6..fa1393fbb76a6dec674884b03b8280dfd76d1907 100644 (file)
@@ -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
index 1463a3ef9c99bcda700ffcc6997d307e4e671e75..a5d9e98906c2f318c9cf89ae975ce489c36ae1af 100644 (file)
@@ -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
index f9d33f6d70e9bd696ddbc7decfb89beb51bf6844..e78f4948a2979688baf9d8e2a6a13390ed9b2c7c 100644 (file)
@@ -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: