ns-win.el fix for bug#10051

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

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index b0f5edb..194f075 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,6 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.\r
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\r
-#    2008, 2009, 2010 Free Software Foundation, Inc.\r
+# Copyright (C) 2000-2011 Free Software Foundation, Inc.\r
 #\r
 # Top level makefile for building GNU Emacs on Windows NT\r
 #\r
@@ -23,7 +22,7 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out\r
 #        (and remove or replace this comment).\r
 \r
-VERSION                = 24.0.50\r
+VERSION                = 24.0.91\r
 \r
 TMP_DIST_DIR   = emacs-$(VERSION)\r
 \r
@@ -93,6 +92,8 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
 all:   which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)\r
 \r
 all-other-dirs-nmake: addsection\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) all\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) all\r
        cd ..\src\r
@@ -104,6 +105,7 @@ all-other-dirs-nmake: addsection
        cd ..\nt\r
 \r
 all-other-dirs-gmake: addsection\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all\r
@@ -158,7 +160,9 @@ bootstrap-nmake: addsection cmdproxy
        cd ..\src\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\lib-src\r
-       $(MAKE) $(MFLAGS) clean\r
+       $(MAKE) $(MFLAGS) clean make-docfile\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) clean all\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) bootstrap\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
@@ -173,7 +177,8 @@ bootstrap-nmake: addsection cmdproxy
 bootstrap-gmake: addsection cmdproxy\r
        $(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) -C ../lib-src clean make-docfile\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean\r
        $(CP) $(BLD)/cmdproxy.exe ../bin\r
@@ -185,11 +190,14 @@ bootstrap-clean: bootstrap-clean-$(MAKETYPE)
 bootstrap-clean-nmake:\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) clean\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
 \r
 bootstrap-clean-gmake:\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean\r
 \r
 $(INSTALL_DIR):\r
@@ -255,7 +263,6 @@ dist: install-bin
        $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)\r
        $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)\r
        $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR)\r
-       $(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR)\r
        $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR)\r
        $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR)\r
        $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR)\r
@@ -298,23 +305,26 @@ clean:    clean-other-dirs-$(MAKETYPE)
        - $(DEL) ../etc/DOC ../etc/DOC-X\r
 \r
 clean-other-dirs-nmake:\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) clean\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\doc\lispintro\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\doc\lispref\r
+       cd ..\lispref\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\leim\r
+       cd ..\..\leim\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\doc\emacs\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\doc\misc\r
+       cd ..\misc\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\nt\r
+       cd ..\..\nt\r
 \r
 clean-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean\r
@@ -324,6 +334,8 @@ clean-other-dirs-gmake:
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean\r
 \r
 cleanall-other-dirs-nmake:\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) cleanall\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) cleanall\r
        cd ..\src\r
@@ -331,6 +343,7 @@ cleanall-other-dirs-nmake:
        cd ..\nt\r
 \r
 cleanall-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib cleanall\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall\r
 \r
@@ -356,6 +369,8 @@ top-distclean:
 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean\r
 \r
 distclean-other-dirs-nmake:\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) distclean\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) distclean\r
        cd ..\src\r
@@ -366,15 +381,16 @@ distclean-other-dirs-nmake:
        $(MAKE) $(MFLAGS) distclean\r
        cd ..\doc\emacs\r
        $(MAKE) $(MFLAGS) distclean\r
-       cd ..\doc\misc\r
+       cd ..\misc\r
        $(MAKE) $(MFLAGS) distclean\r
-       cd ..\doc\lispintro\r
+       cd ..\lispintro\r
        $(MAKE) $(MFLAGS) distclean\r
-       cd ..\doc\lispref\r
+       cd ..\lispref\r
        $(MAKE) $(MFLAGS) distclean\r
-       cd ..\nt\r
+       cd ..\..\nt\r
 \r
 distclean-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean\r
@@ -387,6 +403,8 @@ distclean-other-dirs-gmake:
 maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean\r
 \r
 maintainer-clean-other-dirs-nmake:\r
+       cd ..\lib\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) maintainer-clean\r
        cd ..\src\r
@@ -397,15 +415,16 @@ maintainer-clean-other-dirs-nmake:
        $(MAKE) $(MFLAGS) maintainer-clean\r
        cd ..\doc\emacs\r
        $(MAKE) $(MFLAGS) maintainer-clean\r
-       cd ..\doc\misc\r
+       cd ..\misc\r
        $(MAKE) $(MFLAGS) maintainer-clean\r
-       cd ..\doc\lispintro\r
+       cd ..\lispintro\r
        $(MAKE) $(MFLAGS) maintainer-clean\r
-       cd ..\doc\lispref\r
+       cd ..\lispref\r
        $(MAKE) $(MFLAGS) maintainer-clean\r
-       cd ..\nt\r
+       cd ..\..\nt\r
 \r
 maintainer-clean-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean\r
@@ -417,3 +436,17 @@ maintainer-clean-other-dirs-gmake:
 \r
 realclean: cleanall\r
        - $(DEL_TREE) ../bin\r
+\r
+TAGS: TAGS-$(MAKETYPE)\r
+\r
+frc:\r
+TAGS-gmake: frc\r
+       ../lib-src/$(BLD)/etags $(CURDIR)/*.c\r
+       $(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP\r
+       $(MAKE) $(MFLAGS) -C ../lib-src TAGS\r
+       $(MAKE) $(MFLAGS) -C ../lib TAGS\r
+\r
+TAGS-nmake:\r
+       echo This target is not supported with NMake\r
+\r
+.PHONY: frc\r