Standardize indentation somewhat.

Add bootstrap support.
Pass $(MFLAGS) when invoking make recursively.
Add shell-specific variants of top-level targets that invoke make
recursively in other directories, and add necessary computed
dependencies.

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 6b4ffdc2a7bb1ee8333b2351a91374eb7e0d8dc9..ccf86719dcc92d44042b0ebd27575557c6d97695 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -62,67 +62,145 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
                  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)\r
 \r
 which-sh:\r
-               @echo Using $(THE_SHELL) as shell.\r
+       @echo Using $(THE_SHELL) as shell.\r
 \r
 #\r
 # Build emacs\r
 #\r
-all:           which-sh $(BLD) $(ALL) all-other-dirs\r
+all:   which-sh $(BLD) $(ALL) all-other-dirs-$(SHELLTYPE)\r
+\r
+all-other-dirs-CMD:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) all\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) all\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) all\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) all\r
+       cd ..\nt\r
+\r
+all-other-dirs-SH:\r
+       $(MAKE) $(MFLAGS) -C ../lib-src all\r
+       $(MAKE) $(MFLAGS) -C ../src all\r
+       $(MAKE) $(MFLAGS) -C ../lisp all\r
+       $(MAKE) $(MFLAGS) -C ../leim all\r
+\r
+bootstrap:     $(BLD) $(ALL) bootstrap-$(SHELLTYPE)\r
+\r
+bootstrap-CMD:\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) bootstrap\r
+       $(MAKE) $(MFLAGS) bootstrap-clean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) bootstrap\r
+       cd ..\nt\r
+\r
+bootstrap-SH:\r
+       $(MAKE) $(MFLAGS) -C ../src bootstrap\r
+       $(MAKE) $(MFLAGS) -C ../src bootstrap-clean\r
+       $(MAKE) $(MFLAGS) -C ../lisp bootstrap\r
+\r
+bootstrap-clean: bootstrap-clean-$(SHELLTYPE)\r
+\r
+bootstrap-clean-CMD:\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) bootstrap-clean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) bootstrap-clean\r
+\r
+bootstrap-clean-SH:\r
+       $(MAKE) $(MFLAGS) -C ../src bootstrap-clean\r
+       $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean\r
 \r
 $(INSTALL_DIR):\r
-               - mkdir "$(INSTALL_DIR)"\r
+       - mkdir "$(INSTALL_DIR)"\r
 \r
 $(INSTALL_DIR)/bin:\r
-               - mkdir "$(INSTALL_DIR)/bin"\r
+       - mkdir "$(INSTALL_DIR)/bin"\r
 \r
 #\r
 # Build and install emacs in INSTALL_DIR\r
 #\r
-install:       all $(INSTALL_DIR)/bin install-other-dirs\r
-               - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin\r
-               - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin\r
-               - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin\r
-               - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin\r
-               - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin\r
-               - "$(INSTALL_DIR)/bin/addpm" /q\r
-               - $(DEL) ../same-dir.tst\r
-               - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
-               - mkdir "$(INSTALL_DIR)/etc/icons"\r
-               - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons\r
-               echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"\r
-               $(IFNOTSAMEDIR) $(MAKE) real_install $(ENDIF)\r
-               - $(DEL) ../same-dir.tst\r
-               - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
+install: all $(INSTALL_DIR)/bin install-other-dirs-$(SHELLTYPE)\r
+       - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin\r
+       - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin\r
+       - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin\r
+       - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin\r
+       - $(CP) ../lib-src/fns-*.el $(INSTALL_DIR)/bin\r
+       - "$(INSTALL_DIR)/bin/addpm" /q\r
+       - $(DEL) ../same-dir.tst\r
+       - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
+       - mkdir "$(INSTALL_DIR)/etc/icons"\r
+       - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons\r
+       echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"\r
+       $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) real_install $(ENDIF)\r
+       - $(DEL) ../same-dir.tst\r
+       - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
+\r
+install-other-dirs-CMD:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) install\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) install\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) install\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) install\r
+       cd ..\nt\r
+\r
+install-other-dirs-SH:\r
+       $(MAKE) $(MFLAGS) -C ../lib-src install\r
+       $(MAKE) $(MFLAGS) -C ../src install\r
+       $(MAKE) $(MFLAGS) -C ../lisp install\r
+       $(MAKE) $(MFLAGS) -C ../leim install\r
 \r
 real_install:\r
-               - $(DEL) ../same-dir.tst\r
-               - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
-               echo SameDirTest > $(INSTALL_DIR)/same-dir.tst\r
-               - mkdir "$(INSTALL_DIR)/etc"\r
-               - mkdir "$(INSTALL_DIR)/info"\r
-               - mkdir "$(INSTALL_DIR)/lock"\r
-               - mkdir "$(INSTALL_DIR)/data"\r
-               - mkdir "$(INSTALL_DIR)/site-lisp"\r
-               - mkdir "$(INSTALL_DIR)/etc/icons"\r
-               - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons\r
-               $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)\r
-               $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)\r
-               - $(DEL) ../same-dir.tst\r
-               - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
+       - $(DEL) ../same-dir.tst\r
+       - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
+       echo SameDirTest > $(INSTALL_DIR)/same-dir.tst\r
+       - mkdir "$(INSTALL_DIR)/etc"\r
+       - mkdir "$(INSTALL_DIR)/info"\r
+       - mkdir "$(INSTALL_DIR)/lock"\r
+       - mkdir "$(INSTALL_DIR)/data"\r
+       - mkdir "$(INSTALL_DIR)/site-lisp"\r
+       - mkdir "$(INSTALL_DIR)/etc/icons"\r
+       - $(CP_DIR) icons $(INSTALL_DIR)/etc/icons\r
+       $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)\r
+       $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)\r
+       - $(DEL) ../same-dir.tst\r
+       - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
 \r
 #\r
 # Maintenance\r
 # \r
-clean:         clean-other-dirs\r
-               - $(DEL) *~ *.pdb\r
-               - $(DEL_TREE) $(OBJDIR)\r
-               - $(DEL) ../etc/DOC ../etc/DOC-X\r
-\r
-cleanall:      clean\r
-               - $(DEL_TREE) obj\r
-               - $(DEL_TREE) obj-spd\r
-               - $(DEL_TREE) oo\r
-               - $(DEL_TREE) oo-spd\r
-\r
-realclean:     cleanall\r
-               - $(DEL_TREE) ../bin\r
+clean: clean-other-dirs-$(SHELLTYPE)\r
+       - $(DEL) *~ *.pdb\r
+       - $(DEL_TREE) $(OBJDIR)\r
+       - $(DEL) ../etc/DOC ../etc/DOC-X\r
+\r
+clean-other-dirs-CMD:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\nt\r
+\r
+clean-other-dirs-SH:\r
+       $(MAKE) $(MFLAGS) -C ../lib-src clean\r
+       $(MAKE) $(MFLAGS) -C ../src clean\r
+       $(MAKE) $(MFLAGS) -C ../lisp clean\r
+       $(MAKE) $(MFLAGS) -C ../leim clean\r
+\r
+cleanall: clean\r
+        - $(DEL_TREE) obj\r
+        - $(DEL_TREE) obj-spd\r
+        - $(DEL_TREE) oo\r
+        - $(DEL_TREE) oo-spd\r
+\r
+realclean: cleanall\r
+       - $(DEL_TREE) ../bin\r