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

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 493e2351093bb41ca9d6fc5bc18b87d45f3dcd54..c67fac357497874a66de379025f8986e44809ebd 100644 (file)
--- 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 ddbc0c0cab22cbb21ab67e94037dcf664eed0873..cc707cd30bb4b29e84f9c1316d286437cb4acb79 100644 (file)
--- 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)
 \r
 all-other-dirs-nmake: addsection\r
        cd ..\lib-src\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
+       $(MAKE) $(MFLAGS) all\r
        cd ..\src\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
+       $(MAKE) $(MFLAGS) all\r
        cd ..\lisp\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
+       $(MAKE) $(MFLAGS) all\r
        cd ..\leim\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
+       $(MAKE) $(MFLAGS) all\r
        cd ..\nt\r
 \r
 all-other-dirs-gmake: addsection\r
@@ -101,7 +101,7 @@ recompile:  recompile-$(MAKETYPE)
 \r
 recompile-nmake:\r
        cd ..\lisp\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) recompile\r
+       $(MAKE) $(MFLAGS) recompile\r
        cd ..\nt\r
 \r
 recompile-gmake:\r
@@ -158,7 +158,7 @@ bootstrap-gmake: addsection
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) XMFLAGS="$(XMFLAGS)" -C ../src bootstrap\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC\r