(all-other-dirs-nmake, recompile-nmake): Don't use $(XMFLAGS).

2 files changed, 11 insertions, 6 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 493e2351093..c67fac35749 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (all-other-dirs-nmake, recompile-nmake): Don't
+        use $(XMFLAGS).
+
 2006-12-22  Eli Zaretskii  <eliz@gnu.org>
 
         * INSTALL: Explain how to invoke GNU Make for parallel builds.
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index ddbc0c0cab2..cc707cd30bb 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -82,13 +82,13 @@ all:	which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)
 

 all-other-dirs-nmake: addsection

         cd ..\lib-src

-        $(MAKE) $(MFLAGS) $(XMFLAGS) all

+        $(MAKE) $(MFLAGS) all

         cd ..\src

-        $(MAKE) $(MFLAGS) $(XMFLAGS) all

+        $(MAKE) $(MFLAGS) all

         cd ..\lisp

-        $(MAKE) $(MFLAGS) $(XMFLAGS) all

+        $(MAKE) $(MFLAGS) all

         cd ..\leim

-        $(MAKE) $(MFLAGS) $(XMFLAGS) all

+        $(MAKE) $(MFLAGS) all

         cd ..\nt

 

 all-other-dirs-gmake: addsection

@@ -101,7 +101,7 @@ recompile:	recompile-$(MAKETYPE)
 

 recompile-nmake:

         cd ..\lisp

-        $(MAKE) $(MFLAGS) $(XMFLAGS) recompile

+        $(MAKE) $(MFLAGS) recompile

         cd ..\nt

 

 recompile-gmake:

@@ -158,7 +158,7 @@ bootstrap-gmake: addsection
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

-        $(MAKE) $(MFLAGS) $(XMFLAGS) XMFLAGS="$(XMFLAGS)" -C ../src bootstrap

+        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC