Wireshark · Ethereal-dev: Re: [Ethereal-dev] Bug in Makefile.nmake

[aferen@xxxxxxxxxxxx (Andrew C. Feren)]

andreas.sikkema@xxxxxxxxxxx writes:

> Hi,
> 
> In the current CVS copy there's a bug in Makefile.nmake. The
> make-reg-dotc sh script file has to be called using three arguments,
> the output file, the directory in which the source lives and a list
> of packet- files. Currently the output file is missing and this
> results in an error.  Adding the filename to the call to the script
> resolves this. I assume the same might happen to the python version
> because that one also failed, but I didn't check this.


I submitted a patch that fixed this awile ago, but it never got
applied.  It was mixed in with some other changes that were more
controversial so I suspect it was just over looked.  Here is just the
Makefile.nmake portion of the patches I submitted.


Makefile.nmake:
There is currently a comment on the register.c target stating that it
would be nice to provide an ifdef to use python or sh.  I added one.
I also ifdefed out the ncp dissector since if python isn't defined
this couldn't be built either.

This also corrects the commandline for calling "sh make-reg-dotc"

The addition of TOP=.. and it's use in the makefile is left over from
the more controversial portion of my earlier patch submission.  It is
harmless, but not required in the current context.


Index: Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/doc/Makefile.nmake,v
retrieving revision 1.7
diff -u -r1.7 Makefile.nmake
--- Makefile.nmake	2002/01/04 21:20:17	1.7
+++ Makefile.nmake	2002/01/24 20:14:09
@@ -24,89 +24,90 @@
 # We include dependencies on ../config.h in order to
 # capture when $(VERSION) changes.
 
-include ../config.nmake
+TOP=..
+include ..\config.nmake
 
 doc: ethereal.html tethereal.html editcap.html idl2eth.html \
 	mergecap.html text2pcap.html
 
-ethereal.1: ethereal.pod ../config.h
+ethereal.1: ethereal.pod $(TOP)\config.h
 	$(POD2MAN) ethereal.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> ethereal.1
 
-ethereal.html: ethereal.pod ../config.h
+ethereal.html: ethereal.pod $(TOP)\config.h
 	$(POD2HTML) ethereal.pod                     \
 	--title="The Ethereal Network Analyzer $(VERSION)" \
 	--noindex                                 \
 	> ethereal.html
 
-../tethereal.exe:
-	cd ..
+$(TOP)\tethereal.exe:
+	cd $(TOP)
 	$(MAKE) -f makefile.nmake tethereal.exe
 	cd doc
 
-ethereal.pod: ethereal.pod.template  ../tethereal.exe
-	..\\tethereal.exe -G | $(PERL) dfilter2pod.pl ethereal.pod.template > ethereal.pod
+ethereal.pod: ethereal.pod.template  $(TOP)\tethereal.exe
+	$(TOP)\tethereal.exe -G | $(PERL) dfilter2pod.pl ethereal.pod.template > ethereal.pod
 
-tethereal.1: tethereal.pod ../config.h
+tethereal.1: tethereal.pod $(TOP)\config.h
 	$(POD2MAN) tethereal.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> tethereal.1
 
-tethereal.html: tethereal.pod ../config.h
+tethereal.html: tethereal.pod $(TOP)\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
+tethereal.pod: tethereal.pod.template  $(TOP)\tethereal.exe
+	$(TOP)\tethereal.exe -G | $(PERL) dfilter2pod.pl tethereal.pod.template > tethereal.pod
 
-editcap.1: editcap.pod ../config.h
+editcap.1: editcap.pod $(TOP)\config.h
 	$(POD2MAN) editcap.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> editcap.1
 
-editcap.html: editcap.pod ../config.h
+editcap.html: editcap.pod $(TOP)\config.h
 	$(POD2HTML) editcap.pod                     \
 	--title="The Ethereal Network Analyzer $(VERSION)" \
 	--noindex                                 \
 	> editcap.html
 
-mergecap.1: mergecap.pod ../config.h
+mergecap.1: mergecap.pod $(TOP)\config.h
 	$(POD2MAN) mergecap.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> mergecap.1
 
-mergecap.html: mergecap.pod ../config.h
+mergecap.html: mergecap.pod $(TOP)\config.h
 	$(POD2HTML) mergecap.pod                     \
 	--title="The Ethereal Network Analyzer $(VERSION)" \
 	--noindex                                 \
 	> mergecap.html
 
-idl2eth.1: idl2eth.pod ../config.h
+idl2eth.1: idl2eth.pod $(TOP)\config.h
 	$(POD2MAN) idl2eth.pod                       \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> idl2eth.1
 
-idl2eth.html: idl2eth.pod ../config.h
+idl2eth.html: idl2eth.pod $(TOP)\config.h
 	$(POD2HTML) idl2eth.pod                     \
 	--title="The Ethereal Network Analyzer $(VERSION)" \
 	--noindex                                 \
 	> idl2eth.html
 
-text2pcap.1: text2pcap.pod ../config.h
+text2pcap.1: text2pcap.pod $(TOP)\config.h
 	$(POD2MAN) text2pcap.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> text2pcap.1
 
-text2pcap.html: text2pcap.pod ../config.h
+text2pcap.html: text2pcap.pod $(TOP)\config.h
 	$(POD2HTML) text2pcap.pod                     \
 	--title="The Ethereal Network Analyzer $(VERSION)" \
 	--noindex                                 \

-- 
-Andrew Feren
 Cetacean Networks, Inc.
 Portsmouth, NH