Moved most of vc-dir from vc.el to vc-dispatcher.el.

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

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 1d9ada4..053961a 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -24,13 +24,15 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out\r
 #        (and remove or replace this comment).\r
 \r
+TRES           = $(BLD)/emacs.res\r
+CLIENTRES      = $(BLD)/emacsclient.res\r
+\r
+XMFLAGS                =\r
+\r
 ALL            = addpm ddeclient runemacs cmdproxy addsection preprep\r
 \r
 .PHONY: $(ALL)\r
 \r
-TRES           = $(BLD)/emacs.res\r
-\r
-XMFLAGS                =\r
 \r
 addpm:           stamp_BLD $(BLD)/addpm.exe\r
 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)\r
@@ -61,8 +63,11 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
 # The resource file.  NT 3.10 requires the use of cvtres; even though\r
 # 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 emacs.rc\r
+$(TRES):       emacs.rc icons/emacs.ico emacs.manifest stamp_BLD\r
+               $(RC) $(RC_OUT)$(TRES) emacs.rc\r
+\r
+$(CLIENTRES):  emacsclient.rc stamp_BLD\r
+               $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc\r
 \r
 runemacs:        stamp_BLD $(BLD)/runemacs.exe\r
 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)\r
@@ -81,7 +86,7 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
 #\r
 # Build emacs\r
 #\r
-all:   which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)\r
+all:   which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)\r
 \r
 all-other-dirs-nmake: addsection\r
        cd ..\lib-src\r
@@ -269,8 +274,6 @@ clean-other-dirs-nmake:
        $(MAKE) $(MFLAGS) clean\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\lisp\r
-       $(MAKE) $(MFLAGS) clean\r
        cd ..\doc\lispintro\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\doc\lispref\r
@@ -286,8 +289,11 @@ clean-other-dirs-nmake:
 clean-other-dirs-gmake:\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean\r
 \r
 cleanall-other-dirs-nmake:\r
        cd ..\lib-src\r
@@ -308,5 +314,77 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
         - $(DEL_TREE) oo\r
         - $(DEL_TREE) oo-spd\r
 \r
+top-distclean:\r
+       - $(DEL) $(COMPILER_TEMP_FILES)\r
+       - $(DEL_TREE) obj\r
+       - $(DEL_TREE) obj-spd\r
+       - $(DEL_TREE) oo\r
+       - $(DEL_TREE) oo-spd\r
+       - $(DEL) stamp_BLD\r
+       - $(DEL) ../etc/DOC ../etc/DOC-X\r
+       - $(DEL) config.log Makefile\r
+\r
+distclean: distclean-other-dirs-$(MAKETYPE) top-distclean\r
+\r
+distclean-other-dirs-nmake:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\emacs\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\misc\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\lispintro\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\lispref\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\nt\r
+\r
+distclean-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean\r
+\r
+maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean\r
+\r
+maintainer-clean-other-dirs-nmake:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\emacs\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\misc\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\lispintro\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\lispref\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\nt\r
+\r
+maintainer-clean-other-dirs-gmake:\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
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean\r
+\r
 realclean: cleanall\r
        - $(DEL_TREE) ../bin\r