aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS3
-rw-r--r--Makefile.nmake5
-rw-r--r--config.nmake17
-rw-r--r--doc/Makefile.nmake60
-rw-r--r--packaging/nsis/ethereal.nsi.in8
-rw-r--r--tools/lemon/Makefile.nmake2
6 files changed, 58 insertions, 37 deletions
diff --git a/AUTHORS b/AUTHORS
index 5e09c6c7a3..ed8235a0ba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -915,6 +915,9 @@ Pekka Nikander <pekka.nikander[AT]nomadiclab.com> {
Hamish Moffatt <hamish[AT]cloud.net.au> {
MPLS support for handling either IPv4 or IPv6 as the payload
protocol type
+ Win32 Makefile fixes
+ Use pod2html rather than man2html to build HTML man pages
+ Fix ethereal.nsi.in for recent versions of NSIS
}
Kazushi Sugyo <k-sugyou[AT]nwsl.mesh.ad.jp> {
diff --git a/Makefile.nmake b/Makefile.nmake
index d47154852d..5632852336 100644
--- 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.160 2001/12/27 20:58:35 guy Exp $
+# $Id: Makefile.nmake,v 1.161 2002/01/04 06:57:07 guy Exp $
include config.nmake
include <win32.mak>
@@ -409,7 +409,8 @@ clean:
rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) $(PDB_FILE) \
tethereal.obj editcap.obj mergecap.obj text2pcap.obj \
text2pcap-scanner.obj text2pcap-scanner.c register.c \
- rdps.obj rdps.pdb config.h ps.c packet-ncp2222.c register.c
+ rdps.obj rdps.pdb config.h ps.c packet-ncp2222.c register.c \
+ rdps.exe rdps.ilk $(RESOURCES)
cd wiretap
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../gtk
diff --git a/config.nmake b/config.nmake
index 9b979b726e..8d700832bf 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.20 2001/12/23 21:11:23 gerald Exp $
+# $Id: config.nmake,v 1.21 2002/01/04 06:57:07 guy Exp $
VERSION=0.9.0
RC_VERSION=0.9.0
@@ -7,10 +7,10 @@ WTAP_VERSION=0.0
GTK_VERSION=1.3
GLIB_VERSION=1.3
-GLIB_DIR=F:\gram\win32tools\src\glib
-GTK_DIR=F:\gram\win32tools\src\gtk+
-ZLIB_DIR=F:\gram\win32tools\src\zlib-1.1.3
-PCAP_DIR=F:\gram\win32tools\WPdpack
+GLIB_DIR=C:\ethereal-win32-libs\glib
+GTK_DIR=C:\ethereal-win32-libs\gtk+
+ZLIB_DIR=C:\ethereal-win32-libs\zlib-1.1.3
+PCAP_DIR=C:\ethereal-win32-libs\WPdpack
LOCAL_CFLAGS=-Zi
LOCAL_LDFLAGS=/DEBUG
@@ -19,11 +19,12 @@ 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)
+PATH=c:\cygnus\cygwin-b20\H-i586-cygwin32\bin;c:\python22;c:\ethereal-0.9.0\wiretap;c:\program files\gnu;$(PATH)
PERL=perl
-POD2MAN=perl /usr/bin/pod2man
-PYTHON="C:/python21/python.exe"
+POD2MAN=pod2man
+POD2HTML=pod2html
+PYTHON="C:/python22/python.exe"
LEX=flex
YACC=bison
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index 0c5ddddbb0..fc6cfe4e7d 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -1,7 +1,7 @@
# Makefile.nmake
# Nmake file for Ethereal documentation
#
-# $Id: Makefile.nmake,v 1.5 2001/07/30 21:40:13 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2002/01/04 06:57:08 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -29,33 +29,18 @@ include ../config.nmake
doc: ethereal.html tethereal.html editcap.html idl2eth.html \
mergecap.html text2pcap.html
-#
-# XXX - can't we just use "pod2html" here?
-#
-ethereal.html : ethereal.1
- man2html ethereal.1 > $@
-
-tethereal.html : tethereal.1
- man2html tethereal.1 > $@
-
-editcap.html : editcap.1
- man2html editcap.1 > $@
-
-idl2eth.html : idl2eth.1
- man2html idl2eth.1 > $@
-
-mergecap.html : mergecap.1
- man2html mergecap.1 > $@
-
-text2pcap.html : text2pcap.1
- man2html text2pcap.1 > $@
-
ethereal.1: ethereal.pod ../config.h
$(POD2MAN) ethereal.pod \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
> ethereal.1
+ethereal.html: ethereal.pod ../config.h
+ $(POD2HTML) ethereal.pod \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ > ethereal.html
+
ethereal.pod: ethereal.pod.template ../tethereal.exe
..\\tethereal.exe -G | $(PERL) dfilter2pod.pl ethereal.pod.template > ethereal.pod
@@ -65,6 +50,12 @@ tethereal.1: tethereal.pod ../config.h
--release=$(VERSION) \
> tethereal.1
+tethereal.html: tethereal.pod ../config.h
+ $(POD2HTML) tethereal.pod \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ > tethereal.html
+
tethereal.pod: tethereal.pod.template ../tethereal.exe
..\\tethereal.exe -G | $(PERL) dfilter2pod.pl tethereal.pod.template > tethereal.pod
@@ -74,24 +65,48 @@ editcap.1: editcap.pod ../config.h
--release=$(VERSION) \
> editcap.1
+editcap.html: editcap.pod ../config.h
+ $(POD2HTML) editcap.pod \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ > editcap.html
+
mergecap.1: mergecap.pod ../config.h
$(POD2MAN) mergecap.pod \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
> mergecap.1
+mergecap.html: mergecap.pod ../config.h
+ $(POD2HTML) mergecap.pod \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ > mergecap.html
+
idl2eth.1: idl2eth.pod ../config.h
$(POD2MAN) idl2eth.pod \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
> idl2eth.1
+idl2eth.html: idl2eth.pod ../config.h
+ $(POD2HTML) idl2eth.pod \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ > idl2eth.html
+
text2pcap.1: text2pcap.pod ../config.h
$(POD2MAN) text2pcap.pod \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
> text2pcap.1
+text2pcap.html: text2pcap.pod ../config.h
+ $(POD2HTML) text2pcap.pod \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ > text2pcap.html
+
clean:
rm -f ethereal.html ethereal.1 ethereal.pod
rm -f tethereal.html tethereal.1 tethereal.pod
@@ -99,3 +114,4 @@ clean:
rm -f idl2eth.html idl2eth.1
rm -f mergecap.html mergecap.1
rm -f text2pcap.html text2pcap.1
+ rm -f pod2htm*
diff --git a/packaging/nsis/ethereal.nsi.in b/packaging/nsis/ethereal.nsi.in
index 8f8a28fb41..ee203b6fe4 100644
--- a/packaging/nsis/ethereal.nsi.in
+++ b/packaging/nsis/ethereal.nsi.in
@@ -1,7 +1,7 @@
;
; ethereal.nsi
;
-; $Id: ethereal.nsi.in,v 1.11 2001/12/19 19:16:12 guy Exp $
+; $Id: ethereal.nsi.in,v 1.12 2002/01/04 06:57:09 guy Exp $
; ============================================================================
; Header configuration
@@ -16,8 +16,7 @@ OutFile "ethereal-setup.exe"
Icon "..\..\image\ethereal.ico"
; Uninstall stuff
-UninstallText "This will uninstall Etheral. Hit 'Next' to continue."
-UninstallExeName "uninstall.exe"
+UninstallText "This will uninstall Ethereal. Hit 'Next' to continue."
; ============================================================================
; License page configuration
@@ -73,6 +72,7 @@ File "..\..\sunping.xml"
; Write the uninstall keys for Windows
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayName" "Ethereal"
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "UninstallString" '"$INSTDIR\uninstall.exe"'
+WriteUninstaller "uninstall.exe"
SectionEnd
Section "Ethereal"
@@ -165,5 +165,5 @@ RMDir "$SMPROGRAMS\Ethereal"
RMDir "$INSTDIR\plugins\@VERSION@"
RMDir "$INSTDIR\plugins"
RMDir "$INSTDIR"
-SectionEnd
+SectionEnd
diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index 338e0b4a8f..a98eba4fd9 100644
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -9,4 +9,4 @@ CFLAGS=$(LOCAL_CFLAGS)
all : lemon.exe
clean:
- rm -f lemon.obj lemon.exe $(PDB_FILE) lemon.pdb
+ rm -f lemon.obj lemon.exe lemon.ilk $(PDB_FILE) lemon.pdb
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 02:04:53 +0000