From Motonori Shindo:

	fix a bogus batch mode inference rule of make, so that
	"vc60.pdb" files are created in the proper directory;

	delete ".pdb" files in a "nmake -f Makefile.nmake clean";

	include the text2pcap and mergecap ".pdb" files in the Windows
	binary distribution.

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

diff --git a/AUTHORS b/AUTHORS
index 87e503a0cc40337846a2414015479806b1089905..a233bb6d263d1873543a8383888af1b7f575e3de 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -798,6 +798,9 @@ Motonori Shindo <mshindo[AT]mshindo.net> {
           trace reading code's Flex scanner
        BACP and BAP support in PPP dissector
        Add necessary cast in TCP graph code
+       Fix up the generation of PDB files, clean them up on a "nmake -f
+           makefile.nmake clean", and put all the PDB files into the
+           Windows binary distribution
 }
 
 Terje Krogdahl <tekr[AT]nextra.com> {

diff --git a/Makefile.nmake b/Makefile.nmake
index 5e6f4e0c7a222ba0c2971df6be36f39aef7a79d3..d7a86e1ebf0dd7240b2bfce4daf2b61edcd02479 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.152 2001/12/11 03:04:26 gram Exp $
+# $Id: Makefile.nmake,v 1.153 2001/12/12 01:29:01 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -19,8 +19,8 @@ CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
-{$S}.c{$O}.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 DISSECTOR_SRC = \
        packet-aarp.c  \
@@ -328,6 +328,10 @@ dftest_LIBS= epan\ethereal.lib \
 
 EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
 
+EXECUTABLES_PDBS = $(EXECUTABLES:.exe=.pdb)
+
+PDBS = $(EXECUTABLES_PDBS) $(PDB_FILE) 
+
 RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
 
 all: tools wiretap gtk epan image $(EXECUTABLES) $(RESOURCES)
@@ -400,10 +404,10 @@ text2pcap-scanner.c : text2pcap-scanner.l
        $(LEX) -otext2pcap-scanner.c text2pcap-scanner.l
 
 clean:
-       rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \
+       rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) $(PDBS) \
                tethereal.obj editcap.obj mergecap.obj text2pcap.obj \
                text2pcap-scanner.obj text2pcap-scanner.c register.c \
-               rdps.obj config.h ps.c packet-ncp2222.c register.c
+               rdps.obj rdps.pdb config.h ps.c packet-ncp2222.c register.c
        cd wiretap
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../gtk

diff --git a/config.nmake b/config.nmake
index a5d3f9bc1b275f8d65a9fe9c04e300e9abe52670..51168a0b4357604144d689802df0a920353cba73 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.17 2001/10/12 17:17:04 gerald Exp $
+# $Id: config.nmake,v 1.18 2001/12/12 01:29:01 guy Exp $
 
 VERSION=0.8.20
 RC_VERSION=0,8,20
@@ -14,6 +14,7 @@ PCAP_DIR=F:\gram\win32tools\WPdpack
 
 LOCAL_CFLAGS=-Zi
 LOCAL_LDFLAGS=/DEBUG
+PDB_FILE=vc60.pdb
 
 # Set path if you need to find some binary
 #PATH=t:\w32-ix86\cygnus\cygwin-b20\H-i586-cygwin32\bin;$(PATH)

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 563dca54744132168849dfd5b673691d9f9f0ba0..b165a1b8b54a7f4b7dc5bf1b1f407cceacdf1ce3 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -15,8 +15,8 @@ libethereal_LIBS = \
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
 
-{$S}.c{$O}.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=atalk-utils.obj        \
        bitswap.obj     \
@@ -56,7 +56,7 @@ config.h      : config.h.win32
        sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@
 
 clean:
-       rm -f $(OBJECTS) ethereal.lib config.h
+       rm -f $(OBJECTS) ethereal.lib config.h $(PDB_FILE)
        cd ftypes
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../dfilter

diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 99f069e4dfa91bbe5f653f5e3f872776d8ab17c5..75a179a047794162110f69343cc13af0c1790638 100644 (file)
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -11,8 +11,8 @@ CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
-{$S}.c{$O}.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 
 OBJECTS = \
@@ -37,7 +37,8 @@ dfilter.lib   : $(OBJECTS)
 
 
 clean:
-       rm -f $(OBJECTS) scanner.c grammar.c grammar.h grammar.out dfilter.lib
+       rm -f $(OBJECTS) scanner.c grammar.c grammar.h grammar.out \
+       dfilter.lib $(PDB_FILE)
 
 scanner.c : scanner.l
        $(LEX) -Pdf_ -oscanner.c scanner.l

diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 37490b44c66415db5b39fcc6d8d2a177d79fe947..a802286070f034210524a0639d020de2e843cbf6 100644 (file)
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -9,8 +9,8 @@ CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. \
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL 
 
-{$S}.c{$O}.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 
 OBJECTS = \
@@ -30,5 +30,5 @@ ftypes.lib    : $(OBJECTS)
 
 
 clean:
-       rm -f $(OBJECTS) ftypes.lib
+       rm -f $(OBJECTS) ftypes.lib $(PDB_FILE)
 

diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 6d3d3ef9de503b43f7751f05399520670ab57a4e..54d5f03480e29dfe535849eb05958ca07946089f 100644 (file)
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -11,8 +11,8 @@ CFLAGS=-DHAVE_CONFIG_H /I.. /I../epan /I../wiretap \
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
-{$S}.c{$O}.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 # gtkclist.obj is not in here because it is gtk+-1.2 code,
 # while the DLL for GTK+ on windows is gtk+-1.3, and there's
@@ -57,4 +57,4 @@ libui.lib     : ..\config.h $(OBJECTS)
 
 
 clean:
-       rm -f $(OBJECTS) libui.lib
+       rm -f $(OBJECTS) libui.lib $(PDB_FILE)

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 98eaa49ae8f2542a0565a36e46361175a0e79270..1dcfc505281f0ed001ffa74631c01def7cd849f5 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.7 2001/07/12 22:45:23 gram Exp $
+# $Id: Makefile.nmake,v 1.8 2001/12/12 01:29:07 guy Exp $
 #
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
@@ -12,7 +12,8 @@ include ../../config.nmake
 
 EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \
        ../../text2pcap.exe ../../mergecap.exe
-PDB=../../ethereal.pdb ../../tethereal.pdb ../../editcap.pdb
+PDB=../../ethereal.pdb ../../tethereal.pdb ../../editcap.pdb \
+       ../../text2pcap.pdb ../../mergecap.pdb
 DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
 DOC=../../doc/ethereal.html            \
        ../../doc/tethereal.html        \

diff --git a/packaging/nsis/ethereal.nsi.in b/packaging/nsis/ethereal.nsi.in
index 7f2870c51f85bc99cb191ccd022b7a24276ba5aa..616cdc42a19d0dda3045fd7d6daa00cd7efc8fb7 100644 (file)
--- a/packaging/nsis/ethereal.nsi.in
+++ b/packaging/nsis/ethereal.nsi.in
@@ -1,7 +1,7 @@
 ;
 ; ethereal.nsi
 ;
-; $Id: ethereal.nsi.in,v 1.8 2001/11/01 21:55:08 guy Exp $
+; $Id: ethereal.nsi.in,v 1.9 2001/12/12 01:29:07 guy Exp $
 
 ; ============================================================================
 ; Header configuration
@@ -128,6 +128,8 @@ SetOutPath $INSTDIR
 File "..\..\ethereal.pdb"
 File "..\..\tethereal.pdb"
 File "..\..\editcap.pdb"
+File "..\..\mergecap.pdb"
+File "..\..\text2pcap.pdb"
 SectionEnd
 
 SectionDivider

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 4c7a29a9aacb625a4240fae7a00c86c5230f9f5c..9215ba64c0656c8fcb6e9c1a528dea37a07453e0 100644 (file)
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.10 2001/07/19 21:30:16 guy Exp $
+# $Id: Makefile.nmake,v 1.11 2001/12/12 01:29:08 guy Exp $
 #
 
 include ..\config.nmake
@@ -32,7 +32,7 @@ giop::
 
 
 clean:
-       rm -f plugin_api.obj
+       rm -f plugin_api.obj $(PDB_FILE)
        cd gryphon
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../mgcp

diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 3d390dd83d62b9820afe20d8ca6ed6db1964d072..a676cc0290f66b9417495f439ee9b5e5efce7524 100644 (file)
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.3 2001/10/17 19:27:43 gram Exp $
+# $Id: Makefile.nmake,v 1.4 2001/12/12 01:29:09 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -25,5 +25,5 @@ coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj ..\
 
 
 clean:
-       rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib
-       rm -f $(OBJECTS) coseventcomm.dll coseventcomm.exp coseventcomm.lib
+       rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
+       coseventcomm.dll coseventcomm.exp coseventcomm.lib $(PDB_FILE)

diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 05a414fe096d5a2212e0b352a2b57133228711e5..dad3f4d62200382f8ac9e48cf8435afe0470b5f8 100644 (file)
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.5 2000/10/11 07:35:02 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2001/12/12 01:29:10 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,4 +17,4 @@ gryphon.dll gryphon.exp gryphon.lib : packet-gryphon.obj ..\plugin_api.obj
        link -dll /out:gryphon.dll packet-gryphon.obj ..\plugin_api.obj
 
 clean:
-       rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib
+       rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)

diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 6803a9cbfbd8f30bce3e9fc86411b2269ece979a..a1f12b9cfee434ad4a5a92adf680fb1b599db8c4 100644 (file)
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.2 2000/11/14 10:38:15 guy Exp $
+# $Id: Makefile.nmake,v 1.3 2001/12/12 01:29:11 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -18,4 +18,4 @@ mgcp.dll mgcp.exp mgcp.lib : packet-mgcp.obj ..\plugin_api.obj
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib
 
 clean:
-       rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib
+       rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)

diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index 014c1210fc96128c44527a951a1df0633d462601..338e0b4a8f76441ec03a98cf485517f51923d227 100644 (file)
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -3,10 +3,10 @@ include ..\..\config.nmake
 
 CFLAGS=$(LOCAL_CFLAGS)
 
-{$S}.c{$O}.obj::
-   $(CC) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 all : lemon.exe
 
 clean:
-       rm -f lemon.obj lemon.exe
+       rm -f lemon.obj lemon.exe $(PDB_FILE) lemon.pdb

diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 3f75ae065f5a48016085cb055a463b346a8f6942..34d8ffd860256ac565d8ae6a31e9e5327fd59bdf 100644 (file)
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.23 2001/12/04 22:28:19 guy Exp $
+# $Id: Makefile.nmake,v 1.24 2001/12/12 01:29:13 guy Exp $
 #
 
 include ..\config.nmake
@@ -9,8 +9,8 @@ include <win32.mak>
 
 CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) $(LOCAL_CFLAGS)
 
-{$S}.c{$O}.obj::
-   $(CC) $(cvarsdll) $(CFLAGS) -Fd$O\ -c $<
+.c.obj::
+   $(CC) $(cvarsdll) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=ascend-grammar.obj \
        ascend-scanner.obj \
@@ -73,4 +73,4 @@ clean :
                wiretap-$(WTAP_VERSION).lib \
                wiretap-$(WTAP_VERSION).exp \
                wiretap-$(WTAP_VERSION).dll \
-               config.h
+               config.h $(PDB_FILE)