aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-10-29 09:48:29 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-10-29 09:48:29 +0000
commit590537c9681e570c46bdd9249eeae042ed1ac9d3 (patch)
treea994e94aa9373f98dfd31f8134a2978397f067a5
parentd232c0c69a8e8803d78849283d74609617e8981f (diff)
remove cleanbld.bat (use the distclean target instead)
svn path=/trunk/; revision=16355
-rw-r--r--Makefile.am1
-rw-r--r--README.win329
-rw-r--r--cleanbld.bat45
3 files changed, 5 insertions, 50 deletions
diff --git a/Makefile.am b/Makefile.am
index 2b7f69a9c9..6a3ee13d9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -482,7 +482,6 @@ EXTRA_DIST = \
capture_wpcap_packet.c \
capture_wpcap_packet.h \
cfilters \
- cleanbld.bat \
colorfilters \
config.h.win32 \
config.nmake \
diff --git a/README.win32 b/README.win32
index c6c2bf13b1..a13a8f52d9 100644
--- a/README.win32
+++ b/README.win32
@@ -329,8 +329,8 @@ command line, or you can invoke the vcvars32.bat script, which can
usually be found in the "VC98\Bin" subdirectory of the directory in
which Visual Studio was installed.
-The first time you build Ethereal, run the script "cleanbld.bat" in the
-top-level Ethereal source directory to make sure that the "config.h"
+The first time you build Ethereal, run "nmake -f makefile.nmake distclean"
+in the top-level Ethereal source directory to make sure that the "config.h"
files will be reconstructed from the "config.h.win32" files. (If, for
example, you have "config.h" files left over from a Unix build, a
Windows build will fail.)
@@ -346,8 +346,9 @@ system. In most cases, the generated files can be used when building on
Windows, but the files listed below as being generated by Flex can be
used when building on Windows only when generated by a Windows version
of Flex, so you will need a Windows version of Flex to do a Windows
-build. Those generated files are removed by the "cleanbld.bat" script,
-to make sure that versions left over from a Unix build aren't used.
+build. Those generated files are removed by
+"nmake -f makefile.nmake distclean", to make sure that versions left over
+from a Unix build aren't used.
If you are building from a modified version of an official distribution,
and you modified any of the source files listed below, you will need the
diff --git a/cleanbld.bat b/cleanbld.bat
deleted file mode 100644
index 855041c7aa..0000000000
--- a/cleanbld.bat
+++ /dev/null
@@ -1,45 +0,0 @@
-echo off
-rem cleanbld.bat
-rem Script to clean up from a build on another platform
-rem
-rem $Id$
-rem
-rem Ethereal - Network traffic analyzer
-rem By Gerald Combs <gerald@ethereal.com>
-rem Copyright 1998 Gerald Combs
-rem
-rem This program is free software; you can redistribute it and/or
-rem modify it under the terms of the GNU General Public License
-rem as published by the Free Software Foundation; either version 2
-rem of the License, or (at your option) any later version.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-rem GNU General Public License for more details.
-rem
-rem You should have received a copy of the GNU General Public License
-rem along with this program; if not, write to the Free Software
-rem Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-rem
-rem Remove the config.h files that are built from config.h.win32 files,
-rem so that a build will reconstruct them; this should be run the first
-rem time you do a Microsoft Visual C++ build, so that, for example, if
-rem you've done a UNIX build, the build doesn't use the config.h files
-rem from that build (using those config.h files will cause the build
-rem to fail).
-rem
-rem Also remove all files generated by Flex, as the Flex on UN*X
-rem generates code that includes <unistd.h>, which doesn't work on
-rem Windows; you need to run a Windows version of Flex to generate
-rem lexical analyzers.
-rem
-del/f config.h
-del/f epan\config.h
-del/f wiretap\config.h
-del/f epan\radius_dict.c
-del/f epan\dfilter\scanner.c
-del/f plugins\mate\mate_parser.c
-del/f plugins\xml\xml_lexer.c
-del/f wiretap\ascend-scanner.c
-del/f text2pcap-scanner.c