Merged from emacs@sv.gnu.org

[bpt/emacs.git] / nt / makefile.w32-in

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 3e99765..f579855 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.\r
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
-#    2005, 2006 Free Software Foundation, Inc.\r
+#    2005, 2006, 2007 Free Software Foundation, Inc.\r
 #\r
 #  Top level makefile for building GNU Emacs on Windows NT\r
 #\r
@@ -21,6 +21,9 @@
 #  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
 #  Boston, MA 02110-1301, USA.\r
 \r
+# FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out\r
+#        (and remove or replace this comment).\r
+\r
 ALL            = addpm ddeclient runemacs cmdproxy addsection preprep\r
 \r
 .PHONY: $(ALL)\r
@@ -59,7 +62,7 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
 # it is not necessary on later versions, it is still ok to use it.\r
 #\r
 $(TRES):       emacs.rc stamp_BLD\r
-               $(RC) $(RC_OUT)$(BLD)/emacs.res $<\r
+               $(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc\r
 \r
 runemacs:        stamp_BLD $(BLD)/runemacs.exe\r
 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)\r
@@ -82,13 +85,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 +104,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
@@ -135,7 +138,8 @@ maybe-bootstrap-SH: doit
          exit -1; \\r
        fi\r
 \r
-bootstrap:     addsection bootstrap-$(MAKETYPE) all\r
+bootstrap:     addsection bootstrap-$(MAKETYPE)\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
 \r
 bootstrap-nmake: addsection\r
        cd ..\lisp\r
@@ -246,6 +250,7 @@ info-gmake:
 clean: clean-other-dirs-$(MAKETYPE)\r
        - $(DEL) *~ $(COMPILER_TEMP_FILES)\r
        - $(DEL_TREE) $(OBJDIR)\r
+       - $(DEL) stamp_BLD\r
        - $(DEL) ../etc/DOC ../etc/DOC-X\r
 \r
 clean-other-dirs-nmake:\r