Wireshark · Ethereal-dev: [Ethereal-dev] nmake patches

[Mike Frisch <mfrisch@xxxxxxxxxxxxxxx>]

Here are a set of patches to various Makefile.nmake files throughout the
source tree.  I have changed direct invocations of 'nmake' to use the
standard macro for nmake ($MAKE) as well as the command-line flags
($MAKEFLAGS).  This allows such things as:

'nmake /L /F makefile.nmake' from the top of the tree to hide the nmake
"banners"

or 

'nmake /AL /F makefile.nmake' to force a rebuild of all files.

I'm not done yet :-)

I hope this is useful to somebody.

Mike.


--- cut here ---

Index: Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/Makefile.nmake,v
retrieving revision 1.81
diff -u -r1.81 Makefile.nmake
--- Makefile.nmake	2001/02/13 00:17:55	1.81
+++ Makefile.nmake	2001/02/26 19:44:03
@@ -296,38 +296,38 @@
 	rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \
 		tethereal.obj editcap.obj register.c rdps.obj
 	cd wiretap
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../gtk
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../epan
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../plugins
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../tools
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
 
 tools::
 	cd tools
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
 wiretap::
 	cd wiretap
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
 gtk::
 	cd gtk
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
 epan::
 	cd epan
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
 plugins::
 	cd plugins
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
Index: epan/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/epan/Makefile.nmake,v
retrieving revision 1.6
diff -u -r1.6 Makefile.nmake
--- Makefile.nmake	2001/02/02 04:03:38	1.6
+++ Makefile.nmake	2001/02/26 19:44:03
@@ -48,17 +48,17 @@
 clean:
 	rm -f $(OBJECTS) ethereal.lib
 	cd ftypes
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../dfilter
 	nmake -f Makefile.nmake clean
 
 
 ftypes::
 	cd ftypes
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
 dfilter::
 	cd dfilter
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
Index: plugins/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/plugins/Makefile.nmake,v
retrieving revision 1.8
diff -u -r1.8 Makefile.nmake
--- Makefile.nmake	2000/11/12 11:08:45	1.8
+++ Makefile.nmake	2001/02/26 19:44:04
@@ -17,18 +17,18 @@
 
 gryphon::
 	cd gryphon
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
 mgcp::
     cd mgcp
-    nmake -f Makefile.nmake
+    $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
     cd .. 
 
 clean:
 	rm -f plugin_api.obj
 	cd gryphon
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../mgcp
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
Index: tools/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/tools/Makefile.nmake,v
retrieving revision 1.1
diff -u -r1.1 Makefile.nmake
--- Makefile.nmake	2001/02/02 04:03:42	1.1
+++ Makefile.nmake	2001/02/26 19:44:04
@@ -4,10 +4,10 @@
 
 clean:
 	cd lemon
-	nmake -f Makefile.nmake clean
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 
 
 lemon::
 	cd lemon
-	nmake -f Makefile.nmake
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..